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

Side by Side Diff: gpu/command_buffer/service/gles2_cmd_decoder_unittest_3.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 unified diff | Download patch
OLDNEW
1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2011 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 <stdint.h> 7 #include <stdint.h>
8 8
9 #include "gpu/command_buffer/common/gles2_cmd_format.h" 9 #include "gpu/command_buffer/common/gles2_cmd_format.h"
10 #include "gpu/command_buffer/common/gles2_cmd_utils.h" 10 #include "gpu/command_buffer/common/gles2_cmd_utils.h"
11 #include "gpu/command_buffer/service/cmd_buffer_engine.h" 11 #include "gpu/command_buffer/service/cmd_buffer_engine.h"
12 #include "gpu/command_buffer/service/context_group.h" 12 #include "gpu/command_buffer/service/context_group.h"
13 #include "gpu/command_buffer/service/gles2_cmd_decoder_unittest_base.h" 13 #include "gpu/command_buffer/service/gles2_cmd_decoder_unittest_base.h"
14 #include "gpu/command_buffer/service/program_manager.h" 14 #include "gpu/command_buffer/service/program_manager.h"
15 #include "testing/gtest/include/gtest/gtest.h" 15 #include "testing/gtest/include/gtest/gtest.h"
16 #include "ui/gl/gl_mock.h" 16 #include "ui/gl/gl_mock.h"
17 17
18 using ::gfx::MockGLInterface; 18 using ::gl::MockGLInterface;
19 using ::testing::_; 19 using ::testing::_;
20 using ::testing::DoAll; 20 using ::testing::DoAll;
21 using ::testing::InSequence; 21 using ::testing::InSequence;
22 using ::testing::MatcherCast; 22 using ::testing::MatcherCast;
23 using ::testing::Pointee; 23 using ::testing::Pointee;
24 using ::testing::Return; 24 using ::testing::Return;
25 using ::testing::SetArrayArgument; 25 using ::testing::SetArrayArgument;
26 using ::testing::SetArgumentPointee; 26 using ::testing::SetArgumentPointee;
27 using ::testing::StrEq; 27 using ::testing::StrEq;
28 28
(...skipping 121 matching lines...) Expand 10 before | Expand all | Expand 10 after
150 150
151 end_cmd.Init(); 151 end_cmd.Init();
152 EXPECT_EQ(error::kNoError, ExecuteCmd(end_cmd)); 152 EXPECT_EQ(error::kNoError, ExecuteCmd(end_cmd));
153 EXPECT_EQ(GL_NO_ERROR, GetGLError()); 153 EXPECT_EQ(GL_NO_ERROR, GetGLError());
154 } 154 }
155 155
156 #include "gpu/command_buffer/service/gles2_cmd_decoder_unittest_3_autogen.h" 156 #include "gpu/command_buffer/service/gles2_cmd_decoder_unittest_3_autogen.h"
157 157
158 } // namespace gles2 158 } // namespace gles2
159 } // namespace gpu 159 } // namespace gpu
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698