Title: [179726] trunk/Source/WebCore
- Revision
- 179726
- Author
- [email protected]
- Date
- 2015-02-05 17:05:08 -0800 (Thu, 05 Feb 2015)
Log Message
Fix ASSERTION FAILED: !root->needsLayout() in FrameView::layout()
https://bugs.webkit.org/show_bug.cgi?id=141032
Patch by Hyungwook Lee <[email protected]> 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):
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (179725 => 179726)
--- trunk/Source/WebCore/ChangeLog 2015-02-06 00:57:41 UTC (rev 179725)
+++ trunk/Source/WebCore/ChangeLog 2015-02-06 01:05:08 UTC (rev 179726)
@@ -1,3 +1,17 @@
+2015-02-05 Hyungwook Lee <[email protected]>
+
+ 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 <[email protected]>
[MSE] Implement Append Error algorithm.
Modified: trunk/Source/WebCore/page/FrameView.cpp (179725 => 179726)
--- trunk/Source/WebCore/page/FrameView.cpp 2015-02-06 00:57:41 UTC (rev 179725)
+++ trunk/Source/WebCore/page/FrameView.cpp 2015-02-06 01:05:08 UTC (rev 179726)
@@ -1355,6 +1355,8 @@
if (m_needsFullRepaint)
root->view().repaintRootContents();
+ ASSERT(!root->needsLayout());
+
layer->updateLayerPositionsAfterLayout(renderView()->layer(), updateLayerPositionFlags(layer, subtree, m_needsFullRepaint));
updateCompositingLayersAfterLayout();
@@ -1376,8 +1378,6 @@
document.dirtyTouchEventRects();
#endif
- ASSERT(!root->needsLayout());
-
updateCanBlitOnScrollRecursively();
handleDeferredScrollUpdateAfterContentSizeChange();
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
