| Index: cc/texture_uploader.h
|
| diff --git a/cc/texture_uploader.h b/cc/texture_uploader.h
|
| index 950fb8262ae191dd4a5c9d0fc273bd3a534a6e32..2ef6f3ea52bb0309e4ed129c802787590e8e849e 100644
|
| --- a/cc/texture_uploader.h
|
| +++ b/cc/texture_uploader.h
|
| @@ -12,8 +12,8 @@ class SkPicture;
|
|
|
| namespace cc {
|
|
|
| -class CCPrioritizedTexture;
|
| -class CCResourceProvider;
|
| +class PrioritizedTexture;
|
| +class ResourceProvider;
|
|
|
| class TextureUploader {
|
| public:
|
| @@ -23,7 +23,7 @@ public:
|
| IntSize destOffset;
|
| };
|
| struct Parameters {
|
| - CCPrioritizedTexture* texture;
|
| + PrioritizedTexture* texture;
|
| const SkBitmap* bitmap;
|
| SkPicture* picture;
|
| Geometry geometry;
|
| @@ -36,7 +36,7 @@ public:
|
|
|
| // Returns our throughput on the GPU process
|
| virtual double estimatedTexturesPerSecond() = 0;
|
| - virtual void uploadTexture(CCResourceProvider*, Parameters) = 0;
|
| + virtual void uploadTexture(ResourceProvider*, Parameters) = 0;
|
| };
|
|
|
| }
|
|
|