Move classes in cc/debug but not in the debug component elsewhere.

Most classes are moved to a new cc/benchmarks/ directory.
Others are placed in cc/base/, except for two cases where the class depends
on cc/layers/ or cc/tiles/ internals, in which case they are placed in the
most logical of those two.

TBR=vmpstr
CQ_INCLUDE_TRYBOTS=master.tryserver.blink:linux_trusty_blink_rel

Review-Url: https://codereview.chromium.org/2760663002
Cr-Commit-Position: refs/heads/master@{#458130}

cc/BUILD.gn

@@ -7,38 +7,26 @@ import("//gpu/vulkan/features.gni")
 
 cc_component("cc") {
   sources = [
-    # TODO(chrishtr): move these to cc/benchmarks/
-    "debug/benchmark_instrumentation.cc",
-    "debug/benchmark_instrumentation.h",
-    "debug/debug_rect_history.cc",
-    "debug/debug_rect_history.h",
-    "debug/devtools_instrumentation.cc",
-    "debug/devtools_instrumentation.h",
-    "debug/frame_rate_counter.cc",
-    "debug/frame_rate_counter.h",
-    "debug/frame_viewer_instrumentation.cc",
-    "debug/frame_viewer_instrumentation.h",
-    "debug/invalidation_benchmark.cc",
-    "debug/invalidation_benchmark.h",
-    "debug/lap_timer.cc",
-    "debug/lap_timer.h",
-    "debug/micro_benchmark.cc",
-    "debug/micro_benchmark.h",
-    "debug/micro_benchmark_controller.cc",
-    "debug/micro_benchmark_controller.h",
-    "debug/micro_benchmark_controller_impl.cc",
-    "debug/micro_benchmark_controller_impl.h",
-    "debug/micro_benchmark_impl.cc",
-    "debug/micro_benchmark_impl.h",
-    "debug/rasterize_and_record_benchmark.cc",
-    "debug/rasterize_and_record_benchmark.h",
-    "debug/rasterize_and_record_benchmark_impl.cc",
-    "debug/rasterize_and_record_benchmark_impl.h",
-    "debug/ring_buffer.h",
-    "debug/unittest_only_benchmark.cc",
-    "debug/unittest_only_benchmark.h",
-    "debug/unittest_only_benchmark_impl.cc",
-    "debug/unittest_only_benchmark_impl.h",
+    "benchmarks/benchmark_instrumentation.cc",
+    "benchmarks/benchmark_instrumentation.h",
+    "benchmarks/invalidation_benchmark.cc",
+    "benchmarks/invalidation_benchmark.h",
+    "benchmarks/micro_benchmark.cc",
+    "benchmarks/micro_benchmark.h",
+    "benchmarks/micro_benchmark_controller.cc",
+    "benchmarks/micro_benchmark_controller.h",
+    "benchmarks/micro_benchmark_controller_impl.cc",
+    "benchmarks/micro_benchmark_controller_impl.h",
+    "benchmarks/micro_benchmark_impl.cc",
+    "benchmarks/micro_benchmark_impl.h",
+    "benchmarks/rasterize_and_record_benchmark.cc",
+    "benchmarks/rasterize_and_record_benchmark.h",
+    "benchmarks/rasterize_and_record_benchmark_impl.cc",
+    "benchmarks/rasterize_and_record_benchmark_impl.h",
+    "benchmarks/unittest_only_benchmark.cc",
+    "benchmarks/unittest_only_benchmark.h",
+    "benchmarks/unittest_only_benchmark_impl.cc",
+    "benchmarks/unittest_only_benchmark_impl.h",
     "input/browser_controls_offset_manager.cc",
     "input/browser_controls_offset_manager.h",
     "input/browser_controls_offset_manager_client.h",
@@ -358,6 +346,8 @@ cc_component("cc") {
     "tiles/decoded_image_tracker.h",
     "tiles/eviction_tile_priority_queue.cc",
     "tiles/eviction_tile_priority_queue.h",
+    "tiles/frame_viewer_instrumentation.cc",
+    "tiles/frame_viewer_instrumentation.h",
     "tiles/gpu_image_decode_cache.cc",
     "tiles/gpu_image_decode_cache.h",
     "tiles/image_controller.cc",
@@ -405,12 +395,16 @@ cc_component("cc") {
     "trees/compositor_mode.h",
     "trees/damage_tracker.cc",
     "trees/damage_tracker.h",
+    "trees/debug_rect_history.cc",
+    "trees/debug_rect_history.h",
     "trees/draw_property_utils.cc",
     "trees/draw_property_utils.h",
     "trees/effect_node.cc",
     "trees/effect_node.h",
     "trees/element_id.cc",
     "trees/element_id.h",
+    "trees/frame_rate_counter.cc",
+    "trees/frame_rate_counter.h",
     "trees/latency_info_swap_promise_monitor.cc",
     "trees/latency_info_swap_promise_monitor.h",
     "trees/layer_tree_host.cc",
@@ -714,7 +708,7 @@ cc_test("cc_unittests") {
     "base/spiral_iterator_unittest.cc",
     "base/tiling_data_unittest.cc",
     "base/unique_notifier_unittest.cc",
-    "debug/micro_benchmark_controller_unittest.cc",
+    "benchmarks/micro_benchmark_controller_unittest.cc",
     "debug/rendering_stats_unittest.cc",
     "input/browser_controls_offset_manager_unittest.cc",
     "input/scroll_state_unittest.cc",

cc/animation/animation_host_perftest.cc

@@ -8,7 +8,7 @@
 #include "cc/animation/animation_id_provider.h"
 #include "cc/animation/animation_player.h"
 #include "cc/animation/animation_timeline.h"
-#include "cc/debug/lap_timer.h"
+#include "cc/base/lap_timer.h"
 #include "cc/test/fake_impl_task_runner_provider.h"
 #include "cc/test/fake_layer_tree_host.h"
 #include "cc/test/fake_layer_tree_host_client.h"

cc/base/BUILD.gn

@@ -14,6 +14,8 @@ component("base") {
     "contiguous_container.h",
     "delayed_unique_notifier.cc",
     "delayed_unique_notifier.h",
+    "devtools_instrumentation.cc",
+    "devtools_instrumentation.h",
     "filter_operation.cc",
     "filter_operation.h",
     "filter_operations.cc",
@@ -24,6 +26,8 @@ component("base") {
     "index_rect.h",
     "invalidation_region.cc",
     "invalidation_region.h",
+    "lap_timer.cc",
+    "lap_timer.h",
     "list_container.h",
     "list_container_helper.cc",
     "list_container_helper.h",

cc/debug/devtools_instrumentation.cc → cc/base/devtools_instrumentation.cc

@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "cc/debug/devtools_instrumentation.h"
+#include "cc/base/devtools_instrumentation.h"
 
 namespace cc {
 namespace devtools_instrumentation {

cc/debug/devtools_instrumentation.h → cc/base/devtools_instrumentation.h

@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef CC_DEBUG_DEVTOOLS_INSTRUMENTATION_H_
-#define CC_DEBUG_DEVTOOLS_INSTRUMENTATION_H_
+#ifndef CC_BASE_DEVTOOLS_INSTRUMENTATION_H_
+#define CC_BASE_DEVTOOLS_INSTRUMENTATION_H_
 
 #include <stdint.h>
 
@@ -13,49 +13,49 @@
 #include "base/metrics/histogram_macros.h"
 #include "base/trace_event/trace_event.h"
 #include "base/trace_event/trace_event_argument.h"
+#include "cc/base/base_export.h"
 
 namespace cc {
 namespace devtools_instrumentation {
 
 namespace internal {
-extern const char kCategory[];
-extern const char kCategoryFrame[];
-extern const char kData[];
-extern const char kFrameId[];
-extern const char kLayerId[];
-extern const char kLayerTreeId[];
-extern const char kPixelRefId[];
-
-extern const char kImageDecodeTask[];
-extern const char kBeginFrame[];
-extern const char kNeedsBeginFrameChanged[];
-extern const char kActivateLayerTree[];
-extern const char kRequestMainThreadFrame[];
-extern const char kBeginMainThreadFrame[];
-extern const char kDrawFrame[];
-extern const char kCompositeLayers[];
+CC_BASE_EXPORT extern const char kCategory[];
+CC_BASE_EXPORT extern const char kCategoryFrame[];
+CC_BASE_EXPORT extern const char kData[];
+CC_BASE_EXPORT extern const char kFrameId[];
+CC_BASE_EXPORT extern const char kLayerId[];
+CC_BASE_EXPORT extern const char kLayerTreeId[];
+CC_BASE_EXPORT extern const char kPixelRefId[];
+
+CC_BASE_EXPORT extern const char kImageDecodeTask[];
+CC_BASE_EXPORT extern const char kBeginFrame[];
+CC_BASE_EXPORT extern const char kNeedsBeginFrameChanged[];
+CC_BASE_EXPORT extern const char kActivateLayerTree[];
+CC_BASE_EXPORT extern const char kRequestMainThreadFrame[];
+CC_BASE_EXPORT extern const char kBeginMainThreadFrame[];
+CC_BASE_EXPORT extern const char kDrawFrame[];
+CC_BASE_EXPORT extern const char kCompositeLayers[];
 }  // namespace internal
 
 extern const char kPaintSetup[];
-extern const char kUpdateLayer[];
+CC_BASE_EXPORT extern const char kUpdateLayer[];
 
-class ScopedLayerTask {
+class CC_BASE_EXPORT ScopedLayerTask {
  public:
   ScopedLayerTask(const char* event_name, int layer_id)
-    : event_name_(event_name) {
-    TRACE_EVENT_BEGIN1(internal::kCategory, event_name_,
-        internal::kLayerId, layer_id);
-  }
-  ~ScopedLayerTask() {
-    TRACE_EVENT_END0(internal::kCategory, event_name_);
+      : event_name_(event_name) {
+    TRACE_EVENT_BEGIN1(internal::kCategory, event_name_, internal::kLayerId,
+                       layer_id);
   }
+  ~ScopedLayerTask() { TRACE_EVENT_END0(internal::kCategory, event_name_); }
+
  private:
   const char* event_name_;
 
   DISALLOW_COPY_AND_ASSIGN(ScopedLayerTask);
 };
 
-class ScopedImageDecodeTask {
+class CC_BASE_EXPORT ScopedImageDecodeTask {
  public:
   enum Type { SOFTWARE, GPU };
 
@@ -86,26 +86,24 @@ class ScopedImageDecodeTask {
   DISALLOW_COPY_AND_ASSIGN(ScopedImageDecodeTask);
 };
 
-class ScopedLayerTreeTask {
+class CC_BASE_EXPORT ScopedLayerTreeTask {
  public:
   ScopedLayerTreeTask(const char* event_name,
                       int layer_id,
                       int layer_tree_host_id)
-    : event_name_(event_name) {
-    TRACE_EVENT_BEGIN2(internal::kCategory, event_name_,
-        internal::kLayerId, layer_id,
-        internal::kLayerTreeId, layer_tree_host_id);
-  }
-  ~ScopedLayerTreeTask() {
-    TRACE_EVENT_END0(internal::kCategory, event_name_);
+      : event_name_(event_name) {
+    TRACE_EVENT_BEGIN2(internal::kCategory, event_name_, internal::kLayerId,
+                       layer_id, internal::kLayerTreeId, layer_tree_host_id);
   }
+  ~ScopedLayerTreeTask() { TRACE_EVENT_END0(internal::kCategory, event_name_); }
+
  private:
   const char* event_name_;
 
   DISALLOW_COPY_AND_ASSIGN(ScopedLayerTreeTask);
 };
 
-struct ScopedCommitTrace {
+struct CC_BASE_EXPORT ScopedCommitTrace {
  public:
   explicit ScopedCommitTrace(int layer_tree_host_id) {
     TRACE_EVENT_BEGIN1(internal::kCategory, internal::kCompositeLayers,
@@ -119,51 +117,40 @@ struct ScopedCommitTrace {
   DISALLOW_COPY_AND_ASSIGN(ScopedCommitTrace);
 };
 
-struct ScopedLayerObjectTracker
+struct CC_BASE_EXPORT ScopedLayerObjectTracker
     : public base::trace_event::TraceScopedTrackableObject<int> {
   explicit ScopedLayerObjectTracker(int layer_id)
-      : base::trace_event::TraceScopedTrackableObject<int>(
-            internal::kCategory,
-            internal::kLayerId,
-            layer_id) {
-  }
+      : base::trace_event::TraceScopedTrackableObject<int>(internal::kCategory,
+                                                           internal::kLayerId,
+                                                           layer_id) {}
 
  private:
   DISALLOW_COPY_AND_ASSIGN(ScopedLayerObjectTracker);
 };
 
-inline void DidActivateLayerTree(int layer_tree_host_id, int frame_id) {
-  TRACE_EVENT_INSTANT2(internal::kCategoryFrame,
-                       internal::kActivateLayerTree,
-                       TRACE_EVENT_SCOPE_THREAD,
-                       internal::kLayerTreeId,
-                       layer_tree_host_id,
-                       internal::kFrameId,
-                       frame_id);
+inline void CC_BASE_EXPORT DidActivateLayerTree(int layer_tree_host_id,
+                                                int frame_id) {
+  TRACE_EVENT_INSTANT2(internal::kCategoryFrame, internal::kActivateLayerTree,
+                       TRACE_EVENT_SCOPE_THREAD, internal::kLayerTreeId,
+                       layer_tree_host_id, internal::kFrameId, frame_id);
 }
 
-inline void DidBeginFrame(int layer_tree_host_id) {
-  TRACE_EVENT_INSTANT1(internal::kCategoryFrame,
-                       internal::kBeginFrame,
-                       TRACE_EVENT_SCOPE_THREAD,
-                       internal::kLayerTreeId,
+inline void CC_BASE_EXPORT DidBeginFrame(int layer_tree_host_id) {
+  TRACE_EVENT_INSTANT1(internal::kCategoryFrame, internal::kBeginFrame,
+                       TRACE_EVENT_SCOPE_THREAD, internal::kLayerTreeId,
                        layer_tree_host_id);
 }
 
-inline void DidDrawFrame(int layer_tree_host_id) {
-  TRACE_EVENT_INSTANT1(internal::kCategoryFrame,
-                       internal::kDrawFrame,
-                       TRACE_EVENT_SCOPE_THREAD,
-                       internal::kLayerTreeId,
+inline void CC_BASE_EXPORT DidDrawFrame(int layer_tree_host_id) {
+  TRACE_EVENT_INSTANT1(internal::kCategoryFrame, internal::kDrawFrame,
+                       TRACE_EVENT_SCOPE_THREAD, internal::kLayerTreeId,
                        layer_tree_host_id);
 }
 
-inline void DidRequestMainThreadFrame(int layer_tree_host_id) {
-  TRACE_EVENT_INSTANT1(internal::kCategoryFrame,
-                       internal::kRequestMainThreadFrame,
-                       TRACE_EVENT_SCOPE_THREAD,
-                       internal::kLayerTreeId,
-                       layer_tree_host_id);
+inline void CC_BASE_EXPORT DidRequestMainThreadFrame(int layer_tree_host_id) {
+  TRACE_EVENT_INSTANT1(
+      internal::kCategoryFrame, internal::kRequestMainThreadFrame,
+      TRACE_EVENT_SCOPE_THREAD, internal::kLayerTreeId, layer_tree_host_id);
 }
 
 inline std::unique_ptr<base::trace_event::ConvertableToTraceFormat>
@@ -174,7 +161,8 @@ BeginMainThreadFrameData(int frame_id) {
   return std::move(value);
 }
 
-inline void WillBeginMainThreadFrame(int layer_tree_host_id, int frame_id) {
+inline void CC_BASE_EXPORT WillBeginMainThreadFrame(int layer_tree_host_id,
+                                                    int frame_id) {
   TRACE_EVENT_INSTANT2(
       internal::kCategoryFrame, internal::kBeginMainThreadFrame,
       TRACE_EVENT_SCOPE_THREAD, internal::kLayerTreeId, layer_tree_host_id,
@@ -189,7 +177,8 @@ NeedsBeginFrameData(bool needs_begin_frame) {
   return std::move(value);
 }
 
-inline void NeedsBeginFrameChanged(int layer_tree_host_id, bool new_value) {
+inline void CC_BASE_EXPORT NeedsBeginFrameChanged(int layer_tree_host_id,
+                                                  bool new_value) {
   TRACE_EVENT_INSTANT2(
       internal::kCategoryFrame, internal::kNeedsBeginFrameChanged,
       TRACE_EVENT_SCOPE_THREAD, internal::kLayerTreeId, layer_tree_host_id,
@@ -199,4 +188,4 @@ inline void NeedsBeginFrameChanged(int layer_tree_host_id, bool new_value) {
 }  // namespace devtools_instrumentation
 }  // namespace cc
 
-#endif  // CC_DEBUG_DEVTOOLS_INSTRUMENTATION_H_
+#endif  // CC_BASE_DEVTOOLS_INSTRUMENTATION_H_

cc/debug/lap_timer.cc → cc/base/lap_timer.cc

@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "cc/debug/lap_timer.h"
+#include "cc/base/lap_timer.h"
 
 #include "base/logging.h"
 
@@ -58,7 +58,9 @@ void LapTimer::Start() {
   start_time_ = Now();
 }
 
-bool LapTimer::IsWarmedUp() { return remaining_warmups_ <= 0; }
+bool LapTimer::IsWarmedUp() {
+  return remaining_warmups_ <= 0;
+}
 
 void LapTimer::NextLap() {
   if (!IsWarmedUp()) {
@@ -78,9 +80,13 @@ void LapTimer::NextLap() {
   }
 }
 
-bool LapTimer::HasTimeLimitExpired() { return accumulator_ >= time_limit_; }
+bool LapTimer::HasTimeLimitExpired() {
+  return accumulator_ >= time_limit_;
+}
 
-bool LapTimer::HasTimedAllLaps() { return !(num_laps_ % check_interval_); }
+bool LapTimer::HasTimedAllLaps() {
+  return !(num_laps_ % check_interval_);
+}
 
 float LapTimer::MsPerLap() {
   DCHECK(HasTimedAllLaps());
@@ -92,6 +98,8 @@ float LapTimer::LapsPerSecond() {
   return num_laps_ / accumulator_.InSecondsF();
 }
 
-int LapTimer::NumLaps() { return num_laps_; }
+int LapTimer::NumLaps() {
+  return num_laps_;
+}
 
 }  // namespace cc