[cc] cleanup: re-arrange some file locations in cc/scheduler

* Move rolling_time_delta_history.[cc|h] to cc/base * Move texture_uploader.[cc|h] to cc/resources R=enne@chromium.org BUG=340190 TEST=cc_unittests Review URL: https://codereview.chromium.org/130173007 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@248685 0039d316-1c4b-4281-b951-d872f2087c98
Denger-Network · Feb 4, 2014 · eade06d · eade06d
1 parent fe1afdb
commit eade06d
Show file tree

Hide file tree

Showing 15 changed files with 31 additions and 45 deletions.
diff --git a/cc/scheduler/rolling_time_delta_history.cc → cc/base/rolling_time_delta_history.cc b/cc/scheduler/rolling_time_delta_history.cc → cc/base/rolling_time_delta_history.cc
@@ -1,19 +1,17 @@
-// Copyright 2013 The Chromium Authors. All rights reserved.
+// Copyright 2014 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include <cmath>
 
-#include "cc/scheduler/rolling_time_delta_history.h"
+#include "cc/base/rolling_time_delta_history.h"
 
 namespace cc {
 
 RollingTimeDeltaHistory::RollingTimeDeltaHistory(size_t max_size)
-    : max_size_(max_size) {
-}
+    : max_size_(max_size) {}
 
-RollingTimeDeltaHistory::~RollingTimeDeltaHistory() {
-}
+RollingTimeDeltaHistory::~RollingTimeDeltaHistory() {}
 
 void RollingTimeDeltaHistory::InsertSample(base::TimeDelta time) {
   if (max_size_ == 0)

diff --git a/cc/scheduler/rolling_time_delta_history.h → cc/base/rolling_time_delta_history.h b/cc/scheduler/rolling_time_delta_history.h → cc/base/rolling_time_delta_history.h
@@ -1,9 +1,9 @@
-// Copyright 2013 The Chromium Authors. All rights reserved.
+// Copyright 2014 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef CC_SCHEDULER_ROLLING_TIME_DELTA_HISTORY_H_
-#define CC_SCHEDULER_ROLLING_TIME_DELTA_HISTORY_H_
+#ifndef CC_BASE_ROLLING_TIME_DELTA_HISTORY_H_
+#define CC_BASE_ROLLING_TIME_DELTA_HISTORY_H_
 
 #include <deque>
 #include <set>
@@ -41,4 +41,4 @@ class CC_EXPORT RollingTimeDeltaHistory {
 
 }  // namespace cc
 
-#endif  // CC_SCHEDULER_ROLLING_TIME_DELTA_HISTORY_H_
+#endif  // CC_BASE_ROLLING_TIME_DELTA_HISTORY_H_
diff --git a/...er/rolling_time_delta_history_unittest.cc → ...se/rolling_time_delta_history_unittest.cc b/...er/rolling_time_delta_history_unittest.cc → ...se/rolling_time_delta_history_unittest.cc
@@ -1,8 +1,8 @@
-// Copyright 2013 The Chromium Authors. All rights reserved.
+// Copyright 2014 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "cc/scheduler/rolling_time_delta_history.h"
+#include "cc/base/rolling_time_delta_history.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 namespace cc {

diff --git a/cc/cc.gyp b/cc/cc.gyp
@@ -71,6 +71,8 @@
         'base/ref_counted_managed.h',
         'base/region.cc',
         'base/region.h',
+        'base/rolling_time_delta_history.cc',
+        'base/rolling_time_delta_history.h',
         'base/scoped_ptr_algorithm.h',
         'base/scoped_ptr_deque.h',
         'base/scoped_ptr_vector.h',
@@ -388,6 +390,8 @@
         'resources/texture_mailbox.h',
         'resources/texture_mailbox_deleter.cc',
         'resources/texture_mailbox_deleter.h',
+        'resources/texture_uploader.cc',
+        'resources/texture_uploader.h',
         'resources/tile.cc',
         'resources/tile.h',
         'resources/tile_manager.cc',
@@ -408,16 +412,12 @@
         'scheduler/draw_swap_readback_result.h',
         'scheduler/frame_rate_controller.cc',
         'scheduler/frame_rate_controller.h',
-        'scheduler/rolling_time_delta_history.cc',
-        'scheduler/rolling_time_delta_history.h',
         'scheduler/scheduler.cc',
         'scheduler/scheduler.h',
         'scheduler/scheduler_settings.cc',
         'scheduler/scheduler_settings.h',
         'scheduler/scheduler_state_machine.cc',
         'scheduler/scheduler_state_machine.h',
-        'scheduler/texture_uploader.cc',
-        'scheduler/texture_uploader.h',
         'scheduler/time_source.h',
         'trees/blocking_task_runner.cc',
         'trees/blocking_task_runner.h',

diff --git a/cc/cc_tests.gyp b/cc/cc_tests.gyp
@@ -17,6 +17,7 @@
       'base/float_quad_unittest.cc',
       'base/math_util_unittest.cc',
       'base/region_unittest.cc',
+      'base/rolling_time_delta_history_unittest.cc',
       'base/scoped_ptr_vector_unittest.cc',
       'base/tiling_data_unittest.cc',
       'base/util_unittest.cc',
@@ -70,15 +71,14 @@
       'resources/scoped_resource_unittest.cc',
       'resources/task_graph_runner_unittest.cc',
       'resources/texture_mailbox_deleter_unittest.cc',
+      'resources/texture_uploader_unittest.cc',
       'resources/tile_manager_unittest.cc',
       'resources/tile_priority_unittest.cc',
       'resources/video_resource_updater_unittest.cc',
       'scheduler/delay_based_time_source_unittest.cc',
       'scheduler/frame_rate_controller_unittest.cc',
-      'scheduler/rolling_time_delta_history_unittest.cc',
       'scheduler/scheduler_state_machine_unittest.cc',
       'scheduler/scheduler_unittest.cc',
-      'scheduler/texture_uploader_unittest.cc',
       'test/layer_tree_json_parser_unittest.cc',
       'test/test_web_graphics_context_3d_unittest.cc',
       'trees/damage_tracker_unittest.cc',

diff --git a/cc/layers/nine_patch_layer_unittest.cc b/cc/layers/nine_patch_layer_unittest.cc
@@ -9,7 +9,6 @@
 #include "cc/resources/resource_provider.h"
 #include "cc/resources/resource_update_queue.h"
 #include "cc/resources/scoped_ui_resource.h"
-#include "cc/scheduler/texture_uploader.h"
 #include "cc/test/fake_layer_tree_host.h"
 #include "cc/test/fake_layer_tree_host_client.h"
 #include "cc/test/fake_output_surface.h"

diff --git a/cc/layers/ui_resource_layer_unittest.cc b/cc/layers/ui_resource_layer_unittest.cc
@@ -9,7 +9,6 @@
 #include "cc/resources/resource_provider.h"
 #include "cc/resources/resource_update_queue.h"
 #include "cc/resources/scoped_ui_resource.h"
-#include "cc/scheduler/texture_uploader.h"
 #include "cc/test/fake_layer_tree_host.h"
 #include "cc/test/fake_layer_tree_host_client.h"
 #include "cc/test/fake_output_surface.h"

diff --git a/cc/output/output_surface.h b/cc/output/output_surface.h
@@ -12,10 +12,10 @@
 #include "base/memory/scoped_ptr.h"
 #include "base/memory/weak_ptr.h"
 #include "cc/base/cc_export.h"
+#include "cc/base/rolling_time_delta_history.h"
 #include "cc/output/context_provider.h"
 #include "cc/output/software_output_device.h"
 #include "cc/scheduler/frame_rate_controller.h"
-#include "cc/scheduler/rolling_time_delta_history.h"
 
 namespace base { class SingleThreadTaskRunner; }
 

diff --git a/cc/resources/resource_provider.cc b/cc/resources/resource_provider.cc
@@ -17,8 +17,8 @@
 #include "cc/resources/platform_color.h"
 #include "cc/resources/returned_resource.h"
 #include "cc/resources/shared_bitmap_manager.h"
+#include "cc/resources/texture_uploader.h"
 #include "cc/resources/transferable_resource.h"
-#include "cc/scheduler/texture_uploader.h"
 #include "gpu/GLES2/gl2extchromium.h"
 #include "gpu/command_buffer/client/gles2_interface.h"
 #include "third_party/khronos/GLES2/gl2.h"

diff --git a/cc/scheduler/texture_uploader.cc → cc/resources/texture_uploader.cc b/cc/scheduler/texture_uploader.cc → cc/resources/texture_uploader.cc
@@ -1,8 +1,8 @@
-// Copyright 2012 The Chromium Authors. All rights reserved.
+// Copyright 2014 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "cc/scheduler/texture_uploader.h"
+#include "cc/resources/texture_uploader.h"
 
 #include <algorithm>
 #include <vector>

diff --git a/cc/scheduler/texture_uploader.h → cc/resources/texture_uploader.h b/cc/scheduler/texture_uploader.h → cc/resources/texture_uploader.h
@@ -1,9 +1,9 @@
-// Copyright 2012 The Chromium Authors. All rights reserved.
+// Copyright 2014 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef CC_SCHEDULER_TEXTURE_UPLOADER_H_
-#define CC_SCHEDULER_TEXTURE_UPLOADER_H_
+#ifndef CC_RESOURCES_TEXTURE_UPLOADER_H_
+#define CC_RESOURCES_TEXTURE_UPLOADER_H_
 
 #include <set>
 
@@ -66,12 +66,8 @@ class CC_EXPORT TextureUploader {
     bool IsPending();
     unsigned Value();
     size_t TexturesUploaded();
-    void mark_as_non_blocking() {
-      is_non_blocking_ = true;
-    }
-    bool is_non_blocking() const {
-      return is_non_blocking_;
-    }
+    void mark_as_non_blocking() { is_non_blocking_ = true; }
+    bool is_non_blocking() const { return is_non_blocking_; }
 
    private:
     explicit Query(gpu::gles2::GLES2Interface* gl);
@@ -119,4 +115,4 @@ class CC_EXPORT TextureUploader {
 
 }  // namespace cc
 
-#endif  // CC_SCHEDULER_TEXTURE_UPLOADER_H_
+#endif  // CC_RESOURCES_TEXTURE_UPLOADER_H_
diff --git a/cc/scheduler/texture_uploader_unittest.cc → cc/resources/texture_uploader_unittest.cc b/cc/scheduler/texture_uploader_unittest.cc → cc/resources/texture_uploader_unittest.cc
@@ -1,8 +1,8 @@
-// Copyright 2012 The Chromium Authors. All rights reserved.
+// Copyright 2014 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "cc/scheduler/texture_uploader.h"
+#include "cc/resources/texture_uploader.h"
 
 #include "cc/base/util.h"
 #include "cc/resources/prioritized_resource.h"
@@ -147,12 +147,8 @@ void UploadTexture(TextureUploader* uploader,
                    ResourceFormat format,
                    const gfx::Size& size,
                    const uint8* data) {
-  uploader->Upload(data,
-                   gfx::Rect(size),
-                   gfx::Rect(size),
-                   gfx::Vector2d(),
-                   format,
-                   size);
+  uploader->Upload(
+      data, gfx::Rect(size), gfx::Rect(size), gfx::Vector2d(), format, size);
 }
 
 TEST(TextureUploaderTest, NumBlockingUploads) {

diff --git a/cc/test/tiled_layer_test_common.h b/cc/test/tiled_layer_test_common.h
@@ -12,7 +12,6 @@
 #include "cc/resources/prioritized_resource.h"
 #include "cc/resources/resource_provider.h"
 #include "cc/resources/resource_update_queue.h"
-#include "cc/scheduler/texture_uploader.h"
 #include "ui/gfx/rect.h"
 #include "ui/gfx/size.h"
 

diff --git a/cc/trees/layer_tree_host_impl.cc b/cc/trees/layer_tree_host_impl.cc
@@ -50,7 +50,6 @@
 #include "cc/resources/texture_mailbox_deleter.h"
 #include "cc/resources/ui_resource_bitmap.h"
 #include "cc/scheduler/delay_based_time_source.h"
-#include "cc/scheduler/texture_uploader.h"
 #include "cc/trees/damage_tracker.h"
 #include "cc/trees/layer_tree_host.h"
 #include "cc/trees/layer_tree_host_common.h"

diff --git a/cc/trees/thread_proxy.h b/cc/trees/thread_proxy.h
@@ -12,8 +12,8 @@
 #include "base/time/time.h"
 #include "cc/animation/animation_events.h"
 #include "cc/base/completion_event.h"
+#include "cc/base/rolling_time_delta_history.h"
 #include "cc/resources/resource_update_controller.h"
-#include "cc/scheduler/rolling_time_delta_history.h"
 #include "cc/scheduler/scheduler.h"
 #include "cc/trees/layer_tree_host_impl.h"
 #include "cc/trees/proxy.h"