From d28506ba1497a3f5fa5b9f6702892cb1cb58ea15 Mon Sep 17 00:00:00 2001 From: "heejin.r.chung" Date: Thu, 23 Oct 2014 09:36:20 -0700 Subject: cc cleanup: Update paths to geometry headers Geometry headers were moved from /ui/gfx/ to ui/gfx/geometry. Updating includes accordingly. BUG=395370 Review URL: https://codereview.chromium.org/660333004 Cr-Commit-Position: refs/heads/master@{#300902} --- cc/trees/damage_tracker.h | 2 +- cc/trees/layer_sorter.h | 6 +++--- cc/trees/layer_tree_host.cc | 2 +- cc/trees/layer_tree_host.h | 2 +- cc/trees/layer_tree_host_common.cc | 2 +- cc/trees/layer_tree_host_common.h | 4 ++-- cc/trees/layer_tree_host_common_unittest.cc | 2 +- cc/trees/layer_tree_host_impl.cc | 4 ++-- cc/trees/layer_tree_host_impl.h | 2 +- cc/trees/layer_tree_host_impl_unittest.cc | 6 +++--- cc/trees/layer_tree_host_pixeltest_on_demand_raster.cc | 4 ++-- cc/trees/layer_tree_host_unittest.cc | 6 +++--- cc/trees/layer_tree_host_unittest_scroll.cc | 6 +++--- cc/trees/layer_tree_impl.cc | 6 +++--- cc/trees/layer_tree_impl_unittest.cc | 2 +- cc/trees/layer_tree_settings.h | 2 +- cc/trees/occlusion.cc | 2 +- cc/trees/occlusion.h | 2 +- cc/trees/occlusion_tracker.cc | 4 ++-- cc/trees/occlusion_tracker.h | 2 +- 20 files changed, 34 insertions(+), 34 deletions(-) (limited to 'cc/trees') diff --git a/cc/trees/damage_tracker.h b/cc/trees/damage_tracker.h index 37c4c6e..aafbd03 100644 --- a/cc/trees/damage_tracker.h +++ b/cc/trees/damage_tracker.h @@ -9,7 +9,7 @@ #include "base/memory/scoped_ptr.h" #include "cc/base/cc_export.h" #include "cc/layers/layer_lists.h" -#include "ui/gfx/rect.h" +#include "ui/gfx/geometry/rect.h" class SkImageFilter; diff --git a/cc/trees/layer_sorter.h b/cc/trees/layer_sorter.h index fd1c72e..b783ded 100644 --- a/cc/trees/layer_sorter.h +++ b/cc/trees/layer_sorter.h @@ -11,10 +11,10 @@ #include "base/containers/hash_tables.h" #include "cc/base/cc_export.h" #include "cc/layers/layer_impl.h" +#include "ui/gfx/geometry/point3_f.h" +#include "ui/gfx/geometry/quad_f.h" +#include "ui/gfx/geometry/rect_f.h" #include "ui/gfx/geometry/vector3d_f.h" -#include "ui/gfx/point3_f.h" -#include "ui/gfx/quad_f.h" -#include "ui/gfx/rect_f.h" namespace gfx { class Transform; diff --git a/cc/trees/layer_tree_host.cc b/cc/trees/layer_tree_host.cc index 08fb810..7e17fef 100644 --- a/cc/trees/layer_tree_host.cc +++ b/cc/trees/layer_tree_host.cc @@ -40,7 +40,7 @@ #include "cc/trees/single_thread_proxy.h" #include "cc/trees/thread_proxy.h" #include "cc/trees/tree_synchronizer.h" -#include "ui/gfx/size_conversions.h" +#include "ui/gfx/geometry/size_conversions.h" namespace { static base::StaticAtomicSequenceNumber s_layer_tree_host_sequence_number; diff --git a/cc/trees/layer_tree_host.h b/cc/trees/layer_tree_host.h index aede050..b312e50 100644 --- a/cc/trees/layer_tree_host.h +++ b/cc/trees/layer_tree_host.h @@ -39,7 +39,7 @@ #include "cc/trees/layer_tree_settings.h" #include "cc/trees/proxy.h" #include "third_party/skia/include/core/SkColor.h" -#include "ui/gfx/rect.h" +#include "ui/gfx/geometry/rect.h" namespace cc { class AnimationRegistrar; diff --git a/cc/trees/layer_tree_host_common.cc b/cc/trees/layer_tree_host_common.cc index 4e80fc6..fd15b52 100644 --- a/cc/trees/layer_tree_host_common.cc +++ b/cc/trees/layer_tree_host_common.cc @@ -16,7 +16,7 @@ #include "cc/layers/render_surface_impl.h" #include "cc/trees/layer_sorter.h" #include "cc/trees/layer_tree_impl.h" -#include "ui/gfx/rect_conversions.h" +#include "ui/gfx/geometry/rect_conversions.h" #include "ui/gfx/transform.h" namespace cc { diff --git a/cc/trees/layer_tree_host_common.h b/cc/trees/layer_tree_host_common.h index d4c09c6..089fe29 100644 --- a/cc/trees/layer_tree_host_common.h +++ b/cc/trees/layer_tree_host_common.h @@ -13,9 +13,9 @@ #include "cc/base/cc_export.h" #include "cc/base/scoped_ptr_vector.h" #include "cc/layers/layer_lists.h" -#include "ui/gfx/rect.h" +#include "ui/gfx/geometry/rect.h" +#include "ui/gfx/geometry/vector2d.h" #include "ui/gfx/transform.h" -#include "ui/gfx/vector2d.h" namespace cc { diff --git a/cc/trees/layer_tree_host_common_unittest.cc b/cc/trees/layer_tree_host_common_unittest.cc index 99e479a..e0436ba 100644 --- a/cc/trees/layer_tree_host_common_unittest.cc +++ b/cc/trees/layer_tree_host_common_unittest.cc @@ -33,7 +33,7 @@ #include "cc/trees/single_thread_proxy.h" #include "testing/gmock/include/gmock/gmock.h" #include "testing/gtest/include/gtest/gtest.h" -#include "ui/gfx/quad_f.h" +#include "ui/gfx/geometry/quad_f.h" #include "ui/gfx/transform.h" namespace cc { diff --git a/cc/trees/layer_tree_host_impl.cc b/cc/trees/layer_tree_host_impl.cc index 4ccc5fe..914d993 100644 --- a/cc/trees/layer_tree_host_impl.cc +++ b/cc/trees/layer_tree_host_impl.cc @@ -72,8 +72,8 @@ #include "gpu/GLES2/gl2extchromium.h" #include "ui/gfx/frame_time.h" #include "ui/gfx/geometry/rect_conversions.h" -#include "ui/gfx/size_conversions.h" -#include "ui/gfx/vector2d_conversions.h" +#include "ui/gfx/geometry/size_conversions.h" +#include "ui/gfx/geometry/vector2d_conversions.h" namespace cc { namespace { diff --git a/cc/trees/layer_tree_host_impl.h b/cc/trees/layer_tree_host_impl.h index a6448c1..1fc0989 100644 --- a/cc/trees/layer_tree_host_impl.h +++ b/cc/trees/layer_tree_host_impl.h @@ -35,7 +35,7 @@ #include "cc/scheduler/draw_result.h" #include "skia/ext/refptr.h" #include "third_party/skia/include/core/SkColor.h" -#include "ui/gfx/rect.h" +#include "ui/gfx/geometry/rect.h" namespace cc { diff --git a/cc/trees/layer_tree_host_impl_unittest.cc b/cc/trees/layer_tree_host_impl_unittest.cc index 5e51cc3..3c55544 100644 --- a/cc/trees/layer_tree_host_impl_unittest.cc +++ b/cc/trees/layer_tree_host_impl_unittest.cc @@ -61,9 +61,9 @@ #include "testing/gtest/include/gtest/gtest.h" #include "third_party/skia/include/core/SkMallocPixelRef.h" #include "ui/gfx/frame_time.h" -#include "ui/gfx/rect_conversions.h" -#include "ui/gfx/size_conversions.h" -#include "ui/gfx/vector2d_conversions.h" +#include "ui/gfx/geometry/rect_conversions.h" +#include "ui/gfx/geometry/size_conversions.h" +#include "ui/gfx/geometry/vector2d_conversions.h" using ::testing::Mock; using ::testing::Return; diff --git a/cc/trees/layer_tree_host_pixeltest_on_demand_raster.cc b/cc/trees/layer_tree_host_pixeltest_on_demand_raster.cc index 7209e06..74e20f5 100644 --- a/cc/trees/layer_tree_host_pixeltest_on_demand_raster.cc +++ b/cc/trees/layer_tree_host_pixeltest_on_demand_raster.cc @@ -11,8 +11,8 @@ #include "cc/trees/layer_tree_impl.h" #include "third_party/skia/include/core/SkCanvas.h" #include "third_party/skia/include/core/SkColor.h" -#include "ui/gfx/rect.h" -#include "ui/gfx/rect_f.h" +#include "ui/gfx/geometry/rect.h" +#include "ui/gfx/geometry/rect_f.h" #if !defined(OS_ANDROID) diff --git a/cc/trees/layer_tree_host_unittest.cc b/cc/trees/layer_tree_host_unittest.cc index 8fb9b8c..8d554dc 100644 --- a/cc/trees/layer_tree_host_unittest.cc +++ b/cc/trees/layer_tree_host_unittest.cc @@ -55,9 +55,9 @@ #include "third_party/khronos/GLES2/gl2ext.h" #include "third_party/skia/include/core/SkPicture.h" #include "ui/gfx/frame_time.h" -#include "ui/gfx/point_conversions.h" -#include "ui/gfx/size_conversions.h" -#include "ui/gfx/vector2d_conversions.h" +#include "ui/gfx/geometry/point_conversions.h" +#include "ui/gfx/geometry/size_conversions.h" +#include "ui/gfx/geometry/vector2d_conversions.h" using testing::_; using testing::AnyNumber; diff --git a/cc/trees/layer_tree_host_unittest_scroll.cc b/cc/trees/layer_tree_host_unittest_scroll.cc index c4f2eb3..e922f21 100644 --- a/cc/trees/layer_tree_host_unittest_scroll.cc +++ b/cc/trees/layer_tree_host_unittest_scroll.cc @@ -16,9 +16,9 @@ #include "cc/test/layer_tree_test.h" #include "cc/test/test_shared_bitmap_manager.h" #include "cc/trees/layer_tree_impl.h" -#include "ui/gfx/point_conversions.h" -#include "ui/gfx/size_conversions.h" -#include "ui/gfx/vector2d_conversions.h" +#include "ui/gfx/geometry/point_conversions.h" +#include "ui/gfx/geometry/size_conversions.h" +#include "ui/gfx/geometry/vector2d_conversions.h" namespace cc { namespace { diff --git a/cc/trees/layer_tree_impl.cc b/cc/trees/layer_tree_impl.cc index 206ec60..8f2f013 100644 --- a/cc/trees/layer_tree_impl.cc +++ b/cc/trees/layer_tree_impl.cc @@ -27,9 +27,9 @@ #include "cc/trees/layer_tree_host_common.h" #include "cc/trees/layer_tree_host_impl.h" #include "cc/trees/occlusion_tracker.h" -#include "ui/gfx/point_conversions.h" -#include "ui/gfx/size_conversions.h" -#include "ui/gfx/vector2d_conversions.h" +#include "ui/gfx/geometry/point_conversions.h" +#include "ui/gfx/geometry/size_conversions.h" +#include "ui/gfx/geometry/vector2d_conversions.h" namespace cc { diff --git a/cc/trees/layer_tree_impl_unittest.cc b/cc/trees/layer_tree_impl_unittest.cc index 7fc1645..f8de8b0 100644 --- a/cc/trees/layer_tree_impl_unittest.cc +++ b/cc/trees/layer_tree_impl_unittest.cc @@ -13,7 +13,7 @@ #include "cc/test/layer_tree_host_common_test.h" #include "cc/test/test_shared_bitmap_manager.h" #include "cc/trees/layer_tree_host_impl.h" -#include "ui/gfx/size_conversions.h" +#include "ui/gfx/geometry/size_conversions.h" namespace cc { namespace { diff --git a/cc/trees/layer_tree_settings.h b/cc/trees/layer_tree_settings.h index fff1084..30fa8cb 100644 --- a/cc/trees/layer_tree_settings.h +++ b/cc/trees/layer_tree_settings.h @@ -9,7 +9,7 @@ #include "cc/base/cc_export.h" #include "cc/debug/layer_tree_debug_state.h" #include "third_party/skia/include/core/SkColor.h" -#include "ui/gfx/size.h" +#include "ui/gfx/geometry/size.h" namespace cc { diff --git a/cc/trees/occlusion.cc b/cc/trees/occlusion.cc index 70ee32c..14168f9 100644 --- a/cc/trees/occlusion.cc +++ b/cc/trees/occlusion.cc @@ -5,7 +5,7 @@ #include "cc/trees/occlusion.h" #include "cc/base/math_util.h" -#include "ui/gfx/rect.h" +#include "ui/gfx/geometry/rect.h" namespace cc { diff --git a/cc/trees/occlusion.h b/cc/trees/occlusion.h index 6d1e5b1..56f9962d 100644 --- a/cc/trees/occlusion.h +++ b/cc/trees/occlusion.h @@ -8,7 +8,7 @@ #include "base/basictypes.h" #include "cc/base/cc_export.h" #include "cc/base/simple_enclosed_region.h" -#include "ui/gfx/rect.h" +#include "ui/gfx/geometry/rect.h" #include "ui/gfx/transform.h" namespace cc { diff --git a/cc/trees/occlusion_tracker.cc b/cc/trees/occlusion_tracker.cc index 7d90834..bce1fd5 100644 --- a/cc/trees/occlusion_tracker.cc +++ b/cc/trees/occlusion_tracker.cc @@ -12,8 +12,8 @@ #include "cc/layers/layer_impl.h" #include "cc/layers/render_surface.h" #include "cc/layers/render_surface_impl.h" -#include "ui/gfx/quad_f.h" -#include "ui/gfx/rect_conversions.h" +#include "ui/gfx/geometry/quad_f.h" +#include "ui/gfx/geometry/rect_conversions.h" namespace cc { diff --git a/cc/trees/occlusion_tracker.h b/cc/trees/occlusion_tracker.h index b96752c..4d6555a 100644 --- a/cc/trees/occlusion_tracker.h +++ b/cc/trees/occlusion_tracker.h @@ -12,7 +12,7 @@ #include "cc/base/simple_enclosed_region.h" #include "cc/layers/layer_iterator.h" #include "cc/trees/occlusion.h" -#include "ui/gfx/rect.h" +#include "ui/gfx/geometry/rect.h" namespace cc { class LayerImpl; -- cgit v1.1