| Index: cc/resource_provider.h
|
| diff --git a/cc/resource_provider.h b/cc/resource_provider.h
|
| index c4776c21f9f6a89b0023abcaf1fd582786f87cb2..a07771693fa310976ec3f6d01e5a2de3be2bbaf6 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
|
| @@ -241,6 +244,9 @@ public:
|
| // Use setPixels or lockForWrite to allocate implicitly.
|
| void allocateForTesting(ResourceId id);
|
|
|
| + GaneshResourceProvider* ganeshResourceProvider() { return m_ganeshResourceProvider.get(); }
|
| + void setGaneshContexts(WebKit::WebGraphicsContext3D* context3d, GrContext* grContext);
|
| +
|
| private:
|
| struct Resource {
|
| Resource();
|
| @@ -307,6 +313,8 @@ private:
|
| int m_maxTextureSize;
|
| GLenum m_bestTextureFormat;
|
|
|
| + scoped_ptr<GaneshResourceProvider> m_ganeshResourceProvider;
|
| +
|
| base::ThreadChecker m_threadChecker;
|
|
|
| DISALLOW_COPY_AND_ASSIGN(ResourceProvider);
|
|
|