Index: content/browser/android/browser_surface_texture_manager.cc |
diff --git a/content/browser/android/browser_surface_texture_manager.cc b/content/browser/android/browser_surface_texture_manager.cc |
index 832036b1864ef4af1bbc42aaef48ae9ab8536a9b..33d6631d960837e040e444cedb0b43b1d6ceb7c1 100644 |
--- a/content/browser/android/browser_surface_texture_manager.cc |
+++ b/content/browser/android/browser_surface_texture_manager.cc |
@@ -73,12 +73,10 @@ static void SetSurfacePeer(scoped_refptr<gfx::SurfaceTexture> surface_texture, |
} // namespace |
-BrowserSurfaceTextureManager::BrowserSurfaceTextureManager() { |
- SurfaceTexturePeer::InitInstance(this); |
-} |
- |
-BrowserSurfaceTextureManager::~BrowserSurfaceTextureManager() { |
- SurfaceTexturePeer::InitInstance(NULL); |
+// static |
+BrowserSurfaceTextureManager* BrowserSurfaceTextureManager::GetInstance() { |
+ return Singleton<BrowserSurfaceTextureManager, |
+ LeakySingletonTraits<BrowserSurfaceTextureManager>>::get(); |
} |
void BrowserSurfaceTextureManager::RegisterSurfaceTexture( |
@@ -133,4 +131,12 @@ void BrowserSurfaceTextureManager::EstablishSurfaceTexturePeer( |
player_id)); |
} |
+BrowserSurfaceTextureManager::BrowserSurfaceTextureManager() { |
+ SurfaceTexturePeer::InitInstance(this); |
+} |
+ |
+BrowserSurfaceTextureManager::~BrowserSurfaceTextureManager() { |
+ SurfaceTexturePeer::InitInstance(NULL); |
Avi (use Gerrit)
2015/06/09 22:05:38
nullptr
reveman
2015/06/09 22:15:16
Done.
|
+} |
+ |
} // namespace content |