| Index: cc/resource_provider.h
|
| diff --git a/cc/resource_provider.h b/cc/resource_provider.h
|
| index 437f1b9c4dbf60201fd03956102d32ec5d077f8a..c52fe81726361635c5add4c81883a8e10dbad570 100644
|
| --- a/cc/resource_provider.h
|
| +++ b/cc/resource_provider.h
|
| @@ -10,6 +10,7 @@
|
| #include "base/hash_tables.h"
|
| #include "base/memory/scoped_ptr.h"
|
| #include "cc/graphics_context.h"
|
| +#include "cc/proxy.h"
|
| #include "cc/texture_copier.h"
|
| #include "third_party/khronos/GLES2/gl2.h"
|
| #include "third_party/skia/include/core/SkBitmap.h"
|
| @@ -58,11 +59,12 @@ public:
|
| unsigned syncPoint;
|
| };
|
|
|
| - static scoped_ptr<CCResourceProvider> create(CCGraphicsContext*);
|
| + static scoped_ptr<CCResourceProvider> create(CCGraphicsContext*, CCProxy*);
|
|
|
| virtual ~CCResourceProvider();
|
|
|
| WebKit::WebGraphicsContext3D* graphicsContext3D();
|
| + CCProxy* proxy() { return m_proxy; }
|
| TextureCopier* textureCopier() const { return m_textureCopier.get(); }
|
| int maxTextureSize() const { return m_maxTextureSize; }
|
| unsigned numResources() const { return m_resources.size(); }
|
| @@ -240,7 +242,7 @@ private:
|
| };
|
| typedef base::hash_map<int, Child> ChildMap;
|
|
|
| - explicit CCResourceProvider(CCGraphicsContext*);
|
| + CCResourceProvider(CCGraphicsContext*, CCProxy*);
|
| bool initialize();
|
|
|
| const Resource* lockForRead(ResourceId);
|
| @@ -254,6 +256,7 @@ private:
|
| void deleteResourceInternal(ResourceMap::iterator it);
|
|
|
| CCGraphicsContext* m_context;
|
| + CCProxy* m_proxy;
|
| ResourceId m_nextId;
|
| ResourceMap m_resources;
|
| int m_nextChild;
|
|
|