Changeset 238523 in webkit

Timestamp:

Nov 26, 2018, 2:22:07 PM (8 years ago)

Author:

Truitt Savell

Message:

Unreviewed, rolling out r238357.

Casued three css tests to fail and crash on ios sim

Reverted changeset:

"Avoid triggering compositing updates when only the root layer
is composited"
​https://bugs.webkit.org/show_bug.cgi?id=191813
​https://trac.webkit.org/changeset/238357

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• rendering/RenderLayer.cpp (modified) (7 diffs)
• rendering/RenderLayerCompositor.cpp (modified) (4 diffs)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2018-11-26  Truitt Savell  <tsavell@apple.com>
+
+        Unreviewed, rolling out r238357.
+
+        Casued three css tests to fail and crash on ios sim
+
+        Reverted changeset:
+
+        "Avoid triggering compositing updates when only the root layer
+        is composited"
+        https://bugs.webkit.org/show_bug.cgi?id=191813
+        https://trac.webkit.org/changeset/238357
+
 2018-11-26  Daniel Bates  <dabates@apple.com>
 

trunk/Source/WebCore/rendering/RenderLayer.cpp

@@ -406 +406 @@
         setAncestorChainHasSelfPaintingLayerDescendant();
 
-    if (compositor().hasContentCompositingLayers())
+    if (compositor().usesCompositing())
         setDescendantsNeedCompositingRequirementsTraversal();
 
@@ -452 +452 @@
         dirtyAncestorChainHasSelfPaintingLayerDescendantStatus();
 
-    if (compositor().hasContentCompositingLayers())
+    if (compositor().usesCompositing())
         setDescendantsNeedCompositingRequirementsTraversal();
 
@@ -1578 +1578 @@
     setLocation(localPoint);
     
-    if (positionOrOffsetChanged && compositor().hasContentCompositingLayers()) {
+    if (positionOrOffsetChanged && compositor().usesCompositing()) {
         if (isComposited())
             setNeedsCompositingGeometryUpdate();
@@ -2431 +2431 @@
 
     bool requiresRepaint = true;
-    if (usesCompositedScrolling()) {
+    if (compositor().usesCompositing() && usesCompositedScrolling()) {
         setNeedsCompositingGeometryUpdate();
         setDescendantsNeedUpdateBackingAndHierarchyTraversal();
@@ -2581 +2581 @@
 void RenderLayer::updateCompositingLayersAfterScroll()
 {
-    if (compositor().hasContentCompositingLayers()) {
+    if (compositor().usesCompositing()) {
         // Our stacking container is guaranteed to contain all of our descendants that may need
         // repositioning, so update compositing layers from there.
@@ -6644 +6644 @@
 {
     stream.nextLine();
-    stream << "(S)tacking Context, (N)ormal flow only, (O)verflow clip, (A)lpha (opacity or mask), has (B)lend mode, (I)solates blending, (T)ransform-ish, (F)ilter, Fi(X)ed position, (C)omposited, (c)omposited descendant\n"
+    stream << "(S)tacking Context, (N)ormal flow only, (O)verflow clip, (A)lpha (opacity or mask), has (B)lend mode, (I)solates blending, (T)ransform-ish, (F)ilter, Fi(X)ed position, (C)omposited\n"
         "Dirty (z)-lists, Dirty (n)ormal flow lists\n"
         "Descendant needs overlap (t)raversal, Descendant needs (b)acking or hierarchy update, All descendants need (r)equirements traversal, All (s)ubsequent layers need requirements traversal, All descendants need (h)ierarchy traversal\n"
@@ -6671 +6671 @@
     stream << (layer.renderer().isFixedPositioned() ? "X" : "-");
     stream << (layer.isComposited() ? "C" : "-");
-    stream << (layer.hasCompositingDescendant() ? "c" : "-");
 
     stream << " ";

trunk/Source/WebCore/rendering/RenderLayerCompositor.cpp

@@ -1171 +1171 @@
     Vector<Ref<GraphicsLayer>> layerChildren;
     auto& childList = layerBacking ? layerChildren : childLayersOfEnclosingLayer;
-
-    bool requireDescendantTraversal = layer.hasDescendantNeedingUpdateBackingOrHierarchyTraversal()
-        || (layer.hasCompositingDescendant() && (!layerBacking || layer.needsCompositingLayerConnection() || !updateLevel.isEmpty()));
+    // FIXME: why the !layerBacking check?
+    bool requireDescendantTraversal = !layerBacking || layer.needsCompositingLayerConnection() || layer.hasDescendantNeedingUpdateBackingOrHierarchyTraversal() || !updateLevel.isEmpty();
 
 #if !ASSERT_DISABLED
@@ -1179 +1178 @@
 #endif
     
-    auto appendForegroundLayerIfNecessary = [&] {
-        // If a negative z-order child is compositing, we get a foreground layer which needs to get parented.
+    if (requireDescendantTraversal) {
+        for (auto* renderLayer : layer.negativeZOrderLayers())
+            updateBackingAndHierarchy(*renderLayer, childList, updateLevel, depth + 1);
+
+            // If a negative z-order child is compositing, we get a foreground layer which needs to get parented.
         if (layer.negativeZOrderLayers().size()) {
             if (layerBacking && layerBacking->foregroundLayer())
                 childList.append(*layerBacking->foregroundLayer());
         }
-    };
-
-    if (requireDescendantTraversal) {
-        for (auto* renderLayer : layer.negativeZOrderLayers())
-            updateBackingAndHierarchy(*renderLayer, childList, updateLevel, depth + 1);
-
-        appendForegroundLayerIfNecessary();
 
         for (auto* renderLayer : layer.normalFlowLayers())
@@ -1198 +1193 @@
         for (auto* renderLayer : layer.positiveZOrderLayers())
             updateBackingAndHierarchy(*renderLayer, childList, updateLevel, depth + 1);
-    } else
-        appendForegroundLayerIfNecessary();
+    }
 
     if (layerBacking) {
@@ -1377 +1371 @@
         layer.setNeedsPostLayoutCompositingUpdate();
 
-    if (diff >= StyleDifference::LayoutPositionedMovementOnly && hasContentCompositingLayers()) {
+    if (diff >= StyleDifference::LayoutPositionedMovementOnly && usesCompositing()) {
         layer.setNeedsPostLayoutCompositingUpdate();
         layer.setNeedsCompositingGeometryUpdate();