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

Side by Side Diff: cc/CCThreadProxy.cpp

Issue 10917251: Move TextureCopier and TextureUploader from CCRenderer to CCResourceProvider (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: fix rebase merge issues 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 | Annotate | Revision Log
« no previous file with comments | « cc/CCTextureUpdateControllerTest.cpp ('k') | cc/test/CCTiledLayerTestCommon.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 576 matching lines...) Expand 10 before | Expand all | Expand 10 after
587 } else if (m_layerTreeHostImpl->contentsTexturesPurged()) { 587 } else if (m_layerTreeHostImpl->contentsTexturesPurged()) {
588 // We purged the content textures on the impl thread between the time we 588 // We purged the content textures on the impl thread between the time we
589 // posted the beginFrame task and now, meaning we have a bunch of 589 // posted the beginFrame task and now, meaning we have a bunch of
590 // uploads that are now invalid. Clear the uploads (they all go to 590 // uploads that are now invalid. Clear the uploads (they all go to
591 // content textures), and kick another commit to fill them again. 591 // content textures), and kick another commit to fill them again.
592 queue->clearUploads(); 592 queue->clearUploads();
593 setNeedsCommitOnImplThread(); 593 setNeedsCommitOnImplThread();
594 } 594 }
595 595
596 bool hasResourceUpdates = !!queue->fullUploadSize(); 596 bool hasResourceUpdates = !!queue->fullUploadSize();
597 m_currentTextureUpdateControllerOnImplThread = CCTextureUpdateController::cr eate(this, CCProxy::implThread(), queue, m_layerTreeHostImpl->resourceProvider() , m_layerTreeHostImpl->renderer()->textureCopier(), m_layerTreeHostImpl->rendere r()->textureUploader()); 597 m_currentTextureUpdateControllerOnImplThread = CCTextureUpdateController::cr eate(this, CCProxy::implThread(), queue, m_layerTreeHostImpl->resourceProvider() , m_layerTreeHostImpl->resourceProvider()->textureUploader());
598 m_commitCompletionEventOnImplThread = completion; 598 m_commitCompletionEventOnImplThread = completion;
599 599
600 m_schedulerOnImplThread->beginFrameComplete(hasResourceUpdates); 600 m_schedulerOnImplThread->beginFrameComplete(hasResourceUpdates);
601 } 601 }
602 602
603 void CCThreadProxy::beginFrameAbortedOnImplThread() 603 void CCThreadProxy::beginFrameAbortedOnImplThread()
604 { 604 {
605 TRACE_EVENT0("cc", "CCThreadProxy::beginFrameAbortedOnImplThread"); 605 TRACE_EVENT0("cc", "CCThreadProxy::beginFrameAbortedOnImplThread");
606 ASSERT(isImplThread()); 606 ASSERT(isImplThread());
607 ASSERT(m_schedulerOnImplThread); 607 ASSERT(m_schedulerOnImplThread);
(...skipping 308 matching lines...) Expand 10 before | Expand all | Expand 10 after
916 } 916 }
917 917
918 void CCThreadProxy::implSideRenderingStatsOnImplThread(CCCompletionEvent* comple tion, CCRenderingStats* stats) 918 void CCThreadProxy::implSideRenderingStatsOnImplThread(CCCompletionEvent* comple tion, CCRenderingStats* stats)
919 { 919 {
920 ASSERT(isImplThread()); 920 ASSERT(isImplThread());
921 m_layerTreeHostImpl->renderingStats(*stats); 921 m_layerTreeHostImpl->renderingStats(*stats);
922 completion->signal(); 922 completion->signal();
923 } 923 }
924 924
925 } // namespace cc 925 } // namespace cc
OLDNEW
« no previous file with comments | « cc/CCTextureUpdateControllerTest.cpp ('k') | cc/test/CCTiledLayerTestCommon.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698