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

Side by Side Diff: gpu/command_buffer/service/gles2_cmd_decoder_unittest_base.cc

Issue 196413016: Move CommandLine to base namespace. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 6 years, 9 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 unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « gpu/command_buffer/service/gles2_cmd_decoder_unittest_base.h ('k') | gpu/config/gpu_util.h » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "gpu/command_buffer/service/gles2_cmd_decoder_unittest_base.h" 5 #include "gpu/command_buffer/service/gles2_cmd_decoder_unittest_base.h"
6 6
7 #include <algorithm> 7 #include <algorithm>
8 #include <string> 8 #include <string>
9 #include <vector> 9 #include <vector>
10 10
(...skipping 95 matching lines...) Expand 10 before | Expand all | Expand 10 after
106 void GLES2DecoderTestBase::InitDecoderWithCommandLine( 106 void GLES2DecoderTestBase::InitDecoderWithCommandLine(
107 const char* extensions, 107 const char* extensions,
108 const char* gl_version, 108 const char* gl_version,
109 bool has_alpha, 109 bool has_alpha,
110 bool has_depth, 110 bool has_depth,
111 bool has_stencil, 111 bool has_stencil,
112 bool request_alpha, 112 bool request_alpha,
113 bool request_depth, 113 bool request_depth,
114 bool request_stencil, 114 bool request_stencil,
115 bool bind_generates_resource, 115 bool bind_generates_resource,
116 const CommandLine* command_line) { 116 const base::CommandLine* command_line) {
117 Framebuffer::ClearFramebufferCompleteComboMap(); 117 Framebuffer::ClearFramebufferCompleteComboMap();
118 118
119 gfx::SetGLGetProcAddressProc(gfx::MockGLInterface::GetGLProcAddress); 119 gfx::SetGLGetProcAddressProc(gfx::MockGLInterface::GetGLProcAddress);
120 gfx::GLSurface::InitializeOneOffWithMockBindingsForTests(); 120 gfx::GLSurface::InitializeOneOffWithMockBindingsForTests();
121 121
122 gl_.reset(new StrictMock<MockGLInterface>()); 122 gl_.reset(new StrictMock<MockGLInterface>());
123 ::gfx::MockGLInterface::SetGLInterface(gl_.get()); 123 ::gfx::MockGLInterface::SetGLInterface(gl_.get());
124 124
125 // Only create stream texture manager if extension is requested. 125 // Only create stream texture manager if extension is requested.
126 std::vector<std::string> list; 126 std::vector<std::string> list;
(...skipping 1336 matching lines...) Expand 10 before | Expand all | Expand 10 after
1463 SetupDefaultProgram(); 1463 SetupDefaultProgram();
1464 } 1464 }
1465 1465
1466 // Include the auto-generated part of this file. We split this because it means 1466 // Include the auto-generated part of this file. We split this because it means
1467 // we can easily edit the non-auto generated parts right here in this file 1467 // we can easily edit the non-auto generated parts right here in this file
1468 // instead of having to edit some template or the code generator. 1468 // instead of having to edit some template or the code generator.
1469 #include "gpu/command_buffer/service/gles2_cmd_decoder_unittest_0_autogen.h" 1469 #include "gpu/command_buffer/service/gles2_cmd_decoder_unittest_0_autogen.h"
1470 1470
1471 } // namespace gles2 1471 } // namespace gles2
1472 } // namespace gpu 1472 } // namespace gpu
OLDNEW
« no previous file with comments | « gpu/command_buffer/service/gles2_cmd_decoder_unittest_base.h ('k') | gpu/config/gpu_util.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698