Changeset 86590 in webkit

Timestamp:

May 16, 2011 10:55:52 AM (13 years ago)

Author:

andersca@apple.com

Message:

2011-05-16 Anders Carlsson <​andersca@apple.com>

Reviewed by Dan Bernstein.

If the root compositing layer changes while we're about to exit compositing mode, make sure to enter compositing mode
​https://bugs.webkit.org/show_bug.cgi?id=60905
<rdar://problem/9365574>

• WebProcess/WebPage/DrawingAreaImpl.cpp: (WebKit::DrawingAreaImpl::setRootCompositingLayer): If we have a layer tree host, but haven't yet sent a EnterAcceleratedCompositingMode message (this can happen when quickly going in and out of compositing mode), make sure to schedule a notification when the layer tree host does it next flush. This will end up sending the EnterAcceleratedCompositingMode message.

Location:

trunk/Source/WebKit2

Files:

• ChangeLog (modified) (1 diff)
• WebProcess/WebPage/DrawingAreaImpl.cpp (modified) (2 diffs)

trunk/Source/WebKit2/ChangeLog

@@ +1 @@
+2011-05-16  Anders Carlsson  <andersca@apple.com>
+
+        Reviewed by Dan Bernstein.
+
+        If the root compositing layer changes while we're about to exit compositing mode, make sure to enter compositing mode
+        https://bugs.webkit.org/show_bug.cgi?id=60905
+        <rdar://problem/9365574>
+
+        * WebProcess/WebPage/DrawingAreaImpl.cpp:
+        (WebKit::DrawingAreaImpl::setRootCompositingLayer):
+        If we have a layer tree host, but haven't yet sent a EnterAcceleratedCompositingMode message (this can happen
+        when quickly going in and out of compositing mode), make sure to schedule a notification when the layer tree host
+        does it next flush. This will end up sending the EnterAcceleratedCompositingMode message.
+
 2011-05-13  Jer Noble  <jer.noble@apple.com>
 

trunk/Source/WebKit2/WebProcess/WebPage/DrawingAreaImpl.cpp

@@ -226 +226 @@
 void DrawingAreaImpl::setRootCompositingLayer(GraphicsLayer* graphicsLayer)
 {
+    // FIXME: Instead of using nested if statements, we should keep a compositing state
+    // enum in the DrawingAreaImpl object and have a changeAcceleratedCompositingState function
+    // that takes the new state.
+
     if (graphicsLayer) {
         if (!m_layerTreeHost) {
@@ -231 +235 @@
             enterAcceleratedCompositingMode(graphicsLayer);
         } else {
+            // We're already in accelerated compositing mode, but the root compositing layer changed.
+
             m_exitCompositingTimer.stop();
-            // We're already in accelerated compositing mode, but the root compositing layer changed.
+
+            // If we haven't sent the EnterAcceleratedCompositingMode message, make sure that the
+            // layer tree host calls us back after the next layer flush so we can send it then.
+            if (!m_compositingAccordingToProxyMessages)
+                m_layerTreeHost->setShouldNotifyAfterNextScheduledLayerFlush(true);
+
             m_layerTreeHost->setRootCompositingLayer(graphicsLayer);
         }