Get rid of LayerTreeContext::seed on Mac.

Add sequence checks to enterAcceleratedCompositingMode and exitAcceleratedCompositingMode and
have them call newly added overloads that don't have the checks.

Reviewed by Dan Bernstein.

* Shared/LayerTreeContext.h:
* Shared/mac/LayerTreeContextMac.mm:
(WebKit::LayerTreeContext::LayerTreeContext):
(WebKit::LayerTreeContext::encode):
(WebKit::LayerTreeContext::decode):
* UIProcess/DrawingAreaProxyImpl.cpp:
(WebKit::DrawingAreaProxyImpl::enterAcceleratedCompositingMode):
(WebKit::DrawingAreaProxyImpl::exitAcceleratedCompositingMode):
* UIProcess/DrawingAreaProxyImpl.h:
* WebProcess/WebPage/mac/LayerTreeHostMac.mm:
(WebKit::LayerTreeHostMac::LayerTreeHostMac):

git-svn-id: http://svn.webkit.org/repository/webkit/trunk@77534 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/Source/WebKit2/ChangeLog b/Source/WebKit2/ChangeLog
index 5a6b4bfcdacee425fa4381560240f0f6c18f1312..aa4a54de3c73c0cc33a6c79ac74f186440aa4235 100644 (file)
--- a/Source/WebKit2/ChangeLog
+++ b/Source/WebKit2/ChangeLog
@@ -1,3 +1,23 @@
+2011-02-03  Anders Carlsson  <andersca@apple.com>
+
+        Reviewed by Dan Bernstein.
+
+        Get rid of LayerTreeContext::seed on Mac.
+        Add sequence checks to enterAcceleratedCompositingMode and exitAcceleratedCompositingMode and
+        have them call newly added overloads that don't have the checks.
+
+        * Shared/LayerTreeContext.h:
+        * Shared/mac/LayerTreeContextMac.mm:
+        (WebKit::LayerTreeContext::LayerTreeContext):
+        (WebKit::LayerTreeContext::encode):
+        (WebKit::LayerTreeContext::decode):
+        * UIProcess/DrawingAreaProxyImpl.cpp:
+        (WebKit::DrawingAreaProxyImpl::enterAcceleratedCompositingMode):
+        (WebKit::DrawingAreaProxyImpl::exitAcceleratedCompositingMode):
+        * UIProcess/DrawingAreaProxyImpl.h:
+        * WebProcess/WebPage/mac/LayerTreeHostMac.mm:
+        (WebKit::LayerTreeHostMac::LayerTreeHostMac):
+
 2011-02-03  Anders Carlsson  <andersca@apple.com>
 
         Reviewed by Dan Bernstein.

diff --git a/Source/WebKit2/Shared/LayerTreeContext.h b/Source/WebKit2/Shared/LayerTreeContext.h
index a7394529ca7a452980f4285d5790f1a7d09c7732..dab04f36920a7b62c61304ce7ce1944d5a4b50f1 100644 (file)
--- a/Source/WebKit2/Shared/LayerTreeContext.h
+++ b/Source/WebKit2/Shared/LayerTreeContext.h
@@ -40,15 +40,12 @@ public:
     LayerTreeContext();
     ~LayerTreeContext();
 
-    static LayerTreeContext makeWithSeed();
-
     void encode(CoreIPC::ArgumentEncoder*) const;
     static bool decode(CoreIPC::ArgumentDecoder*, LayerTreeContext&);
 
     bool isEmpty() const;
 
 #if PLATFORM(MAC)
-    uint64_t seed;
     uint32_t contextID;
 #endif
 };

diff --git a/Source/WebKit2/Shared/mac/LayerTreeContextMac.mm b/Source/WebKit2/Shared/mac/LayerTreeContextMac.mm
index a61708d7f9bc004200f7486e76453e57b3b217ae..f503908a1767c1834dc4bb273a1958de09317474 100644 (file)
--- a/Source/WebKit2/Shared/mac/LayerTreeContextMac.mm
+++ b/Source/WebKit2/Shared/mac/LayerTreeContextMac.mm
@@ -32,8 +32,7 @@
 namespace WebKit {
 
 LayerTreeContext::LayerTreeContext()
-    : seed(0)
-    , contextID(0)
+    : contextID(0)
 {
 }
 
@@ -41,29 +40,17 @@ LayerTreeContext::~LayerTreeContext()
 {
 }
 
-LayerTreeContext LayerTreeContext::makeWithSeed()
-{
-    static uint64_t seed;
-
-    LayerTreeContext layerTreeContext;
-    layerTreeContext.seed = ++seed;
-    ASSERT(layerTreeContext.seed);
-
-    return layerTreeContext;
-}
-
 void LayerTreeContext::encode(CoreIPC::ArgumentEncoder* encoder) const
 {
-    encoder->encode(seed);
     encoder->encode(contextID);
 }
 
 bool LayerTreeContext::decode(CoreIPC::ArgumentDecoder* decoder, LayerTreeContext& result)
 {
-    if (!decoder->decode(result.seed))
+    if (!decoder->decode(result.contextID))
         return false;
 
-    return decoder->decode(result.contextID);
+    return true;
 }
 
 bool LayerTreeContext::isEmpty() const

diff --git a/Source/WebKit2/UIProcess/DrawingAreaProxyImpl.cpp b/Source/WebKit2/UIProcess/DrawingAreaProxyImpl.cpp
index 9f85d3ba511fe9003dc644461f0e5c9ff2a32c2b..dae5c737385922fbe109b705611c0846869279d4 100644 (file)
--- a/Source/WebKit2/UIProcess/DrawingAreaProxyImpl.cpp
+++ b/Source/WebKit2/UIProcess/DrawingAreaProxyImpl.cpp
@@ -163,19 +163,18 @@ void DrawingAreaProxyImpl::didSetSize(uint64_t sequenceNumber, const UpdateInfo&
 
 void DrawingAreaProxyImpl::enterAcceleratedCompositingMode(uint64_t sequenceNumber, const LayerTreeContext& layerTreeContext)
 {
-    ASSERT(!m_isInAcceleratedCompositingMode);
-    m_isInAcceleratedCompositingMode = true;
+    if (sequenceNumber < m_lastDidSetSizeSequenceNumber)
+        return;
 
-    m_backingStore = nullptr;
-    m_webPageProxy->enterAcceleratedCompositingMode(layerTreeContext);
+    enterAcceleratedCompositingMode(layerTreeContext);
 }
 
 void DrawingAreaProxyImpl::exitAcceleratedCompositingMode(uint64_t sequenceNumber)
 {
-    ASSERT(m_isInAcceleratedCompositingMode);
-    m_isInAcceleratedCompositingMode = false;
+    if (sequenceNumber < m_lastDidSetSizeSequenceNumber)
+        return;
 
-    m_webPageProxy->exitAcceleratedCompositingMode();
+    exitAcceleratedCompositingMode();
 }
 
 void DrawingAreaProxyImpl::incorporateUpdate(const UpdateInfo& updateInfo)
@@ -214,4 +213,21 @@ void DrawingAreaProxyImpl::sendSetSize()
     m_webPageProxy->process()->send(Messages::DrawingArea::SetSize(m_size), m_webPageProxy->pageID());
 }
 
+void DrawingAreaProxyImpl::enterAcceleratedCompositingMode(const LayerTreeContext& layerTreeContext)
+{
+    ASSERT(!m_isInAcceleratedCompositingMode);
+    m_isInAcceleratedCompositingMode = true;
+    
+    m_backingStore = nullptr;
+    m_webPageProxy->enterAcceleratedCompositingMode(layerTreeContext);
+}
+
+void DrawingAreaProxyImpl::exitAcceleratedCompositingMode()
+{
+    ASSERT(m_isInAcceleratedCompositingMode);
+    m_isInAcceleratedCompositingMode = false;
+    
+    m_webPageProxy->exitAcceleratedCompositingMode();
+}
+
 } // namespace WebKit

diff --git a/Source/WebKit2/UIProcess/DrawingAreaProxyImpl.h b/Source/WebKit2/UIProcess/DrawingAreaProxyImpl.h
index d91ba87592d5c690798c6514bc8cc5a9a1403270..ebc1e8a20cae34072b57c8785773086b9ff87112 100644 (file)
--- a/Source/WebKit2/UIProcess/DrawingAreaProxyImpl.h
+++ b/Source/WebKit2/UIProcess/DrawingAreaProxyImpl.h
@@ -62,6 +62,9 @@ private:
     void incorporateUpdate(const UpdateInfo&);
     void sendSetSize();
 
+    void enterAcceleratedCompositingMode(const LayerTreeContext&);
+    void exitAcceleratedCompositingMode();
+
     // 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;

diff --git a/Source/WebKit2/WebProcess/WebPage/mac/LayerTreeHostMac.mm b/Source/WebKit2/WebProcess/WebPage/mac/LayerTreeHostMac.mm
index afce617dc90967e5722e8c3a084ac87049989cf8..9b445a391a737833f7bd6b1db6cd2af8467731da 100644 (file)
--- a/Source/WebKit2/WebProcess/WebPage/mac/LayerTreeHostMac.mm
+++ b/Source/WebKit2/WebProcess/WebPage/mac/LayerTreeHostMac.mm
@@ -45,7 +45,6 @@ PassRefPtr<LayerTreeHostMac> LayerTreeHostMac::create(WebPage* webPage, Graphics
 
 LayerTreeHostMac::LayerTreeHostMac(WebPage* webPage, GraphicsLayer* graphicsLayer)
     : LayerTreeHost(webPage)
-    , m_layerTreeContext(LayerTreeContext::makeWithSeed())
     , m_isValid(true)
 {
     mach_port_t serverPort = WebProcess::shared().compositingRenderServerPort();