Changeset 170204 in webkit

Timestamp:

Jun 20, 2014 2:00:53 PM (10 years ago)

Author:

Simon Fraser

Message:

Always commit the scrolling tree when we flush layers
​https://bugs.webkit.org/show_bug.cgi?id=134115

Reviewed by Beth Dakin.

The scrolling state tree contains bare pointers to GraphicsLayers, which get
converted to CALayers at commit time. To avoid a window of time where those
GraphicsLayer pointers go stale, commit the scrolling tree whenever we flush the
compositing layer tree.

• WebProcess/WebPage/mac/TiledCoreAnimationDrawingArea.mm:

(WebKit::TiledCoreAnimationDrawingArea::flushLayers):

Location:

trunk/Source/WebKit2

Files:

• ChangeLog (modified) (1 diff)
• WebProcess/WebPage/mac/TiledCoreAnimationDrawingArea.mm (modified) (1 diff)

trunk/Source/WebKit2/ChangeLog

@@ +1 @@
+2014-06-20  Simon Fraser  <simon.fraser@apple.com>
+
+        Always commit the scrolling tree when we flush layers
+        https://bugs.webkit.org/show_bug.cgi?id=134115
+
+        Reviewed by Beth Dakin.
+        
+        The scrolling state tree contains bare pointers to GraphicsLayers, which get
+        converted to CALayers at commit time. To avoid a window of time where those
+        GraphicsLayer pointers go stale, commit the scrolling tree whenever we flush the
+        compositing layer tree.
+
+        * WebProcess/WebPage/mac/TiledCoreAnimationDrawingArea.mm:
+        (WebKit::TiledCoreAnimationDrawingArea::flushLayers):
+
 2014-06-19  Simon Fraser  <simon.fraser@apple.com>
 

trunk/Source/WebKit2/WebProcess/WebPage/mac/TiledCoreAnimationDrawingArea.mm

@@ -281 +281 @@
 
     bool returnValue = m_webPage->corePage()->mainFrame().view()->flushCompositingStateIncludingSubframes();
+    m_webPage->corePage()->scrollingCoordinator()->commitTreeStateIfNeeded();
 
     // If we have an active transient zoom, we want the zoom to win over any changes