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

Unified Diff: components/mus/gles2/gpu_state.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 | « components/mus/gles2/gpu_state.h ('k') | components/mus/surfaces/surfaces_context_provider.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: components/mus/gles2/gpu_state.cc
diff --git a/components/mus/gles2/gpu_state.cc b/components/mus/gles2/gpu_state.cc
index 1ff542d1d5cee1dd52addc9218df9220cb526eb6..c7cf6dcde0b480e39c8680c65546e9b00cb04901 100644
--- a/components/mus/gles2/gpu_state.cc
+++ b/components/mus/gles2/gpu_state.cc
@@ -52,20 +52,20 @@ void GpuState::InitializeOnGpuThread(base::WaitableEvent* event) {
command_buffer_task_runner_ = new CommandBufferTaskRunner;
driver_manager_.reset(new CommandBufferDriverManager);
sync_point_manager_.reset(new gpu::SyncPointManager(true));
- share_group_ = new gfx::GLShareGroup;
+ share_group_ = new gl::GLShareGroup;
mailbox_manager_ = new gpu::gles2::MailboxManagerImpl;
// TODO(penghuang): investigate why gpu::CollectBasicGraphicsInfo() failed on
// windows remote desktop.
- const gfx::GLImplementation impl = gfx::GetGLImplementation();
- if (impl != gfx::kGLImplementationNone &&
- impl != gfx::kGLImplementationOSMesaGL &&
- impl != gfx::kGLImplementationMockGL) {
+ const gl::GLImplementation impl = gl::GetGLImplementation();
+ if (impl != gl::kGLImplementationNone &&
+ impl != gl::kGLImplementationOSMesaGL &&
+ impl != gl::kGLImplementationMockGL) {
gpu::CollectInfoResult result = gpu::CollectBasicGraphicsInfo(&gpu_info_);
LOG_IF(ERROR, result != gpu::kCollectInfoSuccess)
<< "Collect basic graphics info failed!";
}
- if (impl != gfx::kGLImplementationNone) {
+ if (impl != gl::kGLImplementationNone) {
gpu::CollectInfoResult result = gpu::CollectContextGraphicsInfo(&gpu_info_);
LOG_IF(ERROR, result != gpu::kCollectInfoSuccess)
<< "Collect context graphics info failed!";
« no previous file with comments | « components/mus/gles2/gpu_state.h ('k') | components/mus/surfaces/surfaces_context_provider.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698