| Index: cc/resources/bitmap_raster_worker_pool.h
|
| diff --git a/cc/resources/zero_copy_raster_worker_pool.h b/cc/resources/bitmap_raster_worker_pool.h
|
| similarity index 70%
|
| copy from cc/resources/zero_copy_raster_worker_pool.h
|
| copy to cc/resources/bitmap_raster_worker_pool.h
|
| index 4e4280e43ef7d074b176e64298bcfb29e88baac9..39c42378a082735561eb1f0b3d3aa0c3d4d6c7f2 100644
|
| --- a/cc/resources/zero_copy_raster_worker_pool.h
|
| +++ b/cc/resources/bitmap_raster_worker_pool.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_RESOURCES_ZERO_COPY_RASTER_WORKER_POOL_H_
|
| -#define CC_RESOURCES_ZERO_COPY_RASTER_WORKER_POOL_H_
|
| +#ifndef CC_RESOURCES_BITMAP_RASTER_WORKER_POOL_H_
|
| +#define CC_RESOURCES_BITMAP_RASTER_WORKER_POOL_H_
|
|
|
| #include "base/memory/weak_ptr.h"
|
| #include "base/values.h"
|
| @@ -19,11 +19,11 @@ class ConvertableToTraceFormat;
|
| namespace cc {
|
| class ResourceProvider;
|
|
|
| -class CC_EXPORT ZeroCopyRasterWorkerPool : public RasterWorkerPool,
|
| - public Rasterizer,
|
| - public RasterizerTaskClient {
|
| +class CC_EXPORT BitmapRasterWorkerPool : public RasterWorkerPool,
|
| + public Rasterizer,
|
| + public RasterizerTaskClient {
|
| public:
|
| - virtual ~ZeroCopyRasterWorkerPool();
|
| + virtual ~BitmapRasterWorkerPool();
|
|
|
| static scoped_ptr<RasterWorkerPool> Create(
|
| base::SequencedTaskRunner* task_runner,
|
| @@ -45,9 +45,9 @@ class CC_EXPORT ZeroCopyRasterWorkerPool : public RasterWorkerPool,
|
| virtual void ReleaseBufferForRaster(scoped_ptr<RasterBuffer> buffer) OVERRIDE;
|
|
|
| protected:
|
| - ZeroCopyRasterWorkerPool(base::SequencedTaskRunner* task_runner,
|
| - TaskGraphRunner* task_graph_runner,
|
| - ResourceProvider* resource_provider);
|
| + BitmapRasterWorkerPool(base::SequencedTaskRunner* task_runner,
|
| + TaskGraphRunner* task_graph_runner,
|
| + ResourceProvider* resource_provider);
|
|
|
| private:
|
| void OnRasterFinished(TaskSet task_set);
|
| @@ -68,12 +68,12 @@ class CC_EXPORT ZeroCopyRasterWorkerPool : public RasterWorkerPool,
|
| TaskGraph graph_;
|
| Task::Vector completed_tasks_;
|
|
|
| - base::WeakPtrFactory<ZeroCopyRasterWorkerPool>
|
| + base::WeakPtrFactory<BitmapRasterWorkerPool>
|
| raster_finished_weak_ptr_factory_;
|
|
|
| - DISALLOW_COPY_AND_ASSIGN(ZeroCopyRasterWorkerPool);
|
| + DISALLOW_COPY_AND_ASSIGN(BitmapRasterWorkerPool);
|
| };
|
|
|
| } // namespace cc
|
|
|
| -#endif // CC_RESOURCES_ZERO_COPY_RASTER_WORKER_POOL_H_
|
| +#endif // CC_RESOURCES_BITMAP_RASTER_WORKER_POOL_H_
|
|
|