Changeset 175781 in webkit

Timestamp:

Nov 8, 2014 3:50:43 PM (9 years ago)

Author:

Simon Fraser

Message:

Don't try to schedule a GraphicsLayer flush when propagating changes to replicas inside a flush
​https://bugs.webkit.org/show_bug.cgi?id=138532

Reviewed by Dan Bernstein.

When changing masks on replica layers with certain layer configurations,
it was possible to hit an assertion that a flush was being scheduled when already
flushing, via propagateLayerChangeToReplicas(). Fix by passing the scheduleFlush
flag along.

Not testable with current GraphicsLayer configurations.

• platform/graphics/ca/GraphicsLayerCA.cpp:
• platform/graphics/ca/GraphicsLayerCA.h:

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• platform/graphics/ca/GraphicsLayerCA.cpp (modified) (3 diffs)
• platform/graphics/ca/GraphicsLayerCA.h (modified) (2 diffs)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2014-11-08  Simon Fraser  <simon.fraser@apple.com>
+
+        Don't try to schedule a GraphicsLayer flush when propagating changes to replicas inside a flush
+        https://bugs.webkit.org/show_bug.cgi?id=138532
+
+        Reviewed by Dan Bernstein.
+
+        When changing masks on replica layers with certain layer configurations, 
+        it was possible to hit an assertion that a flush was being scheduled when already
+        flushing, via propagateLayerChangeToReplicas(). Fix by passing the scheduleFlush
+        flag along.
+        
+        Not testable with current GraphicsLayer configurations.
+
+        * platform/graphics/ca/GraphicsLayerCA.cpp:
+        * platform/graphics/ca/GraphicsLayerCA.h:
+
 2014-11-08  Beth Dakin  <bdakin@apple.com>
 

trunk/Source/WebCore/platform/graphics/ca/GraphicsLayerCA.cpp

@@ -3182 +3182 @@
 }
 
-void GraphicsLayerCA::propagateLayerChangeToReplicas()
+void GraphicsLayerCA::propagateLayerChangeToReplicas(ScheduleFlushOrNot scheduleFlush)
 {
     for (GraphicsLayer* currentLayer = this; currentLayer; currentLayer = currentLayer->parent()) {
@@ -3190 +3190 @@
 
         if (currentLayerCA.replicaLayer())
-            downcast<GraphicsLayerCA>(*currentLayerCA.replicaLayer()).noteLayerPropertyChanged(ReplicatedLayerChanged);
+            downcast<GraphicsLayerCA>(*currentLayerCA.replicaLayer()).noteLayerPropertyChanged(ReplicatedLayerChanged, scheduleFlush);
     }
 }
@@ -3391 +3391 @@
 {
     noteLayerPropertyChanged(ChildrenChanged, scheduleFlush);
-    propagateLayerChangeToReplicas();
+    propagateLayerChangeToReplicas(scheduleFlush);
 }
 

trunk/Source/WebCore/platform/graphics/ca/GraphicsLayerCA.h

@@ -350 +350 @@
     void removeCloneLayers();
     FloatPoint positionForCloneRootLayer() const;
-    
-    void propagateLayerChangeToReplicas();
     
     // All these "update" methods will be called inside a BEGIN_BLOCK_OBJC_EXCEPTIONS/END_BLOCK_OBJC_EXCEPTIONS block.
@@ -446 +444 @@
     void noteChangesForScaleSensitiveProperties();
 
+    void propagateLayerChangeToReplicas(ScheduleFlushOrNot = ScheduleFlush);
+
     void repaintLayerDirtyRects();