Title: [114063] trunk/Source/WebCore
- Revision
- 114063
- Author
- [email protected]
- Date
- 2012-04-12 18:08:21 -0700 (Thu, 12 Apr 2012)
Log Message
[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:
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (114062 => 114063)
--- trunk/Source/WebCore/ChangeLog 2012-04-13 01:07:27 UTC (rev 114062)
+++ trunk/Source/WebCore/ChangeLog 2012-04-13 01:08:21 UTC (rev 114063)
@@ -1,3 +1,18 @@
+2012-04-12 Andrey Kosyakov <[email protected]>
+
+ [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 <[email protected]>
Remove FrameLoader:m_isLoadingMainResource, since it is always
Modified: trunk/Source/WebCore/platform/graphics/chromium/cc/CCSingleThreadProxy.cpp (114062 => 114063)
--- trunk/Source/WebCore/platform/graphics/chromium/cc/CCSingleThreadProxy.cpp 2012-04-13 01:07:27 UTC (rev 114062)
+++ trunk/Source/WebCore/platform/graphics/chromium/cc/CCSingleThreadProxy.cpp 2012-04-13 01:08:21 UTC (rev 114063)
@@ -72,12 +72,9 @@
TRACE_EVENT("CCSingleThreadProxy::compositeAndReadback", this, 0);
ASSERT(CCProxy::isMainThread());
- if (!commitIfNeeded())
+ if (!commitAndComposite())
return false;
- if (!doComposite())
- return false;
-
m_layerTreeHostImpl->readback(pixels, rect);
if (m_layerTreeHostImpl->isContextLost())
@@ -272,16 +269,13 @@
// 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 @@
return false;
doCommit(updater);
- return true;
+ return doComposite();
}
bool CCSingleThreadProxy::doComposite()
Modified: trunk/Source/WebCore/platform/graphics/chromium/cc/CCSingleThreadProxy.h (114062 => 114063)
--- trunk/Source/WebCore/platform/graphics/chromium/cc/CCSingleThreadProxy.h 2012-04-13 01:07:27 UTC (rev 114062)
+++ trunk/Source/WebCore/platform/graphics/chromium/cc/CCSingleThreadProxy.h 2012-04-13 01:08:21 UTC (rev 114063)
@@ -75,7 +75,7 @@
private:
explicit CCSingleThreadProxy(CCLayerTreeHost*);
- bool commitIfNeeded();
+ bool commitAndComposite();
void doCommit(CCTextureUpdater&);
bool doComposite();
void didSwapFrame();
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
