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

Unified Diff: media/gpu/android_copying_backing_strategy.cc

Issue 1998723002: Move code in ui/gl/* from gfx:: to gl:: (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Rebase Created 4 years, 7 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: media/gpu/android_copying_backing_strategy.cc
diff --git a/media/gpu/android_copying_backing_strategy.cc b/media/gpu/android_copying_backing_strategy.cc
index 6aa8b6794dbe24f4a1ac3be4e30a9c3edeef7119..bb37b9d50502418a6455084da0cc214825e74a11 100644
--- a/media/gpu/android_copying_backing_strategy.cc
+++ b/media/gpu/android_copying_backing_strategy.cc
@@ -26,12 +26,12 @@ AndroidCopyingBackingStrategy::AndroidCopyingBackingStrategy(
AndroidCopyingBackingStrategy::~AndroidCopyingBackingStrategy() {}
-gfx::ScopedJavaSurface AndroidCopyingBackingStrategy::Initialize(
+gl::ScopedJavaSurface AndroidCopyingBackingStrategy::Initialize(
int surface_view_id) {
if (surface_view_id != media::VideoDecodeAccelerator::Config::kNoSurfaceID) {
LOG(ERROR) << "The copying strategy should not be initialized with a "
"surface id.";
- return gfx::ScopedJavaSurface();
+ return gl::ScopedJavaSurface();
}
// Create a texture and attach the SurfaceTexture to it.
@@ -49,9 +49,9 @@ gfx::ScopedJavaSurface AndroidCopyingBackingStrategy::Initialize(
state_provider_->GetGlDecoder()->RestoreTextureUnitBindings(0);
state_provider_->GetGlDecoder()->RestoreActiveTexture();
- surface_texture_ = gfx::SurfaceTexture::Create(surface_texture_id_);
+ surface_texture_ = gl::SurfaceTexture::Create(surface_texture_id_);
- return gfx::ScopedJavaSurface(surface_texture_.get());
+ return gl::ScopedJavaSurface(surface_texture_.get());
}
void AndroidCopyingBackingStrategy::Cleanup(
@@ -66,7 +66,7 @@ void AndroidCopyingBackingStrategy::Cleanup(
glDeleteTextures(1, &surface_texture_id_);
}
-scoped_refptr<gfx::SurfaceTexture>
+scoped_refptr<gl::SurfaceTexture>
AndroidCopyingBackingStrategy::GetSurfaceTexture() const {
return surface_texture_;
}
« no previous file with comments | « media/gpu/android_copying_backing_strategy.h ('k') | media/gpu/android_deferred_rendering_backing_strategy.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698