Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(285)

Unified Diff: Source/WebCore/platform/graphics/chromium/cc/CCThreadProxy.cpp

Issue 10448114: Merge 117825 - Don't force rendering in finishAllRendering (Closed) Base URL: http://svn.webkit.org/repository/webkit/branches/chromium/1132/
Patch Set: Created 8 years, 7 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: Source/WebCore/platform/graphics/chromium/cc/CCThreadProxy.cpp
===================================================================
--- Source/WebCore/platform/graphics/chromium/cc/CCThreadProxy.cpp (revision 119174)
+++ Source/WebCore/platform/graphics/chromium/cc/CCThreadProxy.cpp (working copy)
@@ -74,7 +74,6 @@
, m_mainThreadProxy(CCScopedThreadProxy::create(CCProxy::mainThread()))
, m_beginFrameCompletionEventOnImplThread(0)
, m_readbackRequestOnImplThread(0)
- , m_finishAllRenderingCompletionEventOnImplThread(0)
, m_commitCompletionEventOnImplThread(0)
, m_textureAcquisitionCompletionEventOnImplThread(0)
, m_nextFrameIsNewlyCommittedFrameOnImplThread(false)
@@ -420,10 +419,8 @@
{
TRACE_EVENT("CCThreadProxy::finishAllRenderingOnImplThread", this, 0);
ASSERT(isImplThread());
- ASSERT(!m_finishAllRenderingCompletionEventOnImplThread);
- m_finishAllRenderingCompletionEventOnImplThread = completion;
-
- m_schedulerOnImplThread->setNeedsForcedRedraw();
+ m_layerTreeHostImpl->finishAllRendering();
+ completion->signal();
}
void CCThreadProxy::forceBeginFrameOnImplThread(CCCompletionEvent* completion)
@@ -652,13 +649,6 @@
if (drawFrame)
result.didSwap = m_layerTreeHostImpl->swapBuffers();
- // Process any finish request
- if (m_finishAllRenderingCompletionEventOnImplThread) {
- m_layerTreeHostImpl->finishAllRendering();
- m_finishAllRenderingCompletionEventOnImplThread->signal();
- m_finishAllRenderingCompletionEventOnImplThread = 0;
- }
-
// Tell the main thread that the the newly-commited frame was drawn.
if (m_nextFrameIsNewlyCommittedFrameOnImplThread) {
m_nextFrameIsNewlyCommittedFrameOnImplThread = false;
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698