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

Unified Diff: gpu/command_buffer/service/gl_context_virtual.h

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/command_buffer/service/gl_context_mock.h ('k') | gpu/command_buffer/service/gl_context_virtual.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: gpu/command_buffer/service/gl_context_virtual.h
diff --git a/gpu/command_buffer/service/gl_context_virtual.h b/gpu/command_buffer/service/gl_context_virtual.h
index bedf253b7361dc16be867cb9b2cbd2b533a3ed61..312133d7b1528fb73bb23d6d9da7be885e400216 100644
--- a/gpu/command_buffer/service/gl_context_virtual.h
+++ b/gpu/command_buffer/service/gl_context_virtual.h
@@ -13,7 +13,7 @@
#include "gpu/gpu_export.h"
#include "ui/gl/gl_context.h"
-namespace gfx {
+namespace gl {
class GPUPreference;
class GPUTimingClient;
class GLShareGroup;
@@ -26,21 +26,20 @@ class GLES2Decoder;
}
// Encapsulates a virtual OpenGL context.
-class GPU_EXPORT GLContextVirtual : public gfx::GLContext {
+class GPU_EXPORT GLContextVirtual : public gl::GLContext {
public:
- GLContextVirtual(
- gfx::GLShareGroup* share_group,
- gfx::GLContext* shared_context,
- base::WeakPtr<gles2::GLES2Decoder> decoder);
+ GLContextVirtual(gl::GLShareGroup* share_group,
+ gl::GLContext* shared_context,
+ base::WeakPtr<gles2::GLES2Decoder> decoder);
// Implement GLContext.
- bool Initialize(gfx::GLSurface* compatible_surface,
- gfx::GpuPreference gpu_preference) override;
- bool MakeCurrent(gfx::GLSurface* surface) override;
- void ReleaseCurrent(gfx::GLSurface* surface) override;
- bool IsCurrent(gfx::GLSurface* surface) override;
+ bool Initialize(gl::GLSurface* compatible_surface,
+ gl::GpuPreference gpu_preference) override;
+ bool MakeCurrent(gl::GLSurface* surface) override;
+ void ReleaseCurrent(gl::GLSurface* surface) override;
+ bool IsCurrent(gl::GLSurface* surface) override;
void* GetHandle() override;
- scoped_refptr<gfx::GPUTimingClient> CreateGPUTimingClient() override;
+ scoped_refptr<gl::GPUTimingClient> CreateGPUTimingClient() override;
void OnSetSwapInterval(int interval) override;
std::string GetExtensions() override;
void SetSafeToForceGpuSwitch() override;
@@ -54,7 +53,7 @@ class GPU_EXPORT GLContextVirtual : public gfx::GLContext {
private:
void Destroy();
- scoped_refptr<gfx::GLContext> shared_context_;
+ scoped_refptr<gl::GLContext> shared_context_;
base::WeakPtr<gles2::GLES2Decoder> decoder_;
DISALLOW_COPY_AND_ASSIGN(GLContextVirtual);
« no previous file with comments | « gpu/command_buffer/service/gl_context_mock.h ('k') | gpu/command_buffer/service/gl_context_virtual.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698