cc: Remove CC*.h temporary includes, part 6/4.

BUG=155413 TEST=cc_unittests R=enne@chromium.org,jamesr@chromium.org TBR=jamesr@chromium.org Review URL: https://chromiumcodereview.appspot.com/11228059 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@163749 0039d316-1c4b-4281-b951-d872f2087c98
cbchan · Oct 24, 2012 · aa0a9d3 · aa0a9d3
1 parent 67b086b
commit aa0a9d3
Show file tree

Hide file tree

Showing 95 changed files with 140 additions and 268 deletions.
diff --git a/cc/CCActiveAnimation.h b/cc/CCActiveAnimation.h
diff --git a/cc/CCAnimationCurve.h b/cc/CCAnimationCurve.h
diff --git a/cc/CCAnimationEvents.h b/cc/CCAnimationEvents.h
diff --git a/cc/CCAppendQuadsData.h b/cc/CCAppendQuadsData.h
diff --git a/cc/CCCheckerboardDrawQuad.h b/cc/CCCheckerboardDrawQuad.h
diff --git a/cc/CCCompletionEvent.h b/cc/CCCompletionEvent.h
diff --git a/cc/CCDamageTracker.h b/cc/CCDamageTracker.h
diff --git a/cc/CCDebugBorderDrawQuad.h b/cc/CCDebugBorderDrawQuad.h
diff --git a/cc/CCDebugRectHistory.h b/cc/CCDebugRectHistory.h
diff --git a/cc/CCDelayBasedTimeSource.h b/cc/CCDelayBasedTimeSource.h
diff --git a/cc/CCDelegatedRendererLayerImpl.h b/cc/CCDelegatedRendererLayerImpl.h
diff --git a/cc/CCDirectRenderer.h b/cc/CCDirectRenderer.h
diff --git a/cc/CCDrawQuad.h b/cc/CCDrawQuad.h
diff --git a/cc/CCFontAtlas.h b/cc/CCFontAtlas.h
diff --git a/cc/CCFrameRateController.h b/cc/CCFrameRateController.h
diff --git a/cc/CCFrameRateCounter.h b/cc/CCFrameRateCounter.h
diff --git a/cc/CCGraphicsContext.h b/cc/CCGraphicsContext.h
diff --git a/cc/CCLayerQuad.h b/cc/CCLayerQuad.h
diff --git a/cc/CCThreadedTest.h b/cc/CCThreadedTest.h
diff --git a/cc/active_animation.cc b/cc/active_animation.cc
@@ -4,12 +4,13 @@
 
 #include "config.h"
 
-#include "CCActiveAnimation.h"
+#include "cc/active_animation.h"
+
+#include <cmath>
 
-#include "CCAnimationCurve.h"
 #include "base/debug/trace_event.h"
 #include "base/string_util.h"
-#include <cmath>
+#include "cc/animation_curve.h"
 
 namespace {
 

diff --git a/cc/active_animation_unittest.cc b/cc/active_animation_unittest.cc
@@ -4,7 +4,7 @@
 
 #include "config.h"
 
-#include "CCActiveAnimation.h"
+#include "cc/active_animation.h"
 
 #include "cc/test/animation_test_common.h"
 #include "testing/gmock/include/gmock/gmock.h"

diff --git a/cc/animation_curve.cc b/cc/animation_curve.cc
@@ -4,7 +4,7 @@
 
 #include "config.h"
 
-#include "CCAnimationCurve.h"
+#include "cc/animation_curve.h"
 
 #include "base/logging.h"
 
@@ -32,4 +32,4 @@ AnimationCurve::Type TransformAnimationCurve::type() const
     return Transform;
 }
 
-} // namespace cc
+}  // namespace cc
diff --git a/cc/animation_events.h b/cc/animation_events.h
@@ -7,7 +7,7 @@
 
 #include <vector>
 
