Title: [218555] releases/WebKitGTK/webkit-2.16/Source/WebCore
- Revision
- 218555
- Author
- [email protected]
- Date
- 2017-06-20 00:35:25 -0700 (Tue, 20 Jun 2017)
Log Message
Merge r217588 - ASSERTION FAILED: m_layoutPhase == InPostLayerPositionsUpdatedAfterLayout || m_layoutPhase == OutsideLayout
https://bugs.webkit.org/show_bug.cgi?id=171501
<rdar://problem/31977453>
Reviewed by Simon Fraser.
We should be able to paint as long as the tree is clean and we are in paintable state.
* page/FrameView.cpp:
(WebCore::FrameView::paintContents):
Modified Paths
Diff
Modified: releases/WebKitGTK/webkit-2.16/Source/WebCore/ChangeLog (218554 => 218555)
--- releases/WebKitGTK/webkit-2.16/Source/WebCore/ChangeLog 2017-06-20 07:24:16 UTC (rev 218554)
+++ releases/WebKitGTK/webkit-2.16/Source/WebCore/ChangeLog 2017-06-20 07:35:25 UTC (rev 218555)
@@ -1,3 +1,16 @@
+2017-05-30 Zalan Bujtas <[email protected]>
+
+ ASSERTION FAILED: m_layoutPhase == InPostLayerPositionsUpdatedAfterLayout || m_layoutPhase == OutsideLayout
+ https://bugs.webkit.org/show_bug.cgi?id=171501
+ <rdar://problem/31977453>
+
+ Reviewed by Simon Fraser.
+
+ We should be able to paint as long as the tree is clean and we are in paintable state.
+
+ * page/FrameView.cpp:
+ (WebCore::FrameView::paintContents):
+
2017-05-30 Jeremy Jones <[email protected]>
m_resourceSelectionTaskQueue tasks should be cleared when player is destroyed to prevent invalid state.
Modified: releases/WebKitGTK/webkit-2.16/Source/WebCore/page/FrameView.cpp (218554 => 218555)
--- releases/WebKitGTK/webkit-2.16/Source/WebCore/page/FrameView.cpp 2017-06-20 07:24:16 UTC (rev 218554)
+++ releases/WebKitGTK/webkit-2.16/Source/WebCore/page/FrameView.cpp 2017-06-20 07:35:25 UTC (rev 218555)
@@ -4428,13 +4428,6 @@
context.fillRect(dirtyRect, Color(0xFF, 0, 0));
#endif
- if (m_layoutPhase == InViewSizeAdjust)
- return;
-
- TraceScope tracingScope(PaintViewStart, PaintViewEnd);
-
- ASSERT(m_layoutPhase == InPostLayerPositionsUpdatedAfterLayout || m_layoutPhase == OutsideLayout);
-
RenderView* renderView = this->renderView();
if (!renderView) {
LOG_ERROR("called FrameView::paint with nil renderer");
@@ -4441,6 +4434,11 @@
return;
}
+ if (!inPaintableState())
+ return;
+
+ TraceScope tracingScope(PaintViewStart, PaintViewEnd);
+
ASSERT(!needsLayout());
if (needsLayout())
return;
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes