Commit 27f02a26 authored by reveman's avatar reveman Committed by Commit bot

content: Rename SurfaceTextureManager::InitInstance to SetInstance.

BUG=323304

Review URL: https://codereview.chromium.org/1122383005

Cr-Commit-Position: refs/heads/master@{#330407}
parent 5585b3e2
...@@ -150,7 +150,7 @@ void InternalInitChildProcess(const std::vector<int>& file_ids, ...@@ -150,7 +150,7 @@ void InternalInitChildProcess(const std::vector<int>& file_ids,
for (size_t i = 0; i < file_ids.size(); ++i) for (size_t i = 0; i < file_ids.size(); ++i)
base::GlobalDescriptors::GetInstance()->Set(file_ids[i], file_fds[i]); base::GlobalDescriptors::GetInstance()->Set(file_ids[i], file_fds[i]);
SurfaceTextureManager::InitInstance(new SurfaceTextureManagerImpl(service)); SurfaceTextureManager::SetInstance(new SurfaceTextureManagerImpl(service));
base::android::MemoryPressureListenerAndroid::RegisterSystemCallback(env); base::android::MemoryPressureListenerAndroid::RegisterSystemCallback(env);
} }
......
...@@ -571,7 +571,7 @@ void BrowserMainLoop::MainMessageLoopStart() { ...@@ -571,7 +571,7 @@ void BrowserMainLoop::MainMessageLoopStart() {
#if defined(OS_ANDROID) #if defined(OS_ANDROID)
{ {
TRACE_EVENT0("startup", "BrowserMainLoop::Subsystem:SurfaceTextureManager"); TRACE_EVENT0("startup", "BrowserMainLoop::Subsystem:SurfaceTextureManager");
SurfaceTextureManager::InitInstance(new BrowserSurfaceTextureManager); SurfaceTextureManager::SetInstance(new BrowserSurfaceTextureManager);
} }
if (!parsed_command_line_.HasSwitch( if (!parsed_command_line_.HasSwitch(
......
...@@ -20,7 +20,7 @@ SurfaceTextureManager* SurfaceTextureManager::GetInstance() { ...@@ -20,7 +20,7 @@ SurfaceTextureManager* SurfaceTextureManager::GetInstance() {
} }
// static // static
void SurfaceTextureManager::InitInstance(SurfaceTextureManager* instance) { void SurfaceTextureManager::SetInstance(SurfaceTextureManager* instance) {
DCHECK(!g_instance || !instance); DCHECK(!g_instance || !instance);
g_instance = instance; g_instance = instance;
} }
......
...@@ -17,7 +17,7 @@ namespace content { ...@@ -17,7 +17,7 @@ namespace content {
class CONTENT_EXPORT SurfaceTextureManager { class CONTENT_EXPORT SurfaceTextureManager {
public: public:
static SurfaceTextureManager* GetInstance(); static SurfaceTextureManager* GetInstance();
static void InitInstance(SurfaceTextureManager* instance); static void SetInstance(SurfaceTextureManager* instance);
// Register a surface texture for use in another process. // Register a surface texture for use in another process.
virtual void RegisterSurfaceTexture(int surface_texture_id, virtual void RegisterSurfaceTexture(int surface_texture_id,
......
...@@ -135,7 +135,7 @@ void ContentTestSuite::Initialize() { ...@@ -135,7 +135,7 @@ void ContentTestSuite::Initialize() {
testing::UnitTest::GetInstance()->listeners(); testing::UnitTest::GetInstance()->listeners();
listeners.Append(new TestInitializationListener); listeners.Append(new TestInitializationListener);
#if defined(OS_ANDROID) #if defined(OS_ANDROID)
SurfaceTextureManager::InitInstance(new TestSurfaceTextureManager); SurfaceTextureManager::SetInstance(new TestSurfaceTextureManager);
#endif #endif
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment