Title: [205437] releases/WebKitGTK/webkit-2.12
- Revision
- 205437
- Author
- [email protected]
- Date
- 2016-09-05 02:03:40 -0700 (Mon, 05 Sep 2016)
Log Message
Merge r204880 - 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.
Modified Paths
Added Paths
Diff
Modified: releases/WebKitGTK/webkit-2.12/LayoutTests/ChangeLog (205436 => 205437)
--- releases/WebKitGTK/webkit-2.12/LayoutTests/ChangeLog 2016-09-05 09:02:37 UTC (rev 205436)
+++ releases/WebKitGTK/webkit-2.12/LayoutTests/ChangeLog 2016-09-05 09:03:40 UTC (rev 205437)
@@ -1,5 +1,16 @@
2016-08-23 Zalan Bujtas <[email protected]>
+ 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 Zalan Bujtas <[email protected]>
+
ASSERTION FAILED: hasOverflowingCell == this->hasOverflowingCell() in WebCore::RenderTableSection::computeOverflowFromCells
https://bugs.webkit.org/show_bug.cgi?id=155702
<rdar://problem/27720731>
Added: releases/WebKitGTK/webkit-2.12/LayoutTests/fast/layers/assert-on-self-painting-inline-with-scrolling-expected.txt (0 => 205437)
--- releases/WebKitGTK/webkit-2.12/LayoutTests/fast/layers/assert-on-self-painting-inline-with-scrolling-expected.txt (rev 0)
+++ releases/WebKitGTK/webkit-2.12/LayoutTests/fast/layers/assert-on-self-painting-inline-with-scrolling-expected.txt 2016-09-05 09:03:40 UTC (rev 205437)
@@ -0,0 +1 @@
+PASS if no assert in debug.
Added: releases/WebKitGTK/webkit-2.12/LayoutTests/fast/layers/assert-on-self-painting-inline-with-scrolling.html (0 => 205437)
--- releases/WebKitGTK/webkit-2.12/LayoutTests/fast/layers/assert-on-self-painting-inline-with-scrolling.html (rev 0)
+++ releases/WebKitGTK/webkit-2.12/LayoutTests/fast/layers/assert-on-self-painting-inline-with-scrolling.html 2016-09-05 09:03:40 UTC (rev 205437)
@@ -0,0 +1,25 @@
+<!DOCTYPE html>
+<html>
+<head>
+<title>This tests that inline does not assert when its composite state changes.</title>
+<script>
+if (window.testRunner)
+ testRunner.dumpAsText();
+</script>
+
+<style>
+ html, body {
+ overflow-x: scroll;
+ will-change: transform;
+}
+
+span {
+ mix-blend-mode: exclusion;
+}
+</style>
+</head>
+<body>
+PASS if no assert in debug.
+<span class="class_0"></span>
+</body>
+</html>
Modified: releases/WebKitGTK/webkit-2.12/Source/WebCore/ChangeLog (205436 => 205437)
--- releases/WebKitGTK/webkit-2.12/Source/WebCore/ChangeLog 2016-09-05 09:02:37 UTC (rev 205436)
+++ releases/WebKitGTK/webkit-2.12/Source/WebCore/ChangeLog 2016-09-05 09:03:40 UTC (rev 205437)
@@ -1,5 +1,21 @@
2016-08-23 Zalan Bujtas <[email protected]>
+ 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 Zalan Bujtas <[email protected]>
+
ASSERTION FAILED: hasOverflowingCell == this->hasOverflowingCell() in WebCore::RenderTableSection::computeOverflowFromCells
https://bugs.webkit.org/show_bug.cgi?id=155702
<rdar://problem/27720731>
Modified: releases/WebKitGTK/webkit-2.12/Source/WebCore/rendering/RenderInline.cpp (205436 => 205437)
--- releases/WebKitGTK/webkit-2.12/Source/WebCore/rendering/RenderInline.cpp 2016-09-05 09:02:37 UTC (rev 205436)
+++ releases/WebKitGTK/webkit-2.12/Source/WebCore/rendering/RenderInline.cpp 2016-09-05 09:03:40 UTC (rev 205437)
@@ -1206,7 +1206,7 @@
LayoutRect RenderInline::clippedOverflowRectForRepaint(const RenderLayerModelObject* repaintContainer) const
{
// 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())
return LayoutRect();
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
