Changeset 205510 in webkit

Timestamp:

Sep 6, 2016 2:53:07 PM (8 years ago)

Author:

Alan Bujtas

Message:

ASSERTION FAILED: !paintInfo.overlapTestRequests->contains(this) in WebCore::RenderWidget::paintContents
​https://bugs.webkit.org/show_bug.cgi?id=135602
<rdar://problem/27701733>

Reviewed by Simon Fraser.

Source/WebCore:

ASSERT is updated to support multiple fragments painting. We just have to ensure that the FrameView's rect
has not changed between the 2 paintContents calls.

Test: fast/layers/assert-on-overlap-testing-with-frames-inside-columns.html

• rendering/RenderWidget.cpp:

(WebCore::RenderWidget::paintContents):

LayoutTests:

• fast/layers/assert-on-overlap-testing-with-frames-inside-columns-expected.txt: Added.
• fast/layers/assert-on-overlap-testing-with-frames-inside-columns.html: Added.

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/fast/layers/assert-on-overlap-testing-with-frames-inside-columns-expected.txt (added)
• LayoutTests/fast/layers/assert-on-overlap-testing-with-frames-inside-columns.html (added)
• Source/WebCore/ChangeLog (modified) (1 diff)
• Source/WebCore/rendering/RenderWidget.cpp (modified) (1 diff)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2016-09-06  Zalan Bujtas  <zalan@apple.com>
+
+        ASSERTION FAILED: !paintInfo.overlapTestRequests->contains(this) in WebCore::RenderWidget::paintContents
+        https://bugs.webkit.org/show_bug.cgi?id=135602
+        <rdar://problem/27701733>
+
+        Reviewed by Simon Fraser.
+
+        * fast/layers/assert-on-overlap-testing-with-frames-inside-columns-expected.txt: Added.
+        * fast/layers/assert-on-overlap-testing-with-frames-inside-columns.html: Added.
+
 2016-09-06  Simon Fraser  <simon.fraser@apple.com>
 

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2016-09-06  Zalan Bujtas  <zalan@apple.com>
+
+        ASSERTION FAILED: !paintInfo.overlapTestRequests->contains(this) in WebCore::RenderWidget::paintContents
+        https://bugs.webkit.org/show_bug.cgi?id=135602
+        <rdar://problem/27701733>
+
+        Reviewed by Simon Fraser.
+
+        ASSERT is updated to support multiple fragments painting. We just have to ensure that the FrameView's rect
+        has not changed between the 2 paintContents calls.  
+
+        Test: fast/layers/assert-on-overlap-testing-with-frames-inside-columns.html
+
+        * rendering/RenderWidget.cpp:
+        (WebCore::RenderWidget::paintContents):
+
 2016-09-06  Commit Queue  <commit-queue@webkit.org>
 

trunk/Source/WebCore/rendering/RenderWidget.cpp

@@ -242 +242 @@
         bool runOverlapTests = !frameView.useSlowRepaintsIfNotOverlapped();
         if (paintInfo.overlapTestRequests && runOverlapTests) {
-            ASSERT(!paintInfo.overlapTestRequests->contains(this));
+            ASSERT(!paintInfo.overlapTestRequests->contains(this) || (paintInfo.overlapTestRequests->get(this) == m_widget->frameRect()));
             paintInfo.overlapTestRequests->set(this, m_widget->frameRect());
         }