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

Unified Diff: gpu/ipc/service/image_transport_surface_android.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
« no previous file with comments | « gpu/ipc/service/image_transport_surface.h ('k') | gpu/ipc/service/image_transport_surface_linux.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: gpu/ipc/service/image_transport_surface_android.cc
diff --git a/gpu/ipc/service/image_transport_surface_android.cc b/gpu/ipc/service/image_transport_surface_android.cc
index e73080cabcfaba347448456f9f3deb2d25126531..42fd752b6d117221710a2b5aabdff6a9047aff37 100644
--- a/gpu/ipc/service/image_transport_surface_android.cc
+++ b/gpu/ipc/service/image_transport_surface_android.cc
@@ -13,13 +13,13 @@
namespace gpu {
// static
-scoped_refptr<gfx::GLSurface> ImageTransportSurface::CreateNativeSurface(
+scoped_refptr<gl::GLSurface> ImageTransportSurface::CreateNativeSurface(
GpuChannelManager* manager,
GpuCommandBufferStub* stub,
SurfaceHandle surface_handle,
- gfx::GLSurface::Format format) {
- if (gfx::GetGLImplementation() == gfx::kGLImplementationMockGL)
- return new gfx::GLSurfaceStub;
+ gl::GLSurface::Format format) {
+ if (gl::GetGLImplementation() == gl::kGLImplementationMockGL)
+ return new gl::GLSurfaceStub;
DCHECK(GpuSurfaceLookup::GetInstance());
DCHECK_NE(surface_handle, kNullSurfaceHandle);
// On Android, the surface_handle is the id of the surface in the
@@ -30,14 +30,13 @@ scoped_refptr<gfx::GLSurface> ImageTransportSurface::CreateNativeSurface(
LOG(WARNING) << "Failed to acquire native widget.";
return nullptr;
}
- scoped_refptr<gfx::GLSurface> surface =
- new gfx::NativeViewGLSurfaceEGL(window);
+ scoped_refptr<gl::GLSurface> surface = new gl::NativeViewGLSurfaceEGL(window);
bool initialize_success = surface->Initialize(format);
ANativeWindow_release(window);
if (!initialize_success)
- return scoped_refptr<gfx::GLSurface>();
+ return scoped_refptr<gl::GLSurface>();
- return scoped_refptr<gfx::GLSurface>(
+ return scoped_refptr<gl::GLSurface>(
new PassThroughImageTransportSurface(manager, stub, surface.get()));
}
« no previous file with comments | « gpu/ipc/service/image_transport_surface.h ('k') | gpu/ipc/service/image_transport_surface_linux.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698