Changeset 51883 in webkit

Timestamp:

Dec 8, 2009 5:43:05 PM (14 years ago)

Author:

agl@chromium.org

Message:

2009-12-08 Adam Langley <​agl@google.com>

Reviewed by Darin Adler.

Fix assertion failure in WebCore::RenderBlock::startDelayUpdateScrollInfo

startDelayUpdateScrollInfo calls a function that can end up calling
startDelayUpdateScrollInfo again. However, it's static state is
inconsistent when this happens leading to an assertion failure (or
probably a memory leak if assertions are off).

Thanks to Robert Swiecki for the test case.

​https://bugs.webkit.org/show_bug.cgi?id=32172
​http://code.google.com/p/chromium/issues/detail?id=28880

Test: fast/css/recursive-delay-update-scroll.html

• rendering/RenderBlock.cpp: (WebCore::RenderBlock::finishDelayUpdateScrollInfo):

2009-12-08 Adam Langley <​agl@google.com>

Reviewed by Darin Adler.

Fix assertion failure in WebCore::RenderBlock::startDelayUpdateScrollInfo

startDelayUpdateScrollInfo calls a function that can end up calling
startDelayUpdateScrollInfo again. However, it's static state is
inconsistent when this happens leading to an assertion failure (or
probably a memory leak if assertions are off).

Thanks to Robert Swiecki for the test case.

​https://bugs.webkit.org/show_bug.cgi?id=32172
​http://code.google.com/p/chromium/issues/detail?id=28880

• fast/css/recursive-delay-update-scroll.html: Added.
• fast/css/recursive-delay-update-scroll-expected.txt: Added.

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/fast/css/recursive-delay-update-scroll-expected.txt (added)
• LayoutTests/fast/css/recursive-delay-update-scroll.html (added)
• WebCore/ChangeLog (modified) (1 diff)
• WebCore/rendering/RenderBlock.cpp (modified) (2 diffs)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2009-12-08  Adam Langley  <agl@google.com>
+
+        Reviewed by Darin Adler.
+
+        Fix assertion failure in WebCore::RenderBlock::startDelayUpdateScrollInfo
+
+        startDelayUpdateScrollInfo calls a function that can end up calling
+        startDelayUpdateScrollInfo again. However, it's static state is
+        inconsistent when this happens leading to an assertion failure (or
+        probably a memory leak if assertions are off).
+
+        Thanks to Robert Swiecki for the test case.
+
+        https://bugs.webkit.org/show_bug.cgi?id=32172
+        http://code.google.com/p/chromium/issues/detail?id=28880
+
+
+        * fast/css/recursive-delay-update-scroll.html: Added.
+        * fast/css/recursive-delay-update-scroll-expected.txt: Added.
+
 2009-12-08  Nikolas Zimmermann  <nzimmermann@rim.com>
 

trunk/WebCore/ChangeLog

@@ +1 @@
+2009-12-08  Adam Langley  <agl@google.com>
+
+        Reviewed by Darin Adler.
+
+        Fix assertion failure in WebCore::RenderBlock::startDelayUpdateScrollInfo
+
+        startDelayUpdateScrollInfo calls a function that can end up calling
+        startDelayUpdateScrollInfo again. However, it's static state is
+        inconsistent when this happens leading to an assertion failure (or
+        probably a memory leak if assertions are off).
+
+        Thanks to Robert Swiecki for the test case.
+
+        https://bugs.webkit.org/show_bug.cgi?id=32172
+        http://code.google.com/p/chromium/issues/detail?id=28880
+
+        Test: fast/css/recursive-delay-update-scroll.html
+
+        * rendering/RenderBlock.cpp:
+        (WebCore::RenderBlock::finishDelayUpdateScrollInfo):
+
 2009-12-08  Steve Falkenburg  <sfalken@apple.com>
 

trunk/WebCore/rendering/RenderBlock.cpp

@@ -618 +618 @@
         ASSERT(gDelayedUpdateScrollInfoSet);
 
-        for (DelayedUpdateScrollInfoSet::iterator it = gDelayedUpdateScrollInfoSet->begin(); it != gDelayedUpdateScrollInfoSet->end(); ++it) {
+        OwnPtr<DelayedUpdateScrollInfoSet> infoSet(gDelayedUpdateScrollInfoSet);
+        gDelayedUpdateScrollInfoSet = 0;
+
+        for (DelayedUpdateScrollInfoSet::iterator it = infoSet->begin(); it != infoSet->end(); ++it) {
             RenderBlock* block = *it;
             if (block->hasOverflowClip()) {
@@ -624 +627 @@
             }
         }
-
-        delete gDelayedUpdateScrollInfoSet;
-        gDelayedUpdateScrollInfoSet = 0;
     }
 }