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

Side by Side Diff: cc/CCThreadProxy.cpp

Issue 10898023: Update cc snapshot to WK r126941 (Closed) Base URL: http://git.chromium.org/chromium/src.git@master
Patch Set: rebased Created 8 years, 3 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 unified diff | Download patch
« no previous file with comments | « cc/CCTextureLayerImpl.cpp ('k') | cc/CCTiledLayerImpl.h » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright 2011 The Chromium Authors. All rights reserved. 1 // Copyright 2011 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "config.h" 5 #include "config.h"
6 6
7 #include "CCThreadProxy.h" 7 #include "CCThreadProxy.h"
8 8
9 #include "CCDelayBasedTimeSource.h" 9 #include "CCDelayBasedTimeSource.h"
10 #include "CCDrawQuad.h" 10 #include "CCDrawQuad.h"
(...skipping 276 matching lines...) Expand 10 before | Expand all | Expand 10 after
287 287
288 TRACE_EVENT0("cc", "CCThreadProxy::setNeedsCommit"); 288 TRACE_EVENT0("cc", "CCThreadProxy::setNeedsCommit");
289 m_commitRequested = true; 289 m_commitRequested = true;
290 CCProxy::implThread()->postTask(createCCThreadTask(this, &CCThreadProxy::set NeedsCommitOnImplThread)); 290 CCProxy::implThread()->postTask(createCCThreadTask(this, &CCThreadProxy::set NeedsCommitOnImplThread));
291 } 291 }
292 292
293 void CCThreadProxy::didLoseContextOnImplThread() 293 void CCThreadProxy::didLoseContextOnImplThread()
294 { 294 {
295 ASSERT(isImplThread()); 295 ASSERT(isImplThread());
296 TRACE_EVENT0("cc", "CCThreadProxy::didLoseContextOnImplThread"); 296 TRACE_EVENT0("cc", "CCThreadProxy::didLoseContextOnImplThread");
297 m_currentTextureUpdateControllerOnImplThread.clear();
297 m_schedulerOnImplThread->didLoseContext(); 298 m_schedulerOnImplThread->didLoseContext();
298 } 299 }
299 300
300 void CCThreadProxy::onSwapBuffersCompleteOnImplThread() 301 void CCThreadProxy::onSwapBuffersCompleteOnImplThread()
301 { 302 {
302 ASSERT(isImplThread()); 303 ASSERT(isImplThread());
303 TRACE_EVENT0("cc", "CCThreadProxy::onSwapBuffersCompleteOnImplThread"); 304 TRACE_EVENT0("cc", "CCThreadProxy::onSwapBuffersCompleteOnImplThread");
304 m_schedulerOnImplThread->didSwapBuffersComplete(); 305 m_schedulerOnImplThread->didSwapBuffersComplete();
305 m_mainThreadProxy->postTask(createCCThreadTask(this, &CCThreadProxy::didComp leteSwapBuffers)); 306 m_mainThreadProxy->postTask(createCCThreadTask(this, &CCThreadProxy::didComp leteSwapBuffers));
306 } 307 }
(...skipping 285 matching lines...) Expand 10 before | Expand all | Expand 10 after
592 { 593 {
593 TRACE_EVENT0("cc", "CCThreadProxy::scheduledActionUpdateMoreResources"); 594 TRACE_EVENT0("cc", "CCThreadProxy::scheduledActionUpdateMoreResources");
594 ASSERT(m_currentTextureUpdateControllerOnImplThread); 595 ASSERT(m_currentTextureUpdateControllerOnImplThread);
595 m_currentTextureUpdateControllerOnImplThread->updateMoreTextures(monotonicTi meLimit); 596 m_currentTextureUpdateControllerOnImplThread->updateMoreTextures(monotonicTi meLimit);
596 } 597 }
597 598
598 void CCThreadProxy::scheduledActionCommit() 599 void CCThreadProxy::scheduledActionCommit()
599 { 600 {
600 TRACE_EVENT0("cc", "CCThreadProxy::scheduledActionCommit"); 601 TRACE_EVENT0("cc", "CCThreadProxy::scheduledActionCommit");
601 ASSERT(isImplThread()); 602 ASSERT(isImplThread());
602 ASSERT(m_currentTextureUpdateControllerOnImplThread); 603 ASSERT(!hasMoreResourceUpdates());
603 ASSERT(!m_currentTextureUpdateControllerOnImplThread->hasMoreUpdates());
604 ASSERT(m_commitCompletionEventOnImplThread); 604 ASSERT(m_commitCompletionEventOnImplThread);
605 605
606 m_currentTextureUpdateControllerOnImplThread.clear(); 606 m_currentTextureUpdateControllerOnImplThread.clear();
607 607
608 m_layerTreeHostImpl->beginCommit(); 608 m_layerTreeHostImpl->beginCommit();
609 609
610 m_layerTreeHost->beginCommitOnImplThread(m_layerTreeHostImpl.get()); 610 m_layerTreeHost->beginCommitOnImplThread(m_layerTreeHostImpl.get());
611 m_layerTreeHost->finishCommitOnImplThread(m_layerTreeHostImpl.get()); 611 m_layerTreeHost->finishCommitOnImplThread(m_layerTreeHostImpl.get());
612 612
613 if (m_resetContentsTexturesPurgedAfterCommitOnImplThread) { 613 if (m_resetContentsTexturesPurgedAfterCommitOnImplThread) {
(...skipping 269 matching lines...) Expand 10 before | Expand all | Expand 10 after
883 } 883 }
884 884
885 void CCThreadProxy::implSideRenderingStatsOnImplThread(CCCompletionEvent* comple tion, CCRenderingStats* stats) 885 void CCThreadProxy::implSideRenderingStatsOnImplThread(CCCompletionEvent* comple tion, CCRenderingStats* stats)
886 { 886 {
887 ASSERT(isImplThread()); 887 ASSERT(isImplThread());
888 m_layerTreeHostImpl->renderingStats(*stats); 888 m_layerTreeHostImpl->renderingStats(*stats);
889 completion->signal(); 889 completion->signal();
890 } 890 }
891 891
892 } // namespace WebCore 892 } // namespace WebCore
OLDNEW
« no previous file with comments | « cc/CCTextureLayerImpl.cpp ('k') | cc/CCTiledLayerImpl.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698