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

Side by Side Diff: cc/CCThreadProxy.cpp

Issue 10961008: cc: Remove TextureUploaderOption. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Settle for removing TextureUploaderOption in this CL. I'll figure out what to do with the uploader … 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/TiledLayerChromiumTest.cpp » ('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 13 matching lines...) Expand all
24 using WebKit::WebSharedGraphicsContext3D; 24 using WebKit::WebSharedGraphicsContext3D;
25 namespace { 25 namespace {
26 26
27 // Measured in seconds. 27 // Measured in seconds.
28 static const double contextRecreationTickRate = 0.03; 28 static const double contextRecreationTickRate = 0.03;
29 29
30 } // anonymous namespace 30 } // anonymous namespace
31 31
32 namespace cc { 32 namespace cc {
33 33
34 namespace {
35
36 // Type of texture uploader to use for texture updates.
37 static TextureUploaderOption textureUploader = ThrottledUploader;
38
39 } // anonymous namespace
40
41 PassOwnPtr<CCProxy> CCThreadProxy::create(CCLayerTreeHost* layerTreeHost) 34 PassOwnPtr<CCProxy> CCThreadProxy::create(CCLayerTreeHost* layerTreeHost)
42 { 35 {
43 return adoptPtr(new CCThreadProxy(layerTreeHost)); 36 return adoptPtr(new CCThreadProxy(layerTreeHost));
44 } 37 }
45 38
46 CCThreadProxy::CCThreadProxy(CCLayerTreeHost* layerTreeHost) 39 CCThreadProxy::CCThreadProxy(CCLayerTreeHost* layerTreeHost)
47 : m_animateRequested(false) 40 : m_animateRequested(false)
48 , m_commitRequested(false) 41 , m_commitRequested(false)
49 , m_commitRequestSentToImplThread(false) 42 , m_commitRequestSentToImplThread(false)
50 , m_forcedCommitRequested(false) 43 , m_forcedCommitRequested(false)
(...skipping 826 matching lines...) Expand 10 before | Expand all | Expand 10 after
877 TRACE_EVENT0("cc", "CCThreadProxy::initializeContextOnImplThread"); 870 TRACE_EVENT0("cc", "CCThreadProxy::initializeContextOnImplThread");
878 ASSERT(isImplThread()); 871 ASSERT(isImplThread());
879 m_contextBeforeInitializationOnImplThread = adoptPtr(context); 872 m_contextBeforeInitializationOnImplThread = adoptPtr(context);
880 } 873 }
881 874
882 void CCThreadProxy::initializeRendererOnImplThread(CCCompletionEvent* completion , bool* initializeSucceeded, RendererCapabilities* capabilities) 875 void CCThreadProxy::initializeRendererOnImplThread(CCCompletionEvent* completion , bool* initializeSucceeded, RendererCapabilities* capabilities)
883 { 876 {
884 TRACE_EVENT0("cc", "CCThreadProxy::initializeRendererOnImplThread"); 877 TRACE_EVENT0("cc", "CCThreadProxy::initializeRendererOnImplThread");
885 ASSERT(isImplThread()); 878 ASSERT(isImplThread());
886 ASSERT(m_contextBeforeInitializationOnImplThread); 879 ASSERT(m_contextBeforeInitializationOnImplThread);
887 *initializeSucceeded = m_layerTreeHostImpl->initializeRenderer(m_contextBefo reInitializationOnImplThread.release(), textureUploader); 880 *initializeSucceeded = m_layerTreeHostImpl->initializeRenderer(m_contextBefo reInitializationOnImplThread.release());
888 if (*initializeSucceeded) { 881 if (*initializeSucceeded) {
889 *capabilities = m_layerTreeHostImpl->rendererCapabilities(); 882 *capabilities = m_layerTreeHostImpl->rendererCapabilities();
890 m_schedulerOnImplThread->setSwapBuffersCompleteSupported( 883 m_schedulerOnImplThread->setSwapBuffersCompleteSupported(
891 capabilities->usingSwapCompleteCallback); 884 capabilities->usingSwapCompleteCallback);
892 } 885 }
893 886
894 completion->signal(); 887 completion->signal();
895 } 888 }
896 889
897 void CCThreadProxy::layerTreeHostClosedOnImplThread(CCCompletionEvent* completio n) 890 void CCThreadProxy::layerTreeHostClosedOnImplThread(CCCompletionEvent* completio n)
(...skipping 16 matching lines...) Expand all
914 size_t CCThreadProxy::maxPartialTextureUpdates() const 907 size_t CCThreadProxy::maxPartialTextureUpdates() const
915 { 908 {
916 return CCTextureUpdateController::maxPartialTextureUpdates(); 909 return CCTextureUpdateController::maxPartialTextureUpdates();
917 } 910 }
918 911
919 void CCThreadProxy::recreateContextOnImplThread(CCCompletionEvent* completion, C CGraphicsContext* contextPtr, bool* recreateSucceeded, RendererCapabilities* cap abilities) 912 void CCThreadProxy::recreateContextOnImplThread(CCCompletionEvent* completion, C CGraphicsContext* contextPtr, bool* recreateSucceeded, RendererCapabilities* cap abilities)
920 { 913 {
921 TRACE_EVENT0("cc", "CCThreadProxy::recreateContextOnImplThread"); 914 TRACE_EVENT0("cc", "CCThreadProxy::recreateContextOnImplThread");
922 ASSERT(isImplThread()); 915 ASSERT(isImplThread());
923 m_layerTreeHost->deleteContentsTexturesOnImplThread(m_layerTreeHostImpl->res ourceProvider()); 916 m_layerTreeHost->deleteContentsTexturesOnImplThread(m_layerTreeHostImpl->res ourceProvider());
924 *recreateSucceeded = m_layerTreeHostImpl->initializeRenderer(adoptPtr(contex tPtr), textureUploader); 917 *recreateSucceeded = m_layerTreeHostImpl->initializeRenderer(adoptPtr(contex tPtr));
925 if (*recreateSucceeded) { 918 if (*recreateSucceeded) {
926 *capabilities = m_layerTreeHostImpl->rendererCapabilities(); 919 *capabilities = m_layerTreeHostImpl->rendererCapabilities();
927 m_schedulerOnImplThread->didRecreateContext(); 920 m_schedulerOnImplThread->didRecreateContext();
928 } 921 }
929 completion->signal(); 922 completion->signal();
930 } 923 }
931 924
932 void CCThreadProxy::implSideRenderingStatsOnImplThread(CCCompletionEvent* comple tion, CCRenderingStats* stats) 925 void CCThreadProxy::implSideRenderingStatsOnImplThread(CCCompletionEvent* comple tion, CCRenderingStats* stats)
933 { 926 {
934 ASSERT(isImplThread()); 927 ASSERT(isImplThread());
935 m_layerTreeHostImpl->renderingStats(*stats); 928 m_layerTreeHostImpl->renderingStats(*stats);
936 completion->signal(); 929 completion->signal();
937 } 930 }
938 931
939 } // namespace cc 932 } // namespace cc
OLDNEW
« no previous file with comments | « cc/CCTextureUpdateControllerTest.cpp ('k') | cc/TiledLayerChromiumTest.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698