Changeset 77546 in webkit

Timestamp:

Feb 3, 2011 3:38:42 PM (13 years ago)

Author:

andersca@apple.com

Message:

2011-02-03 Anders Carlsson <​andersca@apple.com>

Reviewed by Dan Bernstein.

Change DidSetSize to take a LayerTreeContext parameter
​https://bugs.webkit.org/show_bug.cgi?id=53724

Since SetSize can cause layout to happen, we need to pass along a layer tree context to
the DidSetSize message so the UI process can enter/exit accelerated compositing mode appropriately.

• Shared/LayerTreeContext.h:
• Shared/mac/LayerTreeContextMac.mm: Add equality operators to LayerTreeContext.

• UIProcess/DrawingAreaProxy.h: (WebKit::DrawingAreaProxy::didSetSize): This now takes a LayerTreeContext parameter.

• UIProcess/DrawingAreaProxy.messages.in: Add LayerTreeContext parameter.

• UIProcess/DrawingAreaProxyImpl.cpp: Get rid of m_isInAcceleratedCompositingMode and use the current layer context instead.

(WebKit::DrawingAreaProxyImpl::paint):
Bail if the call to DidSetSize ended up entering accelerated compositing mode.

(WebKit::DrawingAreaProxyImpl::didSetSize):
If the new layer tree context is different, enter/exit accelerated compositing mode accordingly.

(WebKit::DrawingAreaProxyImpl::enterAcceleratedCompositingMode):
(WebKit::DrawingAreaProxyImpl::exitAcceleratedCompositingMode):
Update the layer tree context.

• UIProcess/DrawingAreaProxyImpl.h: (WebKit::DrawingAreaProxyImpl::isInAcceleratedCompositingMode): Add simple getter.

• WebProcess/WebPage/DrawingAreaImpl.cpp: (WebKit::DrawingAreaImpl::setSize): Pass along the layer tree context.

Location:

trunk/Source/WebKit2

Files:

• ChangeLog (modified) (1 diff)
• Shared/LayerTreeContext.h (modified) (1 diff)
• Shared/mac/LayerTreeContextMac.mm (modified) (1 diff)
• UIProcess/DrawingAreaProxy.h (modified) (1 diff)
• UIProcess/DrawingAreaProxy.messages.in (modified) (1 diff)
• UIProcess/DrawingAreaProxyImpl.cpp (modified) (8 diffs)
• UIProcess/DrawingAreaProxyImpl.h (modified) (3 diffs)
• WebProcess/WebPage/DrawingAreaImpl.cpp (modified) (2 diffs)

trunk/Source/WebKit2/ChangeLog

@@ +1 @@
+2011-02-03  Anders Carlsson  <andersca@apple.com>
+
+        Reviewed by Dan Bernstein.
+
+        Change DidSetSize to take a LayerTreeContext parameter
+        https://bugs.webkit.org/show_bug.cgi?id=53724
+
+        Since SetSize can cause layout to happen, we need to pass along a layer tree context to 
+        the DidSetSize message so the UI process can enter/exit accelerated compositing mode appropriately.
+        
+        * Shared/LayerTreeContext.h:
+        * Shared/mac/LayerTreeContextMac.mm:
+        Add equality operators to LayerTreeContext.
+
+        * UIProcess/DrawingAreaProxy.h:
+        (WebKit::DrawingAreaProxy::didSetSize):
+        This now takes a LayerTreeContext parameter.
+        
+        * UIProcess/DrawingAreaProxy.messages.in:
+        Add LayerTreeContext parameter.
+
+        * UIProcess/DrawingAreaProxyImpl.cpp:
+        Get rid of m_isInAcceleratedCompositingMode and use the current layer context instead.
+
+        (WebKit::DrawingAreaProxyImpl::paint):
+        Bail if the call to DidSetSize ended up entering accelerated compositing mode.
+
+        (WebKit::DrawingAreaProxyImpl::didSetSize):
+        If the new layer tree context is different, enter/exit accelerated compositing mode accordingly.
+
+        (WebKit::DrawingAreaProxyImpl::enterAcceleratedCompositingMode):
+        (WebKit::DrawingAreaProxyImpl::exitAcceleratedCompositingMode):
+        Update the layer tree context.
+
+        * UIProcess/DrawingAreaProxyImpl.h:
+        (WebKit::DrawingAreaProxyImpl::isInAcceleratedCompositingMode):
+        Add simple getter.
+
+        * WebProcess/WebPage/DrawingAreaImpl.cpp:
+        (WebKit::DrawingAreaImpl::setSize):
+        Pass along the layer tree context.
+
 2011-02-03  Anders Carlsson  <andersca@apple.com>
 

