Changeset 205970 in webkit

Timestamp:

Sep 15, 2016 8:42:47 AM (8 years ago)

Author:

Alan Bujtas

Message:

Cleanup RenderLayer::shouldBeNormalFlowOnly
​https://bugs.webkit.org/show_bug.cgi?id=161981

Reviewed by Simon Fraser.

Source/WebCore:

This patch changes the logic of figuring about if a particular layer is normal flow only by simply checking
if the layer creates a stacking context. If it does, we assume that it can't be a normal flow layer anymore.
This patch slightly changes behaviour by making layers with isolation and reflection to be non normal flow layers anymore.

Covered by existing testcases.

• rendering/RenderLayer.cpp:

(WebCore::RenderLayer::calculateClipRects):

LayoutTests:

Rebaselining.

• fast/table/overflow-table-collapsed-borders-section-self-painting-layer-painting-expected.txt:

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/fast/table/overflow-table-collapsed-borders-section-self-painting-layer-painting-expected.txt (modified) (9 diffs)
• LayoutTests/platform/ios-simulator/media/audio-repaint-expected.txt (modified) (2 diffs)
• Source/WebCore/ChangeLog (modified) (1 diff)
• Source/WebCore/rendering/RenderLayer.cpp (modified) (2 diffs)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2016-09-15  Zalan Bujtas  <zalan@apple.com>
+
+        Cleanup RenderLayer::shouldBeNormalFlowOnly
+        https://bugs.webkit.org/show_bug.cgi?id=161981
+
+        Reviewed by Simon Fraser.
+
+        Rebaselining.
+
+        * fast/table/overflow-table-collapsed-borders-section-self-painting-layer-painting-expected.txt:
+
 2016-09-15  Csaba Osztrogonác  <ossy@webkit.org>
 

trunk/LayoutTests/fast/table/overflow-table-collapsed-borders-section-self-painting-layer-painting-expected.txt

