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

Unified Diff: gpu/ipc/service/child_window_surface_win.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 | « gpu/ipc/service/child_window_surface_win.h ('k') | gpu/ipc/service/gpu_channel.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: gpu/ipc/service/child_window_surface_win.cc
diff --git a/gpu/ipc/service/child_window_surface_win.cc b/gpu/ipc/service/child_window_surface_win.cc
index 874b878e1407cbc22dcbbf0d6b997f50fe0f9c89..762fbd117391233704e07375d64474912e305e1c 100644
--- a/gpu/ipc/service/child_window_surface_win.cc
+++ b/gpu/ipc/service/child_window_surface_win.cc
@@ -74,7 +74,7 @@ void InitializeWindowClass() {
ChildWindowSurfaceWin::ChildWindowSurfaceWin(GpuChannelManager* manager,
HWND parent_window)
- : gfx::NativeViewGLSurfaceEGL(0),
+ : gl::NativeViewGLSurfaceEGL(0),
parent_window_(parent_window),
manager_(manager),
alpha_(true),
@@ -142,7 +142,7 @@ bool ChildWindowSurfaceWin::Resize(const gfx::Size& size,
return false;
}
alpha_ = has_alpha;
- return gfx::NativeViewGLSurfaceEGL::Resize(size, scale_factor, has_alpha);
+ return gl::NativeViewGLSurfaceEGL::Resize(size, scale_factor, has_alpha);
} else {
if (size == GetSize() && has_alpha == alpha_)
return true;
@@ -163,7 +163,7 @@ bool ChildWindowSurfaceWin::Resize(const gfx::Size& size,
config_ = nullptr;
std::unique_ptr<ui::ScopedMakeCurrent> scoped_make_current;
- gfx::GLContext* current_context = gfx::GLContext::GetCurrent();
+ gl::GLContext* current_context = gl::GLContext::GetCurrent();
bool was_current = current_context && current_context->IsCurrent(this);
if (was_current) {
scoped_make_current.reset(
« no previous file with comments | « gpu/ipc/service/child_window_surface_win.h ('k') | gpu/ipc/service/gpu_channel.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698