Index: cc/resources/gpu_rasterizer.h |
diff --git a/cc/resources/gpu_rasterizer.h b/cc/resources/gpu_rasterizer.h |
index 8c75f326d0d22ffd5e1b7cf8e5b686ec613d854d..69a200f5ad17cdd332700a3a7a75ed4ad55be27f 100644 |
--- a/cc/resources/gpu_rasterizer.h |
+++ b/cc/resources/gpu_rasterizer.h |
@@ -8,7 +8,6 @@ |
#include <vector> |
#include "cc/base/cc_export.h" |
-#include "cc/resources/rasterizer.h" |
#include "cc/resources/resource_pool.h" |
#include "cc/resources/tile.h" |
#include "third_party/skia/include/core/SkMultiPictureDraw.h" |
@@ -18,27 +17,11 @@ namespace cc { |
class ContextProvider; |
class ResourceProvider; |
-class CC_EXPORT GpuRasterizer : public Rasterizer { |
+class CC_EXPORT GpuRasterizer { |
public: |
- ~GpuRasterizer() override; |
+ ~GpuRasterizer(); |
- static scoped_ptr<GpuRasterizer> Create( |
- ContextProvider* context_provider, |
- ResourceProvider* resource_provider, |
- bool use_distance_field_text, |
- bool threaded_gpu_rasterization_enabled, |
- int msaa_sample_count); |
- |
- // Overriden from Rasterizer. |
- PrepareTilesMode GetPrepareTilesMode() override; |
- void RasterizeTiles( |
- const TileVector& tiles, |
- ResourcePool* resource_pool, |
- ResourceFormat resource_format, |
- const UpdateTileDrawInfoCallback& update_tile_draw_info) override; |
- |
- void RasterizeSource(bool use_worker_context, |
- ResourceProvider::ScopedWriteLockGr* write_lock, |
+ void RasterizeSource(ResourceProvider::ScopedWriteLockGr* write_lock, |
const RasterSource* raster_source, |
const gfx::Rect& rect, |
float scale); |
@@ -49,26 +32,14 @@ class CC_EXPORT GpuRasterizer : public Rasterizer { |
GpuRasterizer(ContextProvider* context_provider, |
ResourceProvider* resource_provider, |
bool use_distance_filed_text, |
- bool threaded_gpu_rasterization_enabled, |
int msaa_sample_count); |
- using ScopedResourceWriteLocks = |
- ScopedPtrVector<ResourceProvider::ScopedWriteLockGr>; |
- |
- ContextProvider* GetContextProvider(bool worker_context); |
- void PerformSolidColorAnalysis(const Tile* tile, |
- RasterSource::SolidColorAnalysis* analysis); |
- void AddToMultiPictureDraw(const Tile* tile, |
- const ScopedResource* resource, |
- ScopedResourceWriteLocks* locks); |
- |
ResourceProvider* resource_provider_; |
- SkMultiPictureDraw multi_picture_draw_; |
bool use_distance_field_text_; |
- bool threaded_gpu_rasterization_enabled_; |
int msaa_sample_count_; |
+ friend class GpuTileTaskWorkerPool; |
DISALLOW_COPY_AND_ASSIGN(GpuRasterizer); |
}; |