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

Unified Diff: media/gpu/rendering_helper.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 | « media/gpu/rendering_helper.h ('k') | media/gpu/v4l2_slice_video_decode_accelerator.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: media/gpu/rendering_helper.cc
diff --git a/media/gpu/rendering_helper.cc b/media/gpu/rendering_helper.cc
index ac998cf3dca0d54df488488cbc67e53a4f24bab0..8deb6ba1c4c054c44f4a60eba504a2310cb83470 100644
--- a/media/gpu/rendering_helper.cc
+++ b/media/gpu/rendering_helper.cc
@@ -190,9 +190,9 @@ void RenderingHelper::InitializeOneOff(base::WaitableEvent* done) {
base::CommandLine* cmd_line = base::CommandLine::ForCurrentProcess();
#if GL_VARIANT_GLX
cmd_line->AppendSwitchASCII(switches::kUseGL,
- gfx::kGLImplementationDesktopName);
+ gl::kGLImplementationDesktopName);
#else
- cmd_line->AppendSwitchASCII(switches::kUseGL, gfx::kGLImplementationEGLName);
+ cmd_line->AppendSwitchASCII(switches::kUseGL, gl::kGLImplementationEGLName);
#endif
if (!gl::init::InitializeGLOneOff())
@@ -347,7 +347,7 @@ void RenderingHelper::Initialize(const RenderingHelperParams& params,
screen_size_ = gl_surface_->GetSize();
gl_context_ = gl::init::CreateGLContext(nullptr, gl_surface_.get(),
- gfx::PreferIntegratedGpu);
+ gl::PreferIntegratedGpu);
CHECK(gl_context_->MakeCurrent(gl_surface_.get()));
CHECK_GT(params.window_sizes.size(), 0U);
@@ -655,7 +655,7 @@ void RenderingHelper::DeleteTexture(uint32_t texture_id) {
CHECK_EQ(static_cast<int>(glGetError()), GL_NO_ERROR);
}
-gfx::GLContext* RenderingHelper::GetGLContext() {
+gl::GLContext* RenderingHelper::GetGLContext() {
return gl_context_.get();
}
« no previous file with comments | « media/gpu/rendering_helper.h ('k') | media/gpu/v4l2_slice_video_decode_accelerator.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698