trunk/Source/WebKit2/Shared/LayerTreeContext.h

@@ -51 +51 @@
 };
 
+bool operator==(const LayerTreeContext&, const LayerTreeContext&);
+
+inline bool operator!=(const LayerTreeContext& a, const LayerTreeContext& b)
+{
+    return !(a == b);
+}
+
 };
 

trunk/Source/WebKit2/Shared/mac/LayerTreeContextMac.mm

@@ -59 +59 @@
 }
 
+bool operator==(const LayerTreeContext& a, const LayerTreeContext& b)
+{
+    return a.contextID == b.contextID;
+}
+
 } // namespace WebKit

trunk/Source/WebKit2/UIProcess/DrawingAreaProxy.h

@@ -98 +98 @@
     // FIXME: These should be pure virtual.
     virtual void update(uint64_t sequenceNumber, const UpdateInfo&) { }
-    virtual void didSetSize(uint64_t sequenceNumber, const UpdateInfo&) { }
+    virtual void didSetSize(uint64_t sequenceNumber, const UpdateInfo&, const LayerTreeContext&) { }
 #if USE(ACCELERATED_COMPOSITING)
     virtual void enterAcceleratedCompositingMode(uint64_t sequenceNumber, const LayerTreeContext&) { }

trunk/Source/WebKit2/UIProcess/DrawingAreaProxy.messages.in

