diff options
| author | thakis@chromium.org <thakis@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-10-14 21:17:06 +0000 |
|---|---|---|
| committer | thakis@chromium.org <thakis@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-10-14 21:17:06 +0000 |
| commit | a36c7b41249cc92d340d569557cb794b39447c4a (patch) | |
| tree | 2af0698e13bccb8a3ac247ae6d8c394f312ec638 /gpu/command_buffer/service | |
| parent | b3d62312b14de9eeed5e59e0340accda0127bc93 (diff) | |
| download | chromium_src-a36c7b41249cc92d340d569557cb794b39447c4a.zip chromium_src-a36c7b41249cc92d340d569557cb794b39447c4a.tar.gz chromium_src-a36c7b41249cc92d340d569557cb794b39447c4a.tar.bz2 | |
Move constructor and destructor of MockGLInterface out of line.
Speeds up building all of gpu by over one minute / over 10% on my machine (from 9:23 to 8:11).
Move the mock to gpu/command_buffer/common to have a more obvious place for the cc file.
BUG=None
TEST=None
Review URL: http://codereview.chromium.org/3811006
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@62649 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'gpu/command_buffer/service')
15 files changed, 24 insertions, 16 deletions
diff --git a/gpu/command_buffer/service/buffer_manager_unittest.cc b/gpu/command_buffer/service/buffer_manager_unittest.cc index 3f78fbe..3f4a66b 100644 --- a/gpu/command_buffer/service/buffer_manager_unittest.cc +++ b/gpu/command_buffer/service/buffer_manager_unittest.cc @@ -3,7 +3,7 @@ // found in the LICENSE file. #include "gpu/command_buffer/service/buffer_manager.h" -#include "app/gfx/gl/gl_mock.h" +#include "gpu/command_buffer/common/gl_mock.h" #include "testing/gtest/include/gtest/gtest.h" namespace gpu { diff --git a/gpu/command_buffer/service/context_group_unittest.cc b/gpu/command_buffer/service/context_group_unittest.cc index 4cfd4c7..c5c57a1 100644 --- a/gpu/command_buffer/service/context_group_unittest.cc +++ b/gpu/command_buffer/service/context_group_unittest.cc @@ -3,8 +3,9 @@ // found in the LICENSE file. #include "gpu/command_buffer/service/context_group.h" -#include "app/gfx/gl/gl_mock.h" + #include "base/scoped_ptr.h" +#include "gpu/command_buffer/common/gl_mock.h" #include "gpu/command_buffer/service/test_helper.h" #include "gpu/command_buffer/service/texture_manager.h" #include "gpu/GLES2/gles2_command_buffer.h" diff --git a/gpu/command_buffer/service/feature_info_unittest.cc b/gpu/command_buffer/service/feature_info_unittest.cc index ba9884b..67f7cce 100644 --- a/gpu/command_buffer/service/feature_info_unittest.cc +++ b/gpu/command_buffer/service/feature_info_unittest.cc @@ -3,8 +3,9 @@ // found in the LICENSE file. #include "gpu/command_buffer/service/feature_info.h" -#include "app/gfx/gl/gl_mock.h" + #include "base/scoped_ptr.h" +#include "gpu/command_buffer/common/gl_mock.h" #include "gpu/command_buffer/service/test_helper.h" #include "gpu/command_buffer/service/texture_manager.h" #include "gpu/GLES2/gles2_command_buffer.h" diff --git a/gpu/command_buffer/service/framebuffer_manager_unittest.cc b/gpu/command_buffer/service/framebuffer_manager_unittest.cc index 57fed7b..ead31b1 100644 --- a/gpu/command_buffer/service/framebuffer_manager_unittest.cc +++ b/gpu/command_buffer/service/framebuffer_manager_unittest.cc @@ -3,7 +3,8 @@ // found in the LICENSE file. #include "gpu/command_buffer/service/framebuffer_manager.h" -#include "app/gfx/gl/gl_mock.h" + +#include "gpu/command_buffer/common/gl_mock.h" #include "testing/gtest/include/gtest/gtest.h" namespace gpu { diff --git a/gpu/command_buffer/service/gles2_cmd_decoder_unittest.cc b/gpu/command_buffer/service/gles2_cmd_decoder_unittest.cc index c929847..1dda1db 100644 --- a/gpu/command_buffer/service/gles2_cmd_decoder_unittest.cc +++ b/gpu/command_buffer/service/gles2_cmd_decoder_unittest.cc @@ -2,10 +2,11 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "app/gfx/gl/gl_mock.h" #include "gpu/command_buffer/service/gles2_cmd_decoder.h" + #include "gpu/command_buffer/common/gles2_cmd_format.h" #include "gpu/command_buffer/common/gles2_cmd_utils.h" +#include "gpu/command_buffer/common/gl_mock.h" #include "gpu/command_buffer/common/id_allocator.h" #include "gpu/command_buffer/service/gles2_cmd_decoder_unittest_base.h" #include "gpu/command_buffer/service/cmd_buffer_engine.h" diff --git a/gpu/command_buffer/service/gles2_cmd_decoder_unittest_1.cc b/gpu/command_buffer/service/gles2_cmd_decoder_unittest_1.cc index 9e8e5ae..9237a20 100644 --- a/gpu/command_buffer/service/gles2_cmd_decoder_unittest_1.cc +++ b/gpu/command_buffer/service/gles2_cmd_decoder_unittest_1.cc @@ -4,7 +4,7 @@ #include "gpu/command_buffer/service/gles2_cmd_decoder.h" -#include "app/gfx/gl/gl_mock.h" +#include "gpu/command_buffer/common/gl_mock.h" #include "gpu/command_buffer/common/gles2_cmd_format.h" #include "gpu/command_buffer/common/gles2_cmd_utils.h" #include "gpu/command_buffer/service/gles2_cmd_decoder_unittest_base.h" diff --git a/gpu/command_buffer/service/gles2_cmd_decoder_unittest_2.cc b/gpu/command_buffer/service/gles2_cmd_decoder_unittest_2.cc index e6e6bf2..8ea4d27 100644 --- a/gpu/command_buffer/service/gles2_cmd_decoder_unittest_2.cc +++ b/gpu/command_buffer/service/gles2_cmd_decoder_unittest_2.cc @@ -4,7 +4,7 @@ #include "gpu/command_buffer/service/gles2_cmd_decoder.h" -#include "app/gfx/gl/gl_mock.h" +#include "gpu/command_buffer/common/gl_mock.h" #include "gpu/command_buffer/common/gles2_cmd_format.h" #include "gpu/command_buffer/common/gles2_cmd_utils.h" #include "gpu/command_buffer/service/gles2_cmd_decoder_unittest_base.h" 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 dcd90bd..c923676 100644 --- a/gpu/command_buffer/service/gles2_cmd_decoder_unittest_base.cc +++ b/gpu/command_buffer/service/gles2_cmd_decoder_unittest_base.cc @@ -7,8 +7,8 @@ #include <algorithm> #include <string> -#include "app/gfx/gl/gl_mock.h" #include "base/string_number_conversions.h" +#include "gpu/command_buffer/common/gl_mock.h" #include "gpu/command_buffer/common/gles2_cmd_format.h" #include "gpu/command_buffer/common/gles2_cmd_utils.h" #include "gpu/command_buffer/service/cmd_buffer_engine.h" 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 05c92d9..a783136 100644 --- a/gpu/command_buffer/service/gles2_cmd_decoder_unittest_base.h +++ b/gpu/command_buffer/service/gles2_cmd_decoder_unittest_base.h @@ -6,7 +6,7 @@ #define GPU_COMMAND_BUFFER_SERVICE_GLES2_CMD_DECODER_UNITTEST_BASE_H_ #include "app/gfx/gl/gl_context_stub.h" -#include "app/gfx/gl/gl_mock.h" +#include "gpu/command_buffer/common/gl_mock.h" #include "gpu/command_buffer/common/gles2_cmd_format.h" #include "gpu/command_buffer/common/gles2_cmd_utils.h" #include "gpu/command_buffer/service/buffer_manager.h" diff --git a/gpu/command_buffer/service/program_manager_unittest.cc b/gpu/command_buffer/service/program_manager_unittest.cc index fa159de..1f66fd6 100644 --- a/gpu/command_buffer/service/program_manager_unittest.cc +++ b/gpu/command_buffer/service/program_manager_unittest.cc @@ -6,10 +6,10 @@ #include <algorithm> -#include "app/gfx/gl/gl_mock.h" #include "base/scoped_ptr.h" #include "base/string_number_conversions.h" #include "base/string_util.h" +#include "gpu/command_buffer/common/gl_mock.h" #include "testing/gtest/include/gtest/gtest.h" using ::gfx::MockGLInterface; diff --git a/gpu/command_buffer/service/renderbuffer_manager_unittest.cc b/gpu/command_buffer/service/renderbuffer_manager_unittest.cc index 04781324..563b0fb 100644 --- a/gpu/command_buffer/service/renderbuffer_manager_unittest.cc +++ b/gpu/command_buffer/service/renderbuffer_manager_unittest.cc @@ -3,7 +3,8 @@ // found in the LICENSE file. #include "gpu/command_buffer/service/renderbuffer_manager.h" -#include "app/gfx/gl/gl_mock.h" + +#include "gpu/command_buffer/common/gl_mock.h" #include "testing/gtest/include/gtest/gtest.h" namespace gpu { diff --git a/gpu/command_buffer/service/shader_manager_unittest.cc b/gpu/command_buffer/service/shader_manager_unittest.cc index ccccb22..8deace2 100644 --- a/gpu/command_buffer/service/shader_manager_unittest.cc +++ b/gpu/command_buffer/service/shader_manager_unittest.cc @@ -3,8 +3,9 @@ // found in the LICENSE file. #include "gpu/command_buffer/service/shader_manager.h" + #include "base/scoped_ptr.h" -#include "app/gfx/gl/gl_mock.h" +#include "gpu/command_buffer/common/gl_mock.h" #include "testing/gtest/include/gtest/gtest.h" namespace gpu { diff --git a/gpu/command_buffer/service/test_helper.cc b/gpu/command_buffer/service/test_helper.cc index 578c3c9..af511b3 100644 --- a/gpu/command_buffer/service/test_helper.cc +++ b/gpu/command_buffer/service/test_helper.cc @@ -3,7 +3,8 @@ // found in the LICENSE file. #include "gpu/command_buffer/service/test_helper.h" -#include "app/gfx/gl/gl_mock.h" + +#include "gpu/command_buffer/common/gl_mock.h" #include "gpu/command_buffer/common/types.h" #include "gpu/GLES2/gles2_command_buffer.h" #include "testing/gtest/include/gtest/gtest.h" diff --git a/gpu/command_buffer/service/test_helper.h b/gpu/command_buffer/service/test_helper.h index 159665c..d301a6d 100644 --- a/gpu/command_buffer/service/test_helper.h +++ b/gpu/command_buffer/service/test_helper.h @@ -5,7 +5,7 @@ #ifndef GPU_COMMAND_BUFFER_SERVICE_TEST_HELPER_H_ #define GPU_COMMAND_BUFFER_SERVICE_TEST_HELPER_H_ -#include "app/gfx/gl/gl_mock.h" +#include "gpu/command_buffer/common/gl_mock.h" #include "gpu/GLES2/gles2_command_buffer.h" namespace gpu { diff --git a/gpu/command_buffer/service/texture_manager_unittest.cc b/gpu/command_buffer/service/texture_manager_unittest.cc index b845e7f..73cc152 100644 --- a/gpu/command_buffer/service/texture_manager_unittest.cc +++ b/gpu/command_buffer/service/texture_manager_unittest.cc @@ -3,12 +3,13 @@ // found in the LICENSE file. #include "gpu/command_buffer/service/texture_manager.h" + #include "base/scoped_ptr.h" -#include "app/gfx/gl/gl_mock.h" #include "gpu/GLES2/gles2_command_buffer.h" -#include "testing/gtest/include/gtest/gtest.h" +#include "gpu/command_buffer/common/gl_mock.h" #include "gpu/command_buffer/service/feature_info.h" #include "gpu/command_buffer/service/test_helper.h" +#include "testing/gtest/include/gtest/gtest.h" using ::testing::Pointee; using ::testing::_; |