Changeset 204880 in webkit

Timestamp:

Aug 23, 2016 7:23:19 PM (8 years ago)

Author:

Alan Bujtas

Message:

ASSERTION FAILED: !view().layoutStateEnabled()

style().styleType() == FIRST_LETTER in WebCore::RenderInline::clippedOverflowRectForRepaint

​https://bugs.webkit.org/show_bug.cgi?id=155363
<rdar://problem/27720434>

Reviewed by David Hyatt.

Source/WebCore:

Loosen ASSERT to include calls when the inline has a self painting layer. It's valid to end up here during layout when
the layer's composite state changes.

Test: fast/layers/assert-on-self-painting-inline-with-scrolling.html

• rendering/RenderInline.cpp:

(WebCore::RenderInline::clippedOverflowRectForRepaint):

LayoutTests:

• fast/layers/assert-on-self-painting-inline-with-scrolling-expected.txt: Added.
• fast/layers/assert-on-self-painting-inline-with-scrolling.html: Added.

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/fast/layers/assert-on-self-painting-inline-with-scrolling-expected.txt (added)
• LayoutTests/fast/layers/assert-on-self-painting-inline-with-scrolling.html (added)
• Source/WebCore/ChangeLog (modified) (1 diff)
• Source/WebCore/rendering/RenderInline.cpp (modified) (1 diff)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2016-08-23  Zalan Bujtas  <zalan@apple.com>
+
+        ASSERTION FAILED: !view().layoutStateEnabled() || style().styleType() == FIRST_LETTER in WebCore::RenderInline::clippedOverflowRectForRepaint
+        https://bugs.webkit.org/show_bug.cgi?id=155363
+        <rdar://problem/27720434>
+
+        Reviewed by David Hyatt.
+
+        * fast/layers/assert-on-self-painting-inline-with-scrolling-expected.txt: Added.
+        * fast/layers/assert-on-self-painting-inline-with-scrolling.html: Added.
+
 2016-08-23  Chris Dumez  <cdumez@apple.com>
 

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2016-08-23  Zalan Bujtas  <zalan@apple.com>
+
+        ASSERTION FAILED: !view().layoutStateEnabled() || style().styleType() == FIRST_LETTER in WebCore::RenderInline::clippedOverflowRectForRepaint
+        https://bugs.webkit.org/show_bug.cgi?id=155363
+        <rdar://problem/27720434>
+
+        Reviewed by David Hyatt.
+
+        Loosen ASSERT to include calls when the inline has a self painting layer. It's valid to end up here during layout when
+        the layer's composite state changes.
+
+        Test: fast/layers/assert-on-self-painting-inline-with-scrolling.html
+
+        * rendering/RenderInline.cpp:
+        (WebCore::RenderInline::clippedOverflowRectForRepaint):
+
 2016-08-23  Anders Carlsson  <andersca@apple.com>
 

trunk/Source/WebCore/rendering/RenderInline.cpp

@@ -1207 +1207 @@
 {
     // Only first-letter renderers are allowed in here during layout. They mutate the tree triggering repaints.
-    ASSERT(!view().layoutStateEnabled() || style().styleType() == FIRST_LETTER);
+    ASSERT(!view().layoutStateEnabled() || style().styleType() == FIRST_LETTER || hasSelfPaintingLayer());
 
     if (!firstLineBoxIncludingCulling() && !continuation())