Changeset 212499 in webkit

Timestamp:

Feb 16, 2017 4:56:33 PM (7 years ago)

Author:

matthew_hanson@apple.com

Message:

Merge r212172. rdar://problem/30476807

Location:

branches/safari-603-branch

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/compositing/masks/solid-color-masked.html (modified) (2 diffs)
• Source/WebCore/ChangeLog (modified) (1 diff)
• Source/WebCore/platform/graphics/ca/GraphicsLayerCA.cpp (modified) (4 diffs)

branches/safari-603-branch/LayoutTests/ChangeLog

@@ +1 @@
+2017-02-16  Matthew Hanson  <matthew_hanson@apple.com>
+
+        Merge r212172. rdar://problem/30476807
+
+    2017-02-10  Simon Fraser  <simon.fraser@apple.com>
+
+            REGRESSION (r211845): [ios-simulator] LayoutTest compositing/masks/solid-color-masked.html is a flaky failure
+            https://bugs.webkit.org/show_bug.cgi?id=168054
+
+            Reviewed by Tim Horton.
+
+            Make the timeout 10ms so the test consistently fails with the old code.
+
+            * compositing/masks/solid-color-masked.html:
+
 2017-02-16  Matthew Hanson  <matthew_hanson@apple.com>
 

branches/safari-603-branch/LayoutTests/compositing/masks/solid-color-masked.html

@@ -11 +11 @@
         
         .composited {
-          -webkit-transform: translateZ(0);
+          transform: translateZ(0);
         }
 
@@ -27 +27 @@
                 if (window.testRunner)
                     testRunner.notifyDone();
-            }, 0);
+            }, 10);
         }
         window.addEventListener('load', doTest, false);

branches/safari-603-branch/Source/WebCore/ChangeLog

@@ +1 @@
+2017-02-16  Matthew Hanson  <matthew_hanson@apple.com>
+
+        Merge r212172. rdar://problem/30476807
+
+    2017-02-10  Simon Fraser  <simon.fraser@apple.com>
+
+            REGRESSION (r211845): [ios-simulator] LayoutTest compositing/masks/solid-color-masked.html is a flaky failure
+            https://bugs.webkit.org/show_bug.cgi?id=168054
+
+            Reviewed by Tim Horton.
+
+            When adding mask layers, there was an ordering dependency. There was a hack in GraphicsLayerCA::setVisibleAndCoverageRects()
+            to propagate m_intersectsCoverageRect to masks. However, if GraphicsLayerCA::setVisibleAndCoverageRects()
+            ran on the masked layer before the mask was added, nothing updated the "m_intersectsCoverageRect" state of the mask layer.
+
+            Fix by explicitly calling setVisibleAndCoverageRects() on the mask layer, passing the same rects and
+            viewport-constrained state as for its host layer (we already assume that their geometry matches).
+
+            Tested by compositing/masks/solid-color-masked.html
+
+            * platform/graphics/ca/GraphicsLayerCA.cpp:
+            (WebCore::GraphicsLayerCA::setVisibleAndCoverageRects):
+            (WebCore::GraphicsLayerCA::recursiveCommitChanges):
+
 2017-02-16  Matthew Hanson  <matthew_hanson@apple.com>
 

branches/safari-603-branch/Source/WebCore/platform/graphics/ca/GraphicsLayerCA.cpp

@@ -1333 +1333 @@
         m_uncommittedChanges |= CoverageRectChanged;
         m_intersectsCoverageRect = intersectsCoverageRect;
-
-        if (GraphicsLayerCA* maskLayer = downcast<GraphicsLayerCA>(m_maskLayer)) {
-            maskLayer->m_uncommittedChanges |= CoverageRectChanged;
-            maskLayer->m_intersectsCoverageRect = intersectsCoverageRect;
-        }
     }
 
@@ -1343 +1338 @@
         m_uncommittedChanges |= CoverageRectChanged;
         m_visibleRect = rects.visibleRect;
-
-        if (GraphicsLayerCA* maskLayer = downcast<GraphicsLayerCA>(m_maskLayer)) {
-            // FIXME: this assumes that the mask layer has the same geometry as this layer (which is currently always true).
-            maskLayer->m_uncommittedChanges |= CoverageRectChanged;
-            maskLayer->m_visibleRect = rects.visibleRect;
-        }
     }
 
@@ -1354 +1343 @@
         m_uncommittedChanges |= CoverageRectChanged;
         m_coverageRect = rects.coverageRect;
-
-        if (GraphicsLayerCA* maskLayer = downcast<GraphicsLayerCA>(m_maskLayer)) {
-            maskLayer->m_uncommittedChanges |= CoverageRectChanged;
-            maskLayer->m_coverageRect = rects.coverageRect;
-        }
     }
 }
@@ -1424 +1408 @@
     childCommitState.ancestorIsViewportConstrained |= m_isViewportConstrained;
 
-    if (GraphicsLayerCA* maskLayer = downcast<GraphicsLayerCA>(m_maskLayer))
+    if (GraphicsLayerCA* maskLayer = downcast<GraphicsLayerCA>(m_maskLayer)) {
+        maskLayer->setVisibleAndCoverageRects(rects, m_isViewportConstrained || commitState.ancestorIsViewportConstrained);
         maskLayer->commitLayerChangesBeforeSublayers(childCommitState, pageScaleFactor, baseRelativePosition);
+    }
 
     const Vector<GraphicsLayer*>& childLayers = children();