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

Unified Diff: gpu/command_buffer/service/gles2_cmd_decoder_passthrough.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
Index: gpu/command_buffer/service/gles2_cmd_decoder_passthrough.cc
diff --git a/gpu/command_buffer/service/gles2_cmd_decoder_passthrough.cc b/gpu/command_buffer/service/gles2_cmd_decoder_passthrough.cc
index bf53064501c02859af038127f093da8ad7348a3a..c9c6b8fc91189351b5113458a41d836edc237653 100644
--- a/gpu/command_buffer/service/gles2_cmd_decoder_passthrough.cc
+++ b/gpu/command_buffer/service/gles2_cmd_decoder_passthrough.cc
@@ -103,8 +103,8 @@ class GLES2DecoderPassthroughImpl : public GLES2Decoder {
return GetCommonCommandName(static_cast<cmd::CommandId>(command_id));
}
- bool Initialize(const scoped_refptr<gfx::GLSurface>& surface,
- const scoped_refptr<gfx::GLContext>& context,
+ bool Initialize(const scoped_refptr<gl::GLSurface>& surface,
+ const scoped_refptr<gl::GLContext>& context,
bool offscreen,
const gfx::Size& offscreen_size,
const DisallowedFeatures& disallowed_features,
@@ -136,7 +136,7 @@ class GLES2DecoderPassthroughImpl : public GLES2Decoder {
}
// Set the surface associated with the default FBO.
- void SetSurface(const scoped_refptr<gfx::GLSurface>& surface) override {
+ void SetSurface(const scoped_refptr<gl::GLSurface>& surface) override {
DCHECK(context_->IsCurrent(nullptr));
DCHECK(surface_.get());
surface_ = surface;
@@ -183,7 +183,7 @@ class GLES2DecoderPassthroughImpl : public GLES2Decoder {
GLES2Util* GetGLES2Util() override { return nullptr; }
// Gets the associated GLContext.
- gfx::GLContext* GetGLContext() override { return nullptr; }
+ gl::GLContext* GetGLContext() override { return nullptr; }
// Gets the associated ContextGroup
ContextGroup* GetContextGroup() override { return nullptr; }
@@ -359,8 +359,8 @@ class GLES2DecoderPassthroughImpl : public GLES2Decoder {
static const CommandInfo command_info[kNumCommands - kFirstGLES2Command];
// The GL context this decoder renders to on behalf of the client.
- scoped_refptr<gfx::GLSurface> surface_;
- scoped_refptr<gfx::GLContext> context_;
+ scoped_refptr<gl::GLSurface> surface_;
+ scoped_refptr<gl::GLContext> context_;
// Managers
std::unique_ptr<ImageManager> image_manager_;
« no previous file with comments | « gpu/command_buffer/service/gles2_cmd_decoder_mock.h ('k') | gpu/command_buffer/service/gles2_cmd_decoder_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698