diff options
| author | jamesr@chromium.org <jamesr@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-10-31 06:54:59 +0000 |
|---|---|---|
| committer | jamesr@chromium.org <jamesr@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-10-31 06:54:59 +0000 |
| commit | c2610b9fb4b118315423456cc7e55eb9da40cb93 (patch) | |
| tree | 86a4d6cd421b785f6b762c7d7084d9af0f425566 /cc/layers | |
| parent | 0249a653b7e5076f331848a11034059000b644da (diff) | |
| download | chromium_src-c2610b9fb4b118315423456cc7e55eb9da40cb93.zip chromium_src-c2610b9fb4b118315423456cc7e55eb9da40cb93.tar.gz chromium_src-c2610b9fb4b118315423456cc7e55eb9da40cb93.tar.bz2 | |
Move test-only stuff from cc/debug/ to cc/test
This moves the test/fake context implementations from cc/debug/ to cc/test
and stops linking them into production targets. Test targets elsewhere in
the tree can link against cc_test_support to use these.
R=danakj,piman
Review URL: https://codereview.chromium.org/50303007
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@232025 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'cc/layers')
| -rw-r--r-- | cc/layers/delegated_renderer_layer_impl_unittest.cc | 2 | ||||
| -rw-r--r-- | cc/layers/picture_layer_impl_unittest.cc | 2 | ||||
| -rw-r--r-- | cc/layers/scrollbar_layer_unittest.cc | 2 | ||||
| -rw-r--r-- | cc/layers/texture_layer_unittest.cc | 2 |
4 files changed, 4 insertions, 4 deletions
diff --git a/cc/layers/delegated_renderer_layer_impl_unittest.cc b/cc/layers/delegated_renderer_layer_impl_unittest.cc index 05e8513..c8811a2 100644 --- a/cc/layers/delegated_renderer_layer_impl_unittest.cc +++ b/cc/layers/delegated_renderer_layer_impl_unittest.cc @@ -5,7 +5,6 @@ #include "cc/layers/delegated_renderer_layer_impl.h" #include "cc/base/scoped_ptr_vector.h" -#include "cc/debug/test_web_graphics_context_3d.h" #include "cc/layers/append_quads_data.h" #include "cc/layers/quad_sink.h" #include "cc/layers/solid_color_layer_impl.h" @@ -21,6 +20,7 @@ #include "cc/test/mock_quad_culler.h" #include "cc/test/render_pass_test_common.h" #include "cc/test/render_pass_test_utils.h" +#include "cc/test/test_web_graphics_context_3d.h" #include "cc/trees/layer_tree_host_impl.h" #include "cc/trees/layer_tree_impl.h" #include "cc/trees/single_thread_proxy.h" diff --git a/cc/layers/picture_layer_impl_unittest.cc b/cc/layers/picture_layer_impl_unittest.cc index 7493e38..716d50d 100644 --- a/cc/layers/picture_layer_impl_unittest.cc +++ b/cc/layers/picture_layer_impl_unittest.cc @@ -6,7 +6,6 @@ #include <utility> -#include "cc/debug/test_web_graphics_context_3d.h" #include "cc/layers/append_quads_data.h" #include "cc/layers/picture_layer.h" #include "cc/test/fake_content_layer_client.h" @@ -18,6 +17,7 @@ #include "cc/test/geometry_test_utils.h" #include "cc/test/impl_side_painting_settings.h" #include "cc/test/mock_quad_culler.h" +#include "cc/test/test_web_graphics_context_3d.h" #include "cc/trees/layer_tree_impl.h" #include "testing/gtest/include/gtest/gtest.h" #include "third_party/skia/include/core/SkBitmapDevice.h" diff --git a/cc/layers/scrollbar_layer_unittest.cc b/cc/layers/scrollbar_layer_unittest.cc index 0423cdc..df12b73 100644 --- a/cc/layers/scrollbar_layer_unittest.cc +++ b/cc/layers/scrollbar_layer_unittest.cc @@ -4,7 +4,6 @@ #include "base/containers/hash_tables.h" #include "cc/animation/scrollbar_animation_controller.h" -#include "cc/debug/test_web_graphics_context_3d.h" #include "cc/layers/append_quads_data.h" #include "cc/layers/painted_scrollbar_layer.h" #include "cc/layers/painted_scrollbar_layer_impl.h" @@ -22,6 +21,7 @@ #include "cc/test/geometry_test_utils.h" #include "cc/test/layer_tree_test.h" #include "cc/test/mock_quad_culler.h" +#include "cc/test/test_web_graphics_context_3d.h" #include "cc/trees/layer_tree_host.h" #include "cc/trees/layer_tree_impl.h" #include "cc/trees/single_thread_proxy.h" diff --git a/cc/layers/texture_layer_unittest.cc b/cc/layers/texture_layer_unittest.cc index 63cf132..1ee8dfb 100644 --- a/cc/layers/texture_layer_unittest.cc +++ b/cc/layers/texture_layer_unittest.cc @@ -12,7 +12,6 @@ #include "base/synchronization/waitable_event.h" #include "base/threading/thread.h" #include "base/time/time.h" -#include "cc/debug/test_web_graphics_context_3d.h" #include "cc/layers/solid_color_layer.h" #include "cc/layers/texture_layer_client.h" #include "cc/layers/texture_layer_impl.h" @@ -25,6 +24,7 @@ #include "cc/test/fake_output_surface.h" #include "cc/test/layer_test_common.h" #include "cc/test/layer_tree_test.h" +#include "cc/test/test_web_graphics_context_3d.h" #include "cc/trees/blocking_task_runner.h" #include "cc/trees/layer_tree_host.h" #include "cc/trees/layer_tree_impl.h" |