Part 10 of cc/ directory shuffles: layers
Continuation of https://src.chromium.org/viewvc/chrome?view=rev&revision=188681
BUG=190824
[email protected], [email protected], [email protected], [email protected]
Review URL: https://codereview.chromium.org/12916002
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@188703 0039d316-1c4b-4281-b951-d872f2087c98
diff --git a/ui/compositor/compositor.cc b/ui/compositor/compositor.cc
index df67f0d..4e548ca2 100644
--- a/ui/compositor/compositor.cc
+++ b/ui/compositor/compositor.cc
@@ -16,7 +16,7 @@
#include "base/threading/thread_restrictions.h"
#include "cc/base/thread_impl.h"
#include "cc/input/input_handler.h"
-#include "cc/layer.h"
+#include "cc/layers/layer.h"
#include "cc/output/context_provider.h"
#include "cc/output/output_surface.h"
#include "cc/trees/layer_tree_host.h"
diff --git a/ui/compositor/compositor.gyp b/ui/compositor/compositor.gyp
index 2275503..221b2ee 100644
--- a/ui/compositor/compositor.gyp
+++ b/ui/compositor/compositor.gyp
@@ -37,8 +37,8 @@
'dip_util.h',
'float_animation_curve_adapter.cc',
'float_animation_curve_adapter.h',
- 'layer.cc',
- 'layer.h',
+ 'layers/layer.cc',
+ 'layers/layer.h',
'layer_animation_delegate.h',
'layer_animation_element.cc',
'layer_animation_element.h',
@@ -118,7 +118,7 @@
'layer_animation_element_unittest.cc',
'layer_animation_sequence_unittest.cc',
'layer_animator_unittest.cc',
- 'layer_unittest.cc',
+ 'layers/layer_unittest.cc',
'run_all_unittests.cc',
'test/layer_animator_test_controller.cc',
'test/layer_animator_test_controller.h',
diff --git a/ui/compositor/layer.cc b/ui/compositor/layer.cc
index a41e82d3..6c435b8 100644
--- a/ui/compositor/layer.cc
+++ b/ui/compositor/layer.cc
@@ -11,12 +11,12 @@
#include "base/logging.h"
#include "base/memory/scoped_ptr.h"
#include "cc/base/scoped_ptr_algorithm.h"
-#include "cc/content_layer.h"
-#include "cc/delegated_renderer_layer.h"
+#include "cc/layers/content_layer.h"
+#include "cc/layers/delegated_renderer_layer.h"
+#include "cc/layers/solid_color_layer.h"
+#include "cc/layers/texture_layer.h"
#include "cc/output/delegated_frame_data.h"
#include "cc/resources/transferable_resource.h"
-#include "cc/solid_color_layer.h"
-#include "cc/texture_layer.h"
#include "third_party/WebKit/Source/Platform/chromium/public/WebFilterOperation.h"
#include "third_party/WebKit/Source/Platform/chromium/public/WebFilterOperations.h"
#include "ui/base/animation/animation.h"
diff --git a/ui/compositor/layer.h b/ui/compositor/layer.h
index 186f344..8349221 100644
--- a/ui/compositor/layer.h
+++ b/ui/compositor/layer.h
@@ -15,8 +15,8 @@
#include "cc/animation/animation_events.h"
#include "cc/animation/layer_animation_event_observer.h"
#include "cc/base/scoped_ptr_vector.h"
-#include "cc/content_layer_client.h"
-#include "cc/texture_layer_client.h"
+#include "cc/layers/content_layer_client.h"
+#include "cc/layers/texture_layer_client.h"
#include "third_party/skia/include/core/SkColor.h"
#include "third_party/skia/include/core/SkRegion.h"
#include "ui/compositor/compositor.h"
diff --git a/ui/compositor/layer_unittest.cc b/ui/compositor/layer_unittest.cc
index d09d684..6efe3a5 100644
--- a/ui/compositor/layer_unittest.cc
+++ b/ui/compositor/layer_unittest.cc
@@ -10,7 +10,7 @@
#include "base/path_service.h"
#include "base/string_util.h"
#include "base/stringprintf.h"
-#include "cc/layer.h"
+#include "cc/layers/layer.h"
#include "cc/output/delegated_frame_data.h"
#include "cc/test/pixel_test_utils.h"
#include "testing/gtest/include/gtest/gtest.h"
