diff options
| -rw-r--r-- | cc/cc.gyp | 4 | ||||
| -rw-r--r-- | cc/cc_tests.gyp | 4 | ||||
| -rw-r--r-- | cc/resources/raster_worker_pool.h | 2 | ||||
| -rw-r--r-- | cc/resources/worker_pool.cc (renamed from cc/base/worker_pool.cc) | 2 | ||||
| -rw-r--r-- | cc/resources/worker_pool.h (renamed from cc/base/worker_pool.h) | 6 | ||||
| -rw-r--r-- | cc/resources/worker_pool_perftest.cc (renamed from cc/base/worker_pool_perftest.cc) | 2 | ||||
| -rw-r--r-- | cc/resources/worker_pool_unittest.cc (renamed from cc/base/worker_pool_unittest.cc) | 4 |
7 files changed, 12 insertions, 12 deletions
@@ -49,8 +49,6 @@ 'base/tiling_data.cc', 'base/tiling_data.h', 'base/util.h', - 'base/worker_pool.cc', - 'base/worker_pool.h', 'debug/debug_colors.cc', 'debug/debug_colors.h', 'debug/debug_rect_history.cc', @@ -304,6 +302,8 @@ 'resources/transferable_resource.h', 'resources/video_resource_updater.cc', 'resources/video_resource_updater.h', + 'resources/worker_pool.cc', + 'resources/worker_pool.h', 'scheduler/delay_based_time_source.cc', 'scheduler/delay_based_time_source.h', 'scheduler/frame_rate_controller.cc', diff --git a/cc/cc_tests.gyp b/cc/cc_tests.gyp index f214015..9f4097c 100644 --- a/cc/cc_tests.gyp +++ b/cc/cc_tests.gyp @@ -19,7 +19,6 @@ 'base/scoped_ptr_vector_unittest.cc', 'base/tiling_data_unittest.cc', 'base/util_unittest.cc', - 'base/worker_pool_unittest.cc', 'input/top_controls_manager_unittest.cc', 'layers/content_layer_unittest.cc', 'layers/contents_scaling_layer_unittest.cc', @@ -62,6 +61,7 @@ 'resources/scoped_resource_unittest.cc', 'resources/tile_manager_unittest.cc', 'resources/tile_priority_unittest.cc', + 'resources/worker_pool_unittest.cc', 'scheduler/delay_based_time_source_unittest.cc', 'scheduler/frame_rate_controller_unittest.cc', 'scheduler/rolling_time_delta_history_unittest.cc', @@ -227,7 +227,7 @@ 'cc_test_support', ], 'sources': [ - 'base/worker_pool_perftest.cc', + 'resources/worker_pool_perftest.cc', 'test/cc_test_suite.cc', 'test/run_all_unittests.cc', 'trees/layer_tree_host_perftest.cc', diff --git a/cc/resources/raster_worker_pool.h b/cc/resources/raster_worker_pool.h index ca14274..6ae8812 100644 --- a/cc/resources/raster_worker_pool.h +++ b/cc/resources/raster_worker_pool.h @@ -8,11 +8,11 @@ #include <vector> #include "base/containers/hash_tables.h" -#include "cc/base/worker_pool.h" #include "cc/debug/rendering_stats_instrumentation.h" #include "cc/resources/picture_pile_impl.h" #include "cc/resources/resource_provider.h" #include "cc/resources/tile_priority.h" +#include "cc/resources/worker_pool.h" class SkDevice; diff --git a/cc/base/worker_pool.cc b/cc/resources/worker_pool.cc index bb910e9..c29189a 100644 --- a/cc/base/worker_pool.cc +++ b/cc/resources/worker_pool.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/base/worker_pool.h" +#include "cc/resources/worker_pool.h" #if defined(OS_ANDROID) // TODO(epenner): Move thread priorities to base. (crbug.com/170549) diff --git a/cc/base/worker_pool.h b/cc/resources/worker_pool.h index eeffb56..4fccded 100644 --- a/cc/base/worker_pool.h +++ b/cc/resources/worker_pool.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_BASE_WORKER_POOL_H_ -#define CC_BASE_WORKER_POOL_H_ +#ifndef CC_RESOURCES_WORKER_POOL_H_ +#define CC_RESOURCES_WORKER_POOL_H_ #include <deque> #include <string> @@ -151,4 +151,4 @@ class CC_EXPORT WorkerPool { } // namespace cc -#endif // CC_BASE_WORKER_POOL_H_ +#endif // CC_RESOURCES_WORKER_POOL_H_ diff --git a/cc/base/worker_pool_perftest.cc b/cc/resources/worker_pool_perftest.cc index f83b886..9b52ae4 100644 --- a/cc/base/worker_pool_perftest.cc +++ b/cc/resources/worker_pool_perftest.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/base/worker_pool.h" +#include "cc/resources/worker_pool.h" #include "base/time.h" #include "cc/base/completion_event.h" diff --git a/cc/base/worker_pool_unittest.cc b/cc/resources/worker_pool_unittest.cc index 1a48ec4..babf7fb 100644 --- a/cc/base/worker_pool_unittest.cc +++ b/cc/resources/worker_pool_unittest.cc @@ -1,8 +1,8 @@ -// Copyright (c) 2013 The Chromium Authors. All rights reserved. +// Copyright 2013 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/base/worker_pool.h" +#include "cc/resources/worker_pool.h" #include <vector> |