@@ -23 +23 @@
 messages -> DrawingAreaProxy {
     Update(uint64_t sequenceNumber, WebKit::UpdateInfo updateInfo)
-    DidSetSize(uint64_t sequenceNumber, WebKit::UpdateInfo updateInfo)
+    DidSetSize(uint64_t sequenceNumber, WebKit::UpdateInfo updateInfo, WebKit::LayerTreeContext context)
 
 #if USE(ACCELERATED_COMPOSITING)

trunk/Source/WebKit2/UIProcess/DrawingAreaProxyImpl.cpp

@@ -51 +51 @@
     : DrawingAreaProxy(DrawingAreaInfo::Impl, webPageProxy)
     , m_isWaitingForDidSetSize(false)
-    , m_isInAcceleratedCompositingMode(false)
     , m_lastDidSetSizeSequenceNumber(0)
 {
@@ -67 +66 @@
         return;
 
-    ASSERT(!m_isInAcceleratedCompositingMode);
+    ASSERT(!isInAcceleratedCompositingMode());
 
     if (m_isWaitingForDidSetSize) {
@@ -80 +79 @@
     }
 
+    // Dispatching DidSetSize could change the compositing mode, return if that happens.
+    if (isInAcceleratedCompositingMode())
+        return;
+
     m_backingStore->paint(context, rect);
     unpaintedRegion.subtract(IntRect(IntPoint(), m_backingStore->size()));
@@ -142 +145 @@
 }
 
-void DrawingAreaProxyImpl::didSetSize(uint64_t sequenceNumber, const UpdateInfo& updateInfo)
+void DrawingAreaProxyImpl::didSetSize(uint64_t sequenceNumber, const UpdateInfo& updateInfo, const LayerTreeContext& layerTreeContext)
 {
     ASSERT(sequenceNumber > m_lastDidSetSizeSequenceNumber);
@@ -153 +156 @@
         sendSetSize();
 
-    if (m_isInAcceleratedCompositingMode) {
+    if (layerTreeContext != m_layerTreeContext) {
+        if (!m_layerTreeContext.isEmpty()) {
+            exitAcceleratedCompositingMode();
+            ASSERT(m_layerTreeContext.isEmpty());
+        }
+
+        if (!layerTreeContext.isEmpty()) {
+            enterAcceleratedCompositingMode(layerTreeContext);
+            ASSERT(layerTreeContext == m_layerTreeContext);
+        }            
+    }
+
+    if (isInAcceleratedCompositingMode()) {
         ASSERT(!m_backingStore);
         return;
@@ -180 +195 @@
 void DrawingAreaProxyImpl::incorporateUpdate(const UpdateInfo& updateInfo)
 {
-    ASSERT(!m_isInAcceleratedCompositingMode);
+    ASSERT(!isInAcceleratedCompositingMode());
 
     if (updateInfo.updateRectBounds.isEmpty())
@@ -216 +231 @@
 void DrawingAreaProxyImpl::enterAcceleratedCompositingMode(const LayerTreeContext& layerTreeContext)
 {
-    ASSERT(!m_isInAcceleratedCompositingMode);
-    m_isInAcceleratedCompositingMode = true;
-    
+    ASSERT(!isInAcceleratedCompositingMode());
+
     m_backingStore = nullptr;
+    m_layerTreeContext = layerTreeContext;
     m_webPageProxy->enterAcceleratedCompositingMode(layerTreeContext);
 }
@@ -225 +240 @@
 void DrawingAreaProxyImpl::exitAcceleratedCompositingMode()
 {
-    ASSERT(m_isInAcceleratedCompositingMode);
-    m_isInAcceleratedCompositingMode = false;
-    
+    ASSERT(isInAcceleratedCompositingMode());
+
+    m_layerTreeContext = LayerTreeContext();    
     m_webPageProxy->exitAcceleratedCompositingMode();
 }

trunk/Source/WebKit2/UIProcess/DrawingAreaProxyImpl.h

@@ -29 +29 @@
 #include "BackingStore.h"
 #include "DrawingAreaProxy.h"
+#include "LayerTreeContext.h"
 
 namespace WebKit {
@@ -56 +57 @@
     // CoreIPC message handlers
     virtual void update(uint64_t sequenceNumber, const UpdateInfo&);
-    virtual void didSetSize(uint64_t sequenceNumber, const UpdateInfo&);
+    virtual void didSetSize(uint64_t sequenceNumber, const UpdateInfo&, const LayerTreeContext&);
     virtual void enterAcceleratedCompositingMode(uint64_t sequenceNumber, const LayerTreeContext&);
     virtual void exitAcceleratedCompositingMode(uint64_t sequenceNumber);
@@ -66 +67 @@
     void exitAcceleratedCompositingMode();
 
+    bool isInAcceleratedCompositingMode() const { return !m_layerTreeContext.isEmpty(); }
+
+    // The current layer tree context.
+    LayerTreeContext m_layerTreeContext;
+    
     // Whether we've sent a SetSize message and are now waiting for a DidSetSize message.
     // Used to throttle SetSize messages so we don't send them faster than the Web process can handle.
     bool m_isWaitingForDidSetSize;
-
-    // Whether we're in accelerated compositing mode or not.
-    bool m_isInAcceleratedCompositingMode;
 
     // The sequence number of the last DidSetSize message

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

@@ -184 +184 @@
 
     UpdateInfo updateInfo;
+    LayerTreeContext layerTreeContext;
+
+    if (m_layerTreeHost)
+        layerTreeContext = m_layerTreeHost->layerTreeContext();
 
     if (m_isPaintingSuspended || m_layerTreeHost) {
@@ -190 +194 @@
         display(updateInfo);
 
-    m_webPage->send(Messages::DrawingAreaProxy::DidSetSize(generateSequenceNumber(), updateInfo));
+    m_webPage->send(Messages::DrawingAreaProxy::DidSetSize(generateSequenceNumber(), updateInfo, layerTreeContext));
 
     m_inSetSize = false;