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

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

Issue 629913002: Replacing the OVERRIDE with override and FINAL with final in gpu (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Included autogen python file for OVERRIDE Created 6 years, 2 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
OLDNEW
1 // Copyright 2014 The Chromium Authors. All rights reserved. 1 // Copyright 2014 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.h" 5 #include "gpu/command_buffer/service/gles2_cmd_decoder.h"
6 6
7 #include "gpu/command_buffer/common/gles2_cmd_format.h" 7 #include "gpu/command_buffer/common/gles2_cmd_format.h"
8 #include "gpu/command_buffer/common/gles2_cmd_utils.h" 8 #include "gpu/command_buffer/common/gles2_cmd_utils.h"
9 #include "gpu/command_buffer/service/gles2_cmd_decoder_unittest.h" 9 #include "gpu/command_buffer/service/gles2_cmd_decoder_unittest.h"
10 #include "testing/gtest/include/gtest/gtest.h" 10 #include "testing/gtest/include/gtest/gtest.h"
11 #include "ui/gl/gl_mock.h" 11 #include "ui/gl/gl_mock.h"
12 12
13 using ::gfx::MockGLInterface; 13 using ::gfx::MockGLInterface;
14 using ::testing::_; 14 using ::testing::_;
15 15
16 namespace gpu { 16 namespace gpu {
17 namespace gles2 { 17 namespace gles2 {
18 18
19 class GLES2DecoderTestWithCHROMIUMPathRendering : public GLES2DecoderTest { 19 class GLES2DecoderTestWithCHROMIUMPathRendering : public GLES2DecoderTest {
20 public: 20 public:
21 GLES2DecoderTestWithCHROMIUMPathRendering() {} 21 GLES2DecoderTestWithCHROMIUMPathRendering() {}
22 virtual void SetUp() OVERRIDE { 22 virtual void SetUp() override {
23 InitState init; 23 InitState init;
24 init.gl_version = "opengl es 3.1"; 24 init.gl_version = "opengl es 3.1";
25 init.has_alpha = true; 25 init.has_alpha = true;
26 init.has_depth = true; 26 init.has_depth = true;
27 init.request_alpha = true; 27 init.request_alpha = true;
28 init.request_depth = true; 28 init.request_depth = true;
29 init.bind_generates_resource = true; 29 init.bind_generates_resource = true;
30 init.extensions = "GL_NV_path_rendering"; 30 init.extensions = "GL_NV_path_rendering";
31 InitDecoder(init); 31 InitDecoder(init);
32 } 32 }
33 }; 33 };
34 34
35 INSTANTIATE_TEST_CASE_P(Service, 35 INSTANTIATE_TEST_CASE_P(Service,
36 GLES2DecoderTestWithCHROMIUMPathRendering, 36 GLES2DecoderTestWithCHROMIUMPathRendering,
37 ::testing::Bool()); 37 ::testing::Bool());
38 #include "gpu/command_buffer/service/gles2_cmd_decoder_unittest_extensions_autog en.h" 38 #include "gpu/command_buffer/service/gles2_cmd_decoder_unittest_extensions_autog en.h"
39 39
40 } // namespace gles2 40 } // namespace gles2
41 } // namespace gpu 41 } // namespace gpu
42 42
OLDNEW
« no previous file with comments | « gpu/command_buffer/service/gles2_cmd_decoder_unittest_base.h ('k') | gpu/command_buffer/service/gpu_scheduler.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698