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

Unified Diff: gpu/ipc/service/image_transport_surface_mac.mm

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: gpu/ipc/service/image_transport_surface_mac.mm
diff --git a/gpu/ipc/service/image_transport_surface_mac.mm b/gpu/ipc/service/image_transport_surface_mac.mm
index 0fc6589f818db7b1bc44b67d98e4af853ca45c94..8e12bff3d9137e6434425169407dac7d4b49fe02 100644
--- a/gpu/ipc/service/image_transport_surface_mac.mm
+++ b/gpu/ipc/service/image_transport_surface_mac.mm
@@ -12,7 +12,7 @@
namespace gpu {
-scoped_refptr<gfx::GLSurface> ImageTransportSurfaceCreateNativeSurface(
+scoped_refptr<gl::GLSurface> ImageTransportSurfaceCreateNativeSurface(
GpuChannelManager* manager,
GpuCommandBufferStub* stub,
SurfaceHandle handle);
@@ -21,11 +21,11 @@ namespace {
// A subclass of GLSurfaceOSMesa that doesn't print an error message when
// SwapBuffers() is called.
-class DRTSurfaceOSMesa : public gfx::GLSurfaceOSMesa {
+class DRTSurfaceOSMesa : public gl::GLSurfaceOSMesa {
public:
// Size doesn't matter, the surface is resized to the right size later.
DRTSurfaceOSMesa()
- : GLSurfaceOSMesa(gfx::GLSurface::SURFACE_OSMESA_RGBA, gfx::Size(1, 1)) {}
+ : GLSurfaceOSMesa(gl::GLSurface::SURFACE_OSMESA_RGBA, gfx::Size(1, 1)) {}
// Implement a subset of GLSurface.
gfx::SwapResult SwapBuffers() override;
@@ -44,21 +44,21 @@ bool g_allow_os_mesa = false;
} // namespace
// static
-scoped_refptr<gfx::GLSurface> ImageTransportSurface::CreateNativeSurface(
+scoped_refptr<gl::GLSurface> ImageTransportSurface::CreateNativeSurface(
GpuChannelManager* manager,
GpuCommandBufferStub* stub,
SurfaceHandle surface_handle,
- gfx::GLSurface::Format format) {
+ gl::GLSurface::Format format) {
DCHECK_NE(surface_handle, kNullSurfaceHandle);
- switch (gfx::GetGLImplementation()) {
- case gfx::kGLImplementationDesktopGL:
- case gfx::kGLImplementationDesktopGLCoreProfile:
- case gfx::kGLImplementationAppleGL:
+ switch (gl::GetGLImplementation()) {
+ case gl::kGLImplementationDesktopGL:
+ case gl::kGLImplementationDesktopGLCoreProfile:
+ case gl::kGLImplementationAppleGL:
return ImageTransportSurfaceCreateNativeSurface(manager, stub,
surface_handle);
- case gfx::kGLImplementationMockGL:
- return new gfx::GLSurfaceStub;
+ case gl::kGLImplementationMockGL:
+ return new gl::GLSurfaceStub;
default:
// Content shell in DRT mode spins up a gpu process which needs an
// image transport surface, but that surface isn't used to read pixel
@@ -67,11 +67,11 @@ scoped_refptr<gfx::GLSurface> ImageTransportSurface::CreateNativeSurface(
NOTREACHED();
return nullptr;
}
- scoped_refptr<gfx::GLSurface> surface(new DRTSurfaceOSMesa());
+ scoped_refptr<gl::GLSurface> surface(new DRTSurfaceOSMesa());
if (!surface.get() || !surface->Initialize(format))
return surface;
- return scoped_refptr<gfx::GLSurface>(new PassThroughImageTransportSurface(
- manager, stub, surface.get()));
+ return scoped_refptr<gl::GLSurface>(
+ new PassThroughImageTransportSurface(manager, stub, surface.get()));
}
}
« no previous file with comments | « gpu/ipc/service/image_transport_surface_linux.cc ('k') | gpu/ipc/service/image_transport_surface_overlay_mac.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698