Changeset 179726 in webkit

Timestamp:

Feb 5, 2015 5:05:08 PM (9 years ago)

Author:

commit-queue@webkit.org

Message:

Fix ASSERTION FAILED: !root->needsLayout() in FrameView::layout()
​https://bugs.webkit.org/show_bug.cgi?id=141032

Patch by Hyungwook Lee <​hyungwook.lee@navercorp.com> on 2015-02-05
Reviewed by Darin Adler.

This patch moves the !root->needsLayout() assert statement above
updateLayerPositionsAfterLayout() that can modify dirty bit system
when we have RenderMarquee.

• page/FrameView.cpp:

(WebCore::FrameView::layout):

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• page/FrameView.cpp (modified) (2 diffs)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2015-02-05  Hyungwook Lee  <hyungwook.lee@navercorp.com>
+
+        Fix ASSERTION FAILED: !root->needsLayout() in FrameView::layout()
+        https://bugs.webkit.org/show_bug.cgi?id=141032
+
+        Reviewed by Darin Adler.
+
+        This patch moves the !root->needsLayout() assert statement above
+        updateLayerPositionsAfterLayout() that can modify dirty bit system
+        when we have RenderMarquee.
+
+        * page/FrameView.cpp:
+        (WebCore::FrameView::layout):
+
 2015-02-05  Bartlomiej Gajda  <b.gajda@samsung.com>
 

trunk/Source/WebCore/page/FrameView.cpp

@@ -1356 +1356 @@
         root->view().repaintRootContents();
 
+    ASSERT(!root->needsLayout());
+
     layer->updateLayerPositionsAfterLayout(renderView()->layer(), updateLayerPositionFlags(layer, subtree, m_needsFullRepaint));
 
@@ -1376 +1378 @@
     document.dirtyTouchEventRects();
 #endif
-
-    ASSERT(!root->needsLayout());
 
     updateCanBlitOnScrollRecursively();