@@ -6 +6 @@
 layer at (8,8) size 70x60 clip at (18,18) size 50x40 scrollWidth 80
   RenderTable {DIV} at (0,0) size 70x60 [color=#008000] [border: (10px solid #000000)]
+layer at (8,68) size 70x60 clip at (18,78) size 50x40 scrollWidth 80
+  RenderTable {DIV} at (0,60) size 70x60 [color=#008000] [border: (10px solid #000000)]
+layer at (8,128) size 70x60 clip at (18,138) size 50x40 scrollWidth 80
+  RenderTable {DIV} at (0,120) size 70x60 [color=#008000] [border: (10px solid #000000)]
+layer at (8,188) size 70x60 clip at (18,198) size 50x40 scrollWidth 80
+  RenderTable {DIV} at (0,180) size 70x60 [color=#008000] [border: (10px solid #000000)]
+layer at (8,248) size 70x60 clip at (18,258) size 50x40 scrollWidth 80
+  RenderTable {DIV} at (0,240) size 70x60 [color=#008000] [border: (10px solid #000000)]
+layer at (8,308) size 70x60 clip at (18,318) size 50x40 scrollWidth 80
+  RenderTable {DIV} at (0,300) size 70x60 [color=#008000] [border: (10px solid #000000)]
+layer at (8,368) size 70x60 clip at (18,378) size 50x40 scrollWidth 80
+  RenderTable {DIV} at (0,360) size 70x60 [color=#008000] [border: (10px solid #000000)]
+layer at (8,428) size 70x60 clip at (18,438) size 50x40 scrollWidth 80
+  RenderTable {DIV} at (0,420) size 70x60 [color=#008000] [border: (10px solid #000000)]
+layer at (8,488) size 70x60 clip at (18,498) size 50x40 scrollWidth 80
+  RenderTable {DIV} at (0,480) size 70x60 [color=#008000] [border: (10px solid #000000)]
 layer at (18,18) size 50x40
   RenderTableSection {DIV} at (10,10) size 50x40
@@ -13 +29 @@
           RenderText {#text} at (10,10) size 70x10
             text run at (10,10) width 70: "XXXXXXX"
-layer at (8,68) size 70x60 clip at (18,78) size 50x40 scrollWidth 80
-  RenderTable {DIV} at (0,60) size 70x60 [color=#008000] [border: (10px solid #000000)]
 layer at (18,78) size 50x40
   RenderTableSection {DIV} at (10,10) size 50x40
@@ -23 +37 @@
       RenderText {#text} at (10,10) size 70x10
         text run at (10,10) width 70: "XXXXXXX"
-layer at (8,128) size 70x60 clip at (18,138) size 50x40 scrollWidth 80
-  RenderTable {DIV} at (0,120) size 70x60 [color=#008000] [border: (10px solid #000000)]
 layer at (18,138) size 50x40
   RenderTableSection {DIV} at (10,10) size 50x40
@@ -33 +45 @@
       RenderText {#text} at (10,10) size 70x10
         text run at (10,10) width 70: "XXXXXXX"
-layer at (8,188) size 70x60 clip at (18,198) size 50x40 scrollWidth 80
-  RenderTable {DIV} at (0,180) size 70x60 [color=#008000] [border: (10px solid #000000)]
 layer at (18,198) size 50x40
   RenderTableSection {DIV} at (10,10) size 50x40
@@ -42 +52 @@
           RenderText {#text} at (10,10) size 70x10
             text run at (10,10) width 70: "XXXXXXX"
-layer at (8,248) size 70x60 clip at (18,258) size 50x40 scrollWidth 80
-  RenderTable {DIV} at (0,240) size 70x60 [color=#008000] [border: (10px solid #000000)]
 layer at (18,258) size 50x40
   RenderTableSection {DIV} at (10,10) size 50x40
@@ -52 +60 @@
     RenderText {#text} at (10,10) size 70x10
       text run at (10,10) width 70: "XXXXXXX"
-layer at (8,308) size 70x60 clip at (18,318) size 50x40 scrollWidth 80
-  RenderTable {DIV} at (0,300) size 70x60 [color=#008000] [border: (10px solid #000000)]
 layer at (18,318) size 50x40
   RenderTableSection {DIV} at (10,10) size 50x40
@@ -63 +69 @@
     RenderText {#text} at (10,10) size 70x10
       text run at (10,10) width 70: "XXXXXXX"
-layer at (8,368) size 70x60 clip at (18,378) size 50x40 scrollWidth 80
-  RenderTable {DIV} at (0,360) size 70x60 [color=#008000] [border: (10px solid #000000)]
 layer at (18,378) size 50x40
   RenderTableSection {DIV} at (10,10) size 50x40
@@ -73 +77 @@
       RenderText {#text} at (10,10) size 70x10
         text run at (10,10) width 70: "XXXXXXX"
-layer at (8,428) size 70x60 clip at (18,438) size 50x40 scrollWidth 80
-  RenderTable {DIV} at (0,420) size 70x60 [color=#008000] [border: (10px solid #000000)]
 layer at (18,438) size 50x40
   RenderTableSection {DIV} at (10,10) size 50x40
@@ -83 +85 @@
       RenderText {#text} at (10,10) size 70x10
         text run at (10,10) width 70: "XXXXXXX"
-layer at (8,488) size 70x60 clip at (18,498) size 50x40 scrollWidth 80
-  RenderTable {DIV} at (0,480) size 70x60 [color=#008000] [border: (10px solid #000000)]
 layer at (18,498) size 50x40
   RenderTableSection {DIV} at (10,10) size 50x40

trunk/LayoutTests/platform/ios-simulator/media/audio-repaint-expected.txt

@@ -13 +13 @@
         RenderBR {BR} at (260,103) size 0x0
         RenderBR {BR} at (260,196) size 0x0
+layer at (8,44) size 260x39 scrollHeight 89
+  RenderFlexibleBox {DIV} at (0,0) size 260x39
+layer at (8,44) size 260x39
+  RenderBlock (positioned) {DIV} at (0,0) size 260x39
+layer at (8,44) size 260x39
+  RenderFlexibleBox {DIV} at (0,0) size 260x39 [bgcolor=#D4D4D4]
+layer at (12,44) size 42x39 blendMode: plus-darker
+  RenderButton {BUTTON} at (4,0) size 42x39 [bgcolor=#000000]
 layer at (8,83) size 260x39 isolatesBlending
   RenderMedia {AUDIO} at (0,39) size 260x39
@@ -22 +30 @@
   RenderFlexibleBox {DIV} at (0,0) size 260x39 [bgcolor=#D4D4D4]
 layer at (12,83) size 42x39 blendMode: plus-darker
-  RenderButton {BUTTON} at (4,0) size 42x39 [bgcolor=#000000]
-layer at (8,44) size 260x39 scrollHeight 89
-  RenderFlexibleBox {DIV} at (0,0) size 260x39
-layer at (8,44) size 260x39
-  RenderBlock (positioned) {DIV} at (0,0) size 260x39
-layer at (8,44) size 260x39
-  RenderFlexibleBox {DIV} at (0,0) size 260x39 [bgcolor=#D4D4D4]
-layer at (12,44) size 42x39 blendMode: plus-darker
   RenderButton {BUTTON} at (4,0) size 42x39 [bgcolor=#000000]
 layer at (8,174) size 260x39 isolatesBlending

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2016-09-15  Zalan Bujtas  <zalan@apple.com>
+
+        Cleanup RenderLayer::shouldBeNormalFlowOnly
+        https://bugs.webkit.org/show_bug.cgi?id=161981
+
+        Reviewed by Simon Fraser.
+
+        This patch changes the logic of figuring about if a particular layer is normal flow only by simply checking
+        if the layer creates a stacking context. If it does, we assume that it can't be a normal flow layer anymore.
+        This patch slightly changes behaviour by making layers with isolation and reflection to be non normal flow layers anymore.    
+
+        Covered by existing testcases.
+
+        * rendering/RenderLayer.cpp:
+        (WebCore::RenderLayer::calculateClipRects):
+
 2016-09-07  Sergio Villar Senin  <svillar@igalia.com>
 

trunk/Source/WebCore/rendering/RenderLayer.cpp

@@ -6478 +6478 @@
 }
 
+static bool createsStackingContext(const RenderLayer& layer)
+{
+    auto& renderer = layer.renderer();
+    return renderer.hasTransformRelatedProperty()
+        || renderer.isPositioned()
+        || layer.needsCompositedScrolling()
+        || renderer.style().hasFlowFrom()
+        || renderer.hasReflection()
+        || renderer.style().hasIsolation()
+#if PLATFORM(IOS)
+        || layer.hasAcceleratedTouchScrolling()
+#endif
+        // FIXME: Check if willChange()->canCreateStackingContext() is more accurate here.
+        || mayCreateGraphicalGroup(renderer);
+}
+
 bool RenderLayer::shouldBeNormalFlowOnly() const
 {
-    return (renderer().hasOverflowClip()
-        || renderer().hasReflection()
-        || renderer().hasMask()
+    if (createsStackingContext(*this))
+        return false;
+
+    return renderer().hasOverflowClip()
         || renderer().isCanvas()
         || renderer().isVideo()
@@ -6488 +6505 @@
         || renderer().isRenderIFrame()
         || (renderer().style().specifiesColumns() && !isRootLayer())
-        || renderer().isInFlowRenderFlowThread())
-        && !renderer().hasTransformRelatedProperty()
-        && !renderer().isPositioned()
-        && !needsCompositedScrolling()
-        && !renderer().style().hasFlowFrom()
-#if PLATFORM(IOS)
-        && !hasAcceleratedTouchScrolling()
-#endif
-        && !mayCreateGraphicalGroup(renderer());
+        || renderer().isInFlowRenderFlowThread();
 }
 
 bool RenderLayer::shouldBeSelfPaintingLayer() const
 {
-    return !isNormalFlowOnly()
-        || hasOverlayScrollbars()
+    if (!isNormalFlowOnly())
+        return true;
+
+    return hasOverlayScrollbars()
         || needsCompositedScrolling()
-        || isolatesBlending()
-        || renderer().hasReflection()
-        || renderer().hasMask()
         || renderer().isTableRow()
         || renderer().isCanvas()