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

Unified Diff: ui/gl/gl_image_io_surface.mm

Issue 2014223002: Follow-up fixes to changing namespace 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 | « ui/gl/gl_image_glx.cc ('k') | ui/gl/gl_image_memory.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ui/gl/gl_image_io_surface.mm
diff --git a/ui/gl/gl_image_io_surface.mm b/ui/gl/gl_image_io_surface.mm
index 40ff5c39735bfc2d57452120ac3be01a5e8b04d1..cbaed2232152f07e49fcc9137b78d8d21067ab51 100644
--- a/ui/gl/gl_image_io_surface.mm
+++ b/ui/gl/gl_image_io_surface.mm
@@ -246,7 +246,7 @@ bool GLImageIOSurface::BindTexImage(unsigned target) {
}
CGLContextObj cgl_context =
- static_cast<CGLContextObj>(gl::GLContext::GetCurrent()->GetHandle());
+ static_cast<CGLContextObj>(GLContext::GetCurrent()->GetHandle());
DCHECK(io_surface_);
CGLError cgl_error =
@@ -273,14 +273,13 @@ bool GLImageIOSurface::CopyTexImage(unsigned target) {
return false;
}
- gl::GLContext* gl_context = gl::GLContext::GetCurrent();
+ GLContext* gl_context = GLContext::GetCurrent();
DCHECK(gl_context);
- gl::YUVToRGBConverter* yuv_to_rgb_converter =
- gl_context->GetYUVToRGBConverter();
+ YUVToRGBConverter* yuv_to_rgb_converter = gl_context->GetYUVToRGBConverter();
DCHECK(yuv_to_rgb_converter);
- gl::ScopedSetGLToRealGLApi scoped_set_gl_api;
+ ScopedSetGLToRealGLApi scoped_set_gl_api;
// Note that state restoration is done explicitly instead of scoped binders to
// avoid https://crbug.com/601729.
« no previous file with comments | « ui/gl/gl_image_glx.cc ('k') | ui/gl/gl_image_memory.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698