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

Unified Diff: content/browser/android/browser_surface_texture_manager.h

Issue 1120873002: Re-land: content: Single process support for native GpuMemoryBuffers. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@dm-browsertests-refactor
Patch Set: files Created 5 years, 6 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 side-by-side diff with in-line comments
Download patch
Index: content/browser/android/browser_surface_texture_manager.h
diff --git a/content/browser/android/browser_surface_texture_manager.h b/content/browser/android/browser_surface_texture_manager.h
index 959d270548874b736c745db4a735cf4b5957967c..8102634431d699f419b69c33d7b81a45353a4623 100644
--- a/content/browser/android/browser_surface_texture_manager.h
+++ b/content/browser/android/browser_surface_texture_manager.h
@@ -7,6 +7,7 @@
#include "content/common/android/surface_texture_manager.h"
+#include "base/memory/singleton.h"
#include "content/common/android/surface_texture_peer.h"
namespace content {
@@ -14,8 +15,7 @@ namespace content {
class BrowserSurfaceTextureManager : public SurfaceTextureManager,
public SurfaceTexturePeer {
public:
- BrowserSurfaceTextureManager();
- ~BrowserSurfaceTextureManager() override;
+ static BrowserSurfaceTextureManager* GetInstance();
// Overridden from SurfaceTextureManager:
void RegisterSurfaceTexture(int surface_texture_id,
@@ -33,6 +33,11 @@ class BrowserSurfaceTextureManager : public SurfaceTextureManager,
int player_id) override;
private:
+ friend struct DefaultSingletonTraits<BrowserSurfaceTextureManager>;
+
+ BrowserSurfaceTextureManager();
+ ~BrowserSurfaceTextureManager() override;
+
DISALLOW_COPY_AND_ASSIGN(BrowserSurfaceTextureManager);
};

Powered by Google App Engine
This is Rietveld 408576698