-#include "CCActiveAnimation.h"
+#include "cc/active_animation.h"
 
 namespace cc {
 

diff --git a/cc/cc.gyp b/cc/cc.gyp
@@ -16,35 +16,35 @@
       'caching_bitmap_canvas_layer_updater.cc',
       'caching_bitmap_canvas_layer_updater.h',
       'active_animation.cc',
-      'CCActiveAnimation.h',
-      'CCAppendQuadsData.h',
+      'active_animation.h',
+      'append_quads_data.h',
       'animation_curve.cc',
-      'CCAnimationCurve.h',
-      'CCAnimationEvents.h',
+      'animation_curve.h',
+      'animation_events.h',
       'checkerboard_draw_quad.cc',
-      'CCCheckerboardDrawQuad.h',
-      'CCCompletionEvent.h',
+      'checkerboard_draw_quad.h',
+      'completion_event.h',
       'damage_tracker.cc',
-      'CCDamageTracker.h',
+      'damage_tracker.h',
       'debug_border_draw_quad.cc',
-      'CCDebugBorderDrawQuad.h',
+      'debug_border_draw_quad.h',
       'debug_rect_history.cc',
-      'CCDebugRectHistory.h',
+      'debug_rect_history.h',
       'delay_based_time_source.cc',
-      'CCDelayBasedTimeSource.h',
+      'delay_based_time_source.h',
       'delegated_renderer_layer_impl.cc',
-      'CCDelegatedRendererLayerImpl.h',
+      'delegated_renderer_layer_impl.h',
       'direct_renderer.cc',
-      'CCDirectRenderer.h',
+      'direct_renderer.h',
       'draw_quad.cc',
-      'CCDrawQuad.h',
+      'draw_quad.h',
       'font_atlas.cc',
-      'CCFontAtlas.h',
+      'font_atlas.h',
       'frame_rate_controller.cc',
-      'CCFrameRateController.h',
+      'frame_rate_controller.h',
       'frame_rate_counter.cc',
-      'CCFrameRateCounter.h',
-      'CCGraphicsContext.h',
+      'frame_rate_counter.h',
+      'graphics_context.h',
       'heads_up_display_layer_impl.cc',
       'heads_up_display_layer_impl.h',
       'io_surface_draw_quad.cc',
@@ -221,23 +221,6 @@
       'video_layer.cc',
       'video_layer.h',
 
-      'active_animation.h',
-      'animation_curve.h',
-      'animation_events.h',
-      'append_quads_data.h',
-      'checkerboard_draw_quad.h',
-      'completion_event.h',
-      'damage_tracker.h',
-      'debug_border_draw_quad.h',
-      'debug_rect_history.h',
-      'delay_based_time_source.h',
-      'delegated_renderer_layer_impl.h',
-      'direct_renderer.h',
-      'draw_quad.h',
-      'font_atlas.h',
-      'frame_rate_controller.h',
-      'frame_rate_counter.h',
-      'graphics_context.h',
       'resource_update.h',
       'threaded_test.h',
     ],

diff --git a/cc/checkerboard_draw_quad.cc b/cc/checkerboard_draw_quad.cc
@@ -4,7 +4,7 @@
 
 #include "config.h"
 
-#include "CCCheckerboardDrawQuad.h"
+#include "cc/checkerboard_draw_quad.h"
 
 #include "base/logging.h"
 

diff --git a/cc/checkerboard_draw_quad.h b/cc/checkerboard_draw_quad.h
@@ -5,8 +5,8 @@
 #ifndef CCCheckerboardDrawQuad_h
 #define CCCheckerboardDrawQuad_h
 
-#include "CCDrawQuad.h"
 #include "base/memory/scoped_ptr.h"
+#include "cc/draw_quad.h"
 #include "third_party/skia/include/core/SkColor.h"
 
 namespace cc {

diff --git a/cc/damage_tracker.cc b/cc/damage_tracker.cc
@@ -4,7 +4,7 @@
 
 #include "config.h"
 
-#include "CCDamageTracker.h"
+#include "cc/damage_tracker.h"
 
 #include "cc/layer_impl.h"
 #include "cc/layer_tree_host_common.h"

diff --git a/cc/damage_tracker_unittest.cc b/cc/damage_tracker_unittest.cc
@@ -4,7 +4,7 @@
 
 #include "config.h"
 
-#include "CCDamageTracker.h"
+#include "cc/damage_tracker.h"
 
 #include "cc/layer_impl.h"
 #include "cc/layer_sorter.h"

diff --git a/cc/debug_border_draw_quad.cc b/cc/debug_border_draw_quad.cc
@@ -4,7 +4,7 @@
 
 #include "config.h"
 
-#include "CCDebugBorderDrawQuad.h"
+#include "cc/debug_border_draw_quad.h"
 
 #include "base/logging.h"
 

diff --git a/cc/debug_border_draw_quad.h b/cc/debug_border_draw_quad.h
@@ -5,8 +5,8 @@
 #ifndef CCDebugBorderDrawQuad_h
 #define CCDebugBorderDrawQuad_h
 
-#include "CCDrawQuad.h"
 #include "base/memory/scoped_ptr.h"
+#include "cc/draw_quad.h"
 #include "third_party/skia/include/core/SkColor.h"
 
 namespace cc {

diff --git a/cc/debug_rect_history.cc b/cc/debug_rect_history.cc
@@ -4,9 +4,9 @@
 
 #include "config.h"
 
-#include "CCDebugRectHistory.h"
+#include "cc/debug_rect_history.h"
 
-#include "CCDamageTracker.h"
+#include "cc/damage_tracker.h"
 #include "cc/layer_impl.h"
 #include "cc/layer_tree_host.h"
 #include "cc/math_util.h"

diff --git a/cc/delay_based_time_source.cc b/cc/delay_based_time_source.cc
@@ -4,11 +4,12 @@
 
 #include "config.h"
 
-#include "CCDelayBasedTimeSource.h"
+#include "cc/delay_based_time_source.h"
+
+#include <algorithm>
 
 #include "base/debug/trace_event.h"
 #include "base/logging.h"
-#include <algorithm>
 #include <wtf/CurrentTime.h>
 #include <wtf/MathExtras.h>
 

diff --git a/cc/delay_based_time_source_unittest.cc b/cc/delay_based_time_source_unittest.cc
@@ -4,7 +4,7 @@
 
 #include "config.h"
 
-#include "CCDelayBasedTimeSource.h"
+#include "cc/delay_based_time_source.h"
 
 #include "cc/test/scheduler_test_common.h"
 #include "cc/thread.h"

diff --git a/cc/delegated_renderer_layer.cc b/cc/delegated_renderer_layer.cc
@@ -3,9 +3,10 @@
 // found in the LICENSE file.
 
 #include "config.h"
+
 #include "cc/delegated_renderer_layer.h"
 
-#include "CCDelegatedRendererLayerImpl.h"
+#include "cc/delegated_renderer_layer_impl.h"
 
 namespace cc {
 
@@ -30,4 +31,4 @@ scoped_ptr<LayerImpl> DelegatedRendererLayer::createLayerImpl()
     return DelegatedRendererLayerImpl::create(m_layerId).PassAs<LayerImpl>();
 }
 
-}
+}  // namespace cc
diff --git a/cc/delegated_renderer_layer_impl.cc b/cc/delegated_renderer_layer_impl.cc
@@ -4,9 +4,9 @@
 
 #include "config.h"
 
-#include "CCDelegatedRendererLayerImpl.h"
+#include "cc/delegated_renderer_layer_impl.h"
 
-#include "CCAppendQuadsData.h"
+#include "cc/append_quads_data.h"
 #include "cc/math_util.h"
 #include "cc/quad_sink.h"
 #include "cc/render_pass_draw_quad.h"

diff --git a/cc/delegated_renderer_layer_impl_unittest.cc b/cc/delegated_renderer_layer_impl_unittest.cc
@@ -4,9 +4,9 @@
 
 #include "config.h"
 
-#include "CCDelegatedRendererLayerImpl.h"
+#include "cc/delegated_renderer_layer_impl.h"
 
-#include "CCAppendQuadsData.h"
+#include "cc/append_quads_data.h"
 #include "cc/layer_tree_host_impl.h"
 #include "cc/quad_sink.h"
 #include "cc/render_pass_draw_quad.h"