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

Side by Side Diff: cc/CCThreadProxy.cpp

Issue 10961008: cc: Remove TextureUploaderOption. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: 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
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 820 matching lines...) Expand 10 before | Expand all | Expand 10 after
871 TRACE_EVENT0("cc", "CCThreadProxy::initializeContextOnImplThread"); 864 TRACE_EVENT0("cc", "CCThreadProxy::initializeContextOnImplThread");
872 ASSERT(isImplThread()); 865 ASSERT(isImplThread());
873 m_contextBeforeInitializationOnImplThread = adoptPtr(context); 866 m_contextBeforeInitializationOnImplThread = adoptPtr(context);
874 } 867 }
875 868
876 void CCThreadProxy::initializeRendererOnImplThread(CCCompletionEvent* completion , bool* initializeSucceeded, RendererCapabilities* capabilities) 869 void CCThreadProxy::initializeRendererOnImplThread(CCCompletionEvent* completion , bool* initializeSucceeded, RendererCapabilities* capabilities)
877 { 870 {
878 TRACE_EVENT0("cc", "CCThreadProxy::initializeRendererOnImplThread"); 871 TRACE_EVENT0("cc", "CCThreadProxy::initializeRendererOnImplThread");
879 ASSERT(isImplThread()); 872 ASSERT(isImplThread());
880 ASSERT(m_contextBeforeInitializationOnImplThread); 873 ASSERT(m_contextBeforeInitializationOnImplThread);
881 *initializeSucceeded = m_layerTreeHostImpl->initializeRenderer(m_contextBefo reInitializationOnImplThread.release(), textureUploader); 874 *initializeSucceeded = m_layerTreeHostImpl->initializeRenderer(m_contextBefo reInitializationOnImplThread.release());
882 if (*initializeSucceeded) { 875 if (*initializeSucceeded) {
883 *capabilities = m_layerTreeHostImpl->rendererCapabilities(); 876 *capabilities = m_layerTreeHostImpl->rendererCapabilities();
884 m_schedulerOnImplThread->setSwapBuffersCompleteSupported( 877 m_schedulerOnImplThread->setSwapBuffersCompleteSupported(
885 capabilities->usingSwapCompleteCallback); 878 capabilities->usingSwapCompleteCallback);
886 } 879 }
887 880
888 completion->signal(); 881 completion->signal();
889 } 882 }
890 883
891 void CCThreadProxy::layerTreeHostClosedOnImplThread(CCCompletionEvent* completio n) 884 void CCThreadProxy::layerTreeHostClosedOnImplThread(CCCompletionEvent* completio n)
(...skipping 16 matching lines...) Expand all
908 size_t CCThreadProxy::maxPartialTextureUpdates() const 901 size_t CCThreadProxy::maxPartialTextureUpdates() const
909 { 902 {
910 return CCTextureUpdateController::maxPartialTextureUpdates(); 903 return CCTextureUpdateController::maxPartialTextureUpdates();
911 } 904 }
912 905
913 void CCThreadProxy::recreateContextOnImplThread(CCCompletionEvent* completion, C CGraphicsContext* contextPtr, bool* recreateSucceeded, RendererCapabilities* cap abilities) 906 void CCThreadProxy::recreateContextOnImplThread(CCCompletionEvent* completion, C CGraphicsContext* contextPtr, bool* recreateSucceeded, RendererCapabilities* cap abilities)
914 { 907 {
915 TRACE_EVENT0("cc", "CCThreadProxy::recreateContextOnImplThread"); 908 TRACE_EVENT0("cc", "CCThreadProxy::recreateContextOnImplThread");
916 ASSERT(isImplThread()); 909 ASSERT(isImplThread());
917 m_layerTreeHost->deleteContentsTexturesOnImplThread(m_layerTreeHostImpl->res ourceProvider()); 910 m_layerTreeHost->deleteContentsTexturesOnImplThread(m_layerTreeHostImpl->res ourceProvider());
918 *recreateSucceeded = m_layerTreeHostImpl->initializeRenderer(adoptPtr(contex tPtr), textureUploader); 911 *recreateSucceeded = m_layerTreeHostImpl->initializeRenderer(adoptPtr(contex tPtr));
919 if (*recreateSucceeded) { 912 if (*recreateSucceeded) {
920 *capabilities = m_layerTreeHostImpl->rendererCapabilities(); 913 *capabilities = m_layerTreeHostImpl->rendererCapabilities();
921 m_schedulerOnImplThread->didRecreateContext(); 914 m_schedulerOnImplThread->didRecreateContext();
922 } 915 }
923 completion->signal(); 916 completion->signal();
924 } 917 }
925 918
926 void CCThreadProxy::implSideRenderingStatsOnImplThread(CCCompletionEvent* comple tion, CCRenderingStats* stats) 919 void CCThreadProxy::implSideRenderingStatsOnImplThread(CCCompletionEvent* comple tion, CCRenderingStats* stats)
927 { 920 {
928 ASSERT(isImplThread()); 921 ASSERT(isImplThread());
929 m_layerTreeHostImpl->renderingStats(*stats); 922 m_layerTreeHostImpl->renderingStats(*stats);
930 completion->signal(); 923 completion->signal();
931 } 924 }
932 925
933 } // namespace cc 926 } // namespace cc
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698