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

Unified Diff: cc/CCSingleThreadProxy.cpp

Issue 10915298: Add CCDelegatingRenderer, and corresponding IPCs (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: fix clang Created 8 years, 2 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 | « cc/CCResourceProviderTest.cpp ('k') | cc/CCTextureDrawQuad.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: cc/CCSingleThreadProxy.cpp
diff --git a/cc/CCSingleThreadProxy.cpp b/cc/CCSingleThreadProxy.cpp
index 6e342a00be7d88da1a015ed02be0935544ee3bbc..2ceb0cdeee089aa4ca66babd2f092ade98025910 100644
--- a/cc/CCSingleThreadProxy.cpp
+++ b/cc/CCSingleThreadProxy.cpp
@@ -305,7 +305,7 @@ void CCSingleThreadProxy::forceSerializeOnSwapBuffers()
void CCSingleThreadProxy::onSwapBuffersCompleteOnImplThread()
{
- ASSERT_NOT_REACHED();
+ //ASSERT_NOT_REACHED();
}
bool CCSingleThreadProxy::commitAndComposite()
@@ -363,10 +363,10 @@ bool CCSingleThreadProxy::doComposite()
m_layerTreeHostImpl->prepareToDraw(frame);
m_layerTreeHostImpl->drawLayers(frame);
m_layerTreeHostImpl->didDrawAllLayers(frame);
+ m_contextLost = m_layerTreeHostImpl->isContextLost();
}
- if (m_layerTreeHostImpl->isContextLost()) {
- m_contextLost = true;
+ if (m_contextLost) {
m_layerTreeHost->didLoseContext();
return false;
}
« no previous file with comments | « cc/CCResourceProviderTest.cpp ('k') | cc/CCTextureDrawQuad.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698