| Index: cc/resource_provider.h
|
| diff --git a/cc/resource_provider.h b/cc/resource_provider.h
|
| index ead62a375e82b647bd79ba792e5150463bfeed3a..ed2370e254d18f6501912fcbf1d4799231bfae3a 100644
|
| --- a/cc/resource_provider.h
|
| +++ b/cc/resource_provider.h
|
| @@ -24,6 +24,8 @@
|
| #include "third_party/skia/include/core/SkCanvas.h"
|
| #include "ui/gfx/size.h"
|
|
|
| +class GrContext;
|
| +
|
| namespace WebKit {
|
| class WebGraphicsContext3D;
|
| }
|
| @@ -35,6 +37,7 @@ class Vector2d;
|
|
|
| namespace cc {
|
|
|
| +class GaneshResourceProvider;
|
| class TextureUploader;
|
|
|
| // This class is not thread-safe and can only be called from the thread it was
|
| @@ -261,6 +264,9 @@ public:
|
| // Indicates if we can currently lock this resource for write.
|
| bool canLockForWrite(ResourceId);
|
|
|
| + GaneshResourceProvider* ganeshResourceProvider() { return m_ganeshResourceProvider.get(); }
|
| + void setGaneshContexts(WebKit::WebGraphicsContext3D* context3d, GrContext* grContext);
|
| +
|
| private:
|
| struct Resource {
|
| Resource();
|
| @@ -332,6 +338,8 @@ private:
|
| int m_maxTextureSize;
|
| GLenum m_bestTextureFormat;
|
|
|
| + scoped_ptr<GaneshResourceProvider> m_ganeshResourceProvider;
|
| +
|
| base::ThreadChecker m_threadChecker;
|
|
|
| scoped_refptr<Fence> m_currentReadLockFence;
|
|
|