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

Unified Diff: ui/gl/gl_image_surface_texture.cc

Issue 634643002: content: Out-of-process GPU service support for SurfaceTexture backed GpuMemoryBuffers. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: rebase and address some review feedback Created 6 years, 2 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: ui/gl/gl_image_surface_texture.cc
diff --git a/ui/gl/gl_image_surface_texture.cc b/ui/gl/gl_image_surface_texture.cc
index 78cab656379320c950831d61bc71881c47a2ddca..e9e6bb928283a05e689773fd903e802b1914dac5 100644
--- a/ui/gl/gl_image_surface_texture.cc
+++ b/ui/gl/gl_image_surface_texture.cc
@@ -6,7 +6,6 @@
#include "base/debug/trace_event.h"
#include "ui/gl/android/surface_texture.h"
-#include "ui/gl/android/surface_texture_tracker.h"
namespace gfx {
@@ -19,14 +18,10 @@ GLImageSurfaceTexture::~GLImageSurfaceTexture() {
DCHECK_EQ(0, texture_id_);
}
-bool GLImageSurfaceTexture::Initialize(
- const gfx::GpuMemoryBufferHandle& handle) {
+bool GLImageSurfaceTexture::Initialize(SurfaceTexture* surface_texture) {
DCHECK(!surface_texture_);
- surface_texture_ =
- SurfaceTextureTracker::GetInstance()->AcquireSurfaceTexture(
- handle.surface_texture_id.primary_id,
- handle.surface_texture_id.secondary_id);
- return !!surface_texture_;
+ surface_texture_ = surface_texture;
+ return true;
}
void GLImageSurfaceTexture::Destroy(bool have_context) {

Powered by Google App Engine
This is Rietveld 408576698