summaryrefslogtreecommitdiffstats
path: root/gpu/command_buffer
diff options
context:
space:
mode:
authorbrettw@chromium.org <brettw@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2014-03-17 23:07:15 +0000
committerbrettw@chromium.org <brettw@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2014-03-17 23:07:15 +0000
commit2f3b1cce4c8d4d6a4b016f4d03fca5ee88348a2c (patch)
tree78766377b2779fe9b9afbc869a97f387b9b3d082 /gpu/command_buffer
parent936e85963a6d11c79c7ea774bc41c8729c04693f (diff)
downloadchromium_src-2f3b1cce4c8d4d6a4b016f4d03fca5ee88348a2c.zip
chromium_src-2f3b1cce4c8d4d6a4b016f4d03fca5ee88348a2c.tar.gz
chromium_src-2f3b1cce4c8d4d6a4b016f4d03fca5ee88348a2c.tar.bz2
Move CommandLine to base namespace.
Fix all forward-declares and header files referencing CommandLine. This keeps a "using base::CommandLine" in the command line header file so that the rest of the source files can be changes in a follow-up. TBR=sky Review URL: https://codereview.chromium.org/196413016 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@257514 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'gpu/command_buffer')
-rw-r--r--gpu/command_buffer/service/feature_info.h6
-rw-r--r--gpu/command_buffer/service/gles2_cmd_decoder_unittest_base.cc2
-rw-r--r--gpu/command_buffer/service/gles2_cmd_decoder_unittest_base.h4
3 files changed, 8 insertions, 4 deletions
diff --git a/gpu/command_buffer/service/feature_info.h b/gpu/command_buffer/service/feature_info.h
index 9877ef6..039b926 100644
--- a/gpu/command_buffer/service/feature_info.h
+++ b/gpu/command_buffer/service/feature_info.h
@@ -15,7 +15,9 @@
#include "gpu/config/gpu_driver_bug_workaround_type.h"
#include "gpu/gpu_export.h"
+namespace base {
class CommandLine;
+}
namespace gpu {
namespace gles2 {
@@ -83,7 +85,7 @@ class GPU_EXPORT FeatureInfo : public base::RefCounted<FeatureInfo> {
FeatureInfo();
// Constructor with workarounds taken from |command_line|
- FeatureInfo(const CommandLine& command_line);
+ FeatureInfo(const base::CommandLine& command_line);
// Initializes the feature information. Needs a current GL context.
bool Initialize();
@@ -119,7 +121,7 @@ class GPU_EXPORT FeatureInfo : public base::RefCounted<FeatureInfo> {
~FeatureInfo();
void AddExtensionString(const std::string& str);
- void InitializeBasicState(const CommandLine& command_line);
+ void InitializeBasicState(const base::CommandLine& command_line);
void InitializeFeatures();
Validators validators_;
diff --git a/gpu/command_buffer/service/gles2_cmd_decoder_unittest_base.cc b/gpu/command_buffer/service/gles2_cmd_decoder_unittest_base.cc
index d7a8f2c..8cf0421 100644
--- a/gpu/command_buffer/service/gles2_cmd_decoder_unittest_base.cc
+++ b/gpu/command_buffer/service/gles2_cmd_decoder_unittest_base.cc
@@ -113,7 +113,7 @@ void GLES2DecoderTestBase::InitDecoderWithCommandLine(
bool request_depth,
bool request_stencil,
bool bind_generates_resource,
- const CommandLine* command_line) {
+ const base::CommandLine* command_line) {
Framebuffer::ClearFramebufferCompleteComboMap();
gfx::SetGLGetProcAddressProc(gfx::MockGLInterface::GetGLProcAddress);
diff --git a/gpu/command_buffer/service/gles2_cmd_decoder_unittest_base.h b/gpu/command_buffer/service/gles2_cmd_decoder_unittest_base.h
index 16abb41..4bd06cd 100644
--- a/gpu/command_buffer/service/gles2_cmd_decoder_unittest_base.h
+++ b/gpu/command_buffer/service/gles2_cmd_decoder_unittest_base.h
@@ -24,7 +24,9 @@
#include "ui/gl/gl_surface_stub.h"
#include "ui/gl/gl_mock.h"
+namespace base {
class CommandLine;
+}
namespace gpu {
namespace gles2 {
@@ -169,7 +171,7 @@ class GLES2DecoderTestBase : public testing::Test {
bool request_depth,
bool request_stencil,
bool bind_generates_resource,
- const CommandLine* command_line);
+ const base::CommandLine* command_line);
void ResetDecoder();