Title: [204782] releases/WebKitGTK/webkit-2.12/Source/WebCore
- Revision
- 204782
- Author
- [email protected]
- Date
- 2016-08-23 01:33:52 -0700 (Tue, 23 Aug 2016)
Log Message
Merge r203425 - REGRESSION(r203415): ASSERTION FAILED: !m_layoutRoot->container() || !m_layoutRoot->container()->needsLayout()
https://bugs.webkit.org/show_bug.cgi?id=159952
Reviewed by Simon Fraser.
Update ASSERTs to reflect new functionality, that is, now we can end up in a state
where the container (RenderView) of one of the dirty subtrees is dirty.
See r203415.
Covered by editing/pasteboard/drag-drop-input-in-svg.svg
* page/FrameView.cpp:
(WebCore::FrameView::scheduleRelayoutOfSubtree):
Modified Paths
Diff
Modified: releases/WebKitGTK/webkit-2.12/Source/WebCore/ChangeLog (204781 => 204782)
--- releases/WebKitGTK/webkit-2.12/Source/WebCore/ChangeLog 2016-08-23 08:32:31 UTC (rev 204781)
+++ releases/WebKitGTK/webkit-2.12/Source/WebCore/ChangeLog 2016-08-23 08:33:52 UTC (rev 204782)
@@ -1,5 +1,21 @@
2016-07-19 Zalan Bujtas <[email protected]>
+ REGRESSION(r203415): ASSERTION FAILED: !m_layoutRoot->container() || !m_layoutRoot->container()->needsLayout()
+ https://bugs.webkit.org/show_bug.cgi?id=159952
+
+ Reviewed by Simon Fraser.
+
+ Update ASSERTs to reflect new functionality, that is, now we can end up in a state
+ where the container (RenderView) of one of the dirty subtrees is dirty.
+ See r203415.
+
+ Covered by editing/pasteboard/drag-drop-input-in-svg.svg
+
+ * page/FrameView.cpp:
+ (WebCore::FrameView::scheduleRelayoutOfSubtree):
+
+2016-07-19 Zalan Bujtas <[email protected]>
+
theguardian.co.uk crossword puzzles are sometimes not displaying text
https://bugs.webkit.org/show_bug.cgi?id=159924
<rdar://problem/27409483>
Modified: releases/WebKitGTK/webkit-2.12/Source/WebCore/page/FrameView.cpp (204781 => 204782)
--- releases/WebKitGTK/webkit-2.12/Source/WebCore/page/FrameView.cpp 2016-08-23 08:32:31 UTC (rev 204781)
+++ releases/WebKitGTK/webkit-2.12/Source/WebCore/page/FrameView.cpp 2016-08-23 08:33:52 UTC (rev 204782)
@@ -2659,7 +2659,7 @@
if (!layoutPending() && m_layoutSchedulingEnabled) {
std::chrono::milliseconds delay = renderView.document().minimumLayoutDelay();
- ASSERT(!newRelayoutRoot.container() || !newRelayoutRoot.container()->needsLayout());
+ ASSERT(!newRelayoutRoot.container() || is<RenderView>(newRelayoutRoot.container()) || !newRelayoutRoot.container()->needsLayout());
m_layoutRoot = &newRelayoutRoot;
InspectorInstrumentation::didInvalidateLayout(frame());
m_delayedLayout = delay.count();
@@ -2680,7 +2680,7 @@
if (isObjectAncestorContainerOf(m_layoutRoot, &newRelayoutRoot)) {
// Keep the current root.
newRelayoutRoot.markContainingBlocksForLayout(ScheduleRelayout::No, m_layoutRoot);
- ASSERT(!m_layoutRoot->container() || !m_layoutRoot->container()->needsLayout());
+ ASSERT(!m_layoutRoot->container() || is<RenderView>(m_layoutRoot->container()) || !m_layoutRoot->container()->needsLayout());
return;
}
@@ -2688,7 +2688,7 @@
// Re-root at newRelayoutRoot.
m_layoutRoot->markContainingBlocksForLayout(ScheduleRelayout::No, &newRelayoutRoot);
m_layoutRoot = &newRelayoutRoot;
- ASSERT(!m_layoutRoot->container() || !m_layoutRoot->container()->needsLayout());
+ ASSERT(!m_layoutRoot->container() || is<RenderView>(m_layoutRoot->container()) || !m_layoutRoot->container()->needsLayout());
InspectorInstrumentation::didInvalidateLayout(frame());
return;
}
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
