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

Unified Diff: ui/gl/gl_context_cgl.cc

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_context_cgl.h ('k') | ui/gl/gl_context_stub_with_extensions.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ui/gl/gl_context_cgl.cc
diff --git a/ui/gl/gl_context_cgl.cc b/ui/gl/gl_context_cgl.cc
index 73a71ef16f6ddecd9476283001a47916943bd7a1..b799a174716cc2dba13ff71ddbe5f0f0d8633ec8 100644
--- a/ui/gl/gl_context_cgl.cc
+++ b/ui/gl/gl_context_cgl.cc
@@ -139,7 +139,7 @@ bool GLContextCGL::Initialize(GLSurface* compatible_surface,
void GLContextCGL::Destroy() {
if (yuv_to_rgb_converter_) {
- gl::ScopedCGLSetCurrentContext(static_cast<CGLContextObj>(context_));
+ ScopedCGLSetCurrentContext(static_cast<CGLContextObj>(context_));
yuv_to_rgb_converter_.reset();
}
if (discrete_pixelformat_) {
@@ -201,9 +201,9 @@ bool GLContextCGL::ForceGpuSwitchIfNeeded() {
return true;
}
-gl::YUVToRGBConverter* GLContextCGL::GetYUVToRGBConverter() {
+YUVToRGBConverter* GLContextCGL::GetYUVToRGBConverter() {
if (!yuv_to_rgb_converter_)
- yuv_to_rgb_converter_.reset(new gl::YUVToRGBConverter);
+ yuv_to_rgb_converter_.reset(new YUVToRGBConverter);
return yuv_to_rgb_converter_.get();
}
« no previous file with comments | « ui/gl/gl_context_cgl.h ('k') | ui/gl/gl_context_stub_with_extensions.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698