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

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

Issue 2525483005: Remove SurfaceTextureManager (Closed)
Patch Set: Fix link error Created 4 years 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.cc
diff --git a/content/browser/android/browser_surface_texture_manager.cc b/content/browser/android/browser_surface_texture_manager.cc
deleted file mode 100644
index 63178244a52aedf9ce08eb8179876f97eb4016df..0000000000000000000000000000000000000000
--- a/content/browser/android/browser_surface_texture_manager.cc
+++ /dev/null
@@ -1,67 +0,0 @@
-// Copyright 2014 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.
-
-#include "content/browser/android/browser_surface_texture_manager.h"
-
-#include <android/native_window_jni.h>
-
-#include "base/android/jni_android.h"
-#include "content/browser/android/child_process_launcher_android.h"
-#include "content/browser/frame_host/render_frame_host_impl.h"
-#include "content/browser/gpu/browser_gpu_channel_host_factory.h"
-#include "content/browser/media/android/browser_media_player_manager.h"
-#include "content/public/browser/browser_thread.h"
-#include "ui/gl/android/scoped_java_surface.h"
-#include "ui/gl/android/surface_texture.h"
-
-namespace content {
-
-// static
-BrowserSurfaceTextureManager* BrowserSurfaceTextureManager::GetInstance() {
- return base::Singleton<
- BrowserSurfaceTextureManager,
- base::LeakySingletonTraits<BrowserSurfaceTextureManager>>::get();
-}
-
-void BrowserSurfaceTextureManager::RegisterSurfaceTexture(
- int surface_texture_id,
- int client_id,
- gl::SurfaceTexture* surface_texture) {
- content::CreateSurfaceTextureSurface(
- surface_texture_id, client_id, surface_texture);
-}
-
-void BrowserSurfaceTextureManager::UnregisterSurfaceTexture(
- int surface_texture_id,
- int client_id) {
- content::DestroySurfaceTextureSurface(surface_texture_id, client_id);
-}
-
-gfx::AcceleratedWidget
-BrowserSurfaceTextureManager::AcquireNativeWidgetForSurfaceTexture(
- int surface_texture_id) {
- gl::ScopedJavaSurface surface(content::GetSurfaceTextureSurface(
- surface_texture_id,
- BrowserGpuChannelHostFactory::instance()->GetGpuChannelId()));
- if (surface.j_surface().is_null())
- return NULL;
-
- JNIEnv* env = base::android::AttachCurrentThread();
- // Note: This ensures that any local references used by
- // ANativeWindow_fromSurface are released immediately. This is needed as a
- // workaround for https://code.google.com/p/android/issues/detail?id=68174
- base::android::ScopedJavaLocalFrame scoped_local_reference_frame(env);
- ANativeWindow* native_window =
- ANativeWindow_fromSurface(env, surface.j_surface().obj());
-
- return native_window;
-}
-
-BrowserSurfaceTextureManager::BrowserSurfaceTextureManager() {
-}
-
-BrowserSurfaceTextureManager::~BrowserSurfaceTextureManager() {
-}
-
-} // namespace content
« no previous file with comments | « content/browser/android/browser_surface_texture_manager.h ('k') | content/browser/android/child_process_launcher_android.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698