[chromium][refactoring] merge CCSingleThreadProxy::{commitIfNeeded,doComposite} into...

https://bugs.webkit.org/show_bug.cgi?id=83837

Reviewed by James Robinson.

- merge CCSingleThreadProxy::commitIfNeeded() and CCSingleThreadProxy::doComposite() into commitAndComposite()

* platform/graphics/chromium/cc/CCSingleThreadProxy.cpp:
(WebCore::CCSingleThreadProxy::compositeAndReadback): call site updated.
(WebCore::CCSingleThreadProxy::compositeImmediately): ditto.
(WebCore::CCSingleThreadProxy::commitAndComposite):
* platform/graphics/chromium/cc/CCSingleThreadProxy.h:

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

diff --git a/Source/WebCore/ChangeLog b/Source/WebCore/ChangeLog
index 8fdc360..b2c93f0 100644 (file)
--- a/Source/WebCore/ChangeLog
+++ b/Source/WebCore/ChangeLog
@@ -1,3 +1,18 @@
+2012-04-12  Andrey Kosyakov  <caseq@chromium.org>
+
+        [chromium][refactoring] merge CCSingleThreadProxy::{commitIfNeeded,doComposite} into commitAndComposite()
+        https://bugs.webkit.org/show_bug.cgi?id=83837
+
+        Reviewed by James Robinson.
+
+        - merge CCSingleThreadProxy::commitIfNeeded() and CCSingleThreadProxy::doComposite() into commitAndComposite()
+
+        * platform/graphics/chromium/cc/CCSingleThreadProxy.cpp:
+        (WebCore::CCSingleThreadProxy::compositeAndReadback): call site updated.
+        (WebCore::CCSingleThreadProxy::compositeImmediately): ditto.
+        (WebCore::CCSingleThreadProxy::commitAndComposite):
+        * platform/graphics/chromium/cc/CCSingleThreadProxy.h:
+
 2012-04-12  Nate Chapin  <japhet@chromium.org>
 
         Remove FrameLoader:m_isLoadingMainResource, since it is always

diff --git a/Source/WebCore/platform/graphics/chromium/cc/CCSingleThreadProxy.cpp b/Source/WebCore/platform/graphics/chromium/cc/CCSingleThreadProxy.cpp
index 9223c5f..3e53efe 100644 (file)
--- a/Source/WebCore/platform/graphics/chromium/cc/CCSingleThreadProxy.cpp
+++ b/Source/WebCore/platform/graphics/chromium/cc/CCSingleThreadProxy.cpp
@@ -72,10 +72,7 @@ bool CCSingleThreadProxy::compositeAndReadback(void *pixels, const IntRect& rect
     TRACE_EVENT("CCSingleThreadProxy::compositeAndReadback", this, 0);
     ASSERT(CCProxy::isMainThread());
 
-    if (!commitIfNeeded())
-        return false;
-
-    if (!doComposite())
+    if (!commitAndComposite())
         return false;
 
     m_layerTreeHostImpl->readback(pixels, rect);
@@ -272,16 +269,13 @@ void CCSingleThreadProxy::postAnimationEventsToMainThreadOnImplThread(PassOwnPtr
 // Called by the legacy scheduling path (e.g. where render_widget does the scheduling)
 void CCSingleThreadProxy::compositeImmediately()
 {
-    if (!commitIfNeeded())
-        return;
-
-    if (doComposite()) {
+    if (commitAndComposite()) {
         m_layerTreeHostImpl->swapBuffers();
         didSwapFrame();
     }
 }
 
-bool CCSingleThreadProxy::commitIfNeeded()
+bool CCSingleThreadProxy::commitAndComposite()
 {
     ASSERT(CCProxy::isMainThread());
 
@@ -291,7 +285,7 @@ bool CCSingleThreadProxy::commitIfNeeded()
         return false;
 
     doCommit(updater);
-    return true;
+    return doComposite();
 }
 
 bool CCSingleThreadProxy::doComposite()

diff --git a/Source/WebCore/platform/graphics/chromium/cc/CCSingleThreadProxy.h b/Source/WebCore/platform/graphics/chromium/cc/CCSingleThreadProxy.h
index 9dec4f4..339beaa 100644 (file)
--- a/Source/WebCore/platform/graphics/chromium/cc/CCSingleThreadProxy.h
+++ b/Source/WebCore/platform/graphics/chromium/cc/CCSingleThreadProxy.h
@@ -75,7 +75,7 @@ public:
 private:
     explicit CCSingleThreadProxy(CCLayerTreeHost*);
 
-    bool commitIfNeeded();
+    bool commitAndComposite();
     void doCommit(CCTextureUpdater&);
     bool doComposite();
     void didSwapFrame();