| Index: cc/texture_uploader.h
|
| diff --git a/cc/texture_uploader.h b/cc/texture_uploader.h
|
| index 5505204a689060ee6a90fe78a15ba7e3a63a5ca2..950fb8262ae191dd4a5c9d0fc273bd3a534a6e32 100644
|
| --- a/cc/texture_uploader.h
|
| +++ b/cc/texture_uploader.h
|
| @@ -5,17 +5,29 @@
|
| #ifndef TextureUploader_h
|
| #define TextureUploader_h
|
|
|
| -#include "LayerTextureUpdater.h"
|
| +#include "IntRect.h"
|
| +
|
| +class SkBitmap;
|
| +class SkPicture;
|
|
|
| namespace cc {
|
|
|
| +class CCPrioritizedTexture;
|
| +class CCResourceProvider;
|
| +
|
| class TextureUploader {
|
| public:
|
| - struct Parameters {
|
| - LayerTextureUpdater::Texture* texture;
|
| + struct Geometry {
|
| + IntRect contentRect;
|
| IntRect sourceRect;
|
| IntSize destOffset;
|
| };
|
| + struct Parameters {
|
| + CCPrioritizedTexture* texture;
|
| + const SkBitmap* bitmap;
|
| + SkPicture* picture;
|
| + Geometry geometry;
|
| + };
|
|
|
| virtual ~TextureUploader() { }
|
|
|
|
|