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

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

Issue 1171293005: Revert of content: Single process support for native GpuMemoryBuffers. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@dm-browsertests-refactor
Patch Set: 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/in_process_surface_texture_manager.h
diff --git a/content/browser/android/in_process_surface_texture_manager.h b/content/browser/android/in_process_surface_texture_manager.h
deleted file mode 100644
index 26573eb7a624c2b278f73a6e6835d9d79b90b002..0000000000000000000000000000000000000000
--- a/content/browser/android/in_process_surface_texture_manager.h
+++ /dev/null
@@ -1,57 +0,0 @@
-// Copyright 2015 The Chromium Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
-#ifndef CONTENT_BROWSER_ANDROID_IN_PROCESS_SURFACE_TEXTURE_MANAGER_H_
-#define CONTENT_BROWSER_ANDROID_IN_PROCESS_SURFACE_TEXTURE_MANAGER_H_
-
-#include "content/common/android/surface_texture_manager.h"
-
-#include "base/containers/scoped_ptr_hash_map.h"
-#include "base/memory/scoped_ptr.h"
-#include "base/memory/singleton.h"
-#include "base/synchronization/lock.h"
-#include "content/common/android/surface_texture_peer.h"
-#include "content/common/content_export.h"
-#include "ui/gl/android/scoped_java_surface.h"
-
-namespace content {
-
-class CONTENT_EXPORT InProcessSurfaceTextureManager
- : public SurfaceTextureManager,
- public SurfaceTexturePeer {
- public:
- static InProcessSurfaceTextureManager* GetInstance();
-
- // Overridden from SurfaceTextureManager:
- void RegisterSurfaceTexture(int surface_texture_id,
- int client_id,
- gfx::SurfaceTexture* surface_texture) override;
- void UnregisterSurfaceTexture(int surface_texture_id, int client_id) override;
- gfx::AcceleratedWidget AcquireNativeWidgetForSurfaceTexture(
- int surface_texture_id) override;
-
- // Overridden from SurfaceTexturePeer:
- void EstablishSurfaceTexturePeer(
- base::ProcessHandle render_process_handle,
- scoped_refptr<gfx::SurfaceTexture> surface_texture,
- int render_frame_id,
- int player_id) override;
-
- private:
- friend struct DefaultSingletonTraits<InProcessSurfaceTextureManager>;
-
- InProcessSurfaceTextureManager();
- ~InProcessSurfaceTextureManager() override;
-
- using SurfaceTextureMap =
- base::ScopedPtrHashMap<int, scoped_ptr<gfx::ScopedJavaSurface>>;
- SurfaceTextureMap surface_textures_;
- base::Lock lock_;
-
- DISALLOW_COPY_AND_ASSIGN(InProcessSurfaceTextureManager);
-};
-
-} // namespace content
-
-#endif // CONTENT_BROWSER_ANDROID_IN_PROCESS_SURFACE_TEXTURE_MANAGER_H_

Powered by Google App Engine
This is Rietveld 408576698