| Index: cc/resources/resource_provider.h
|
| diff --git a/cc/resources/resource_provider.h b/cc/resources/resource_provider.h
|
| index 21207c0b207e36fbd1b809b8c32c81cf3b2e97f2..6e5c61a2bfa72a52c06282de8699cc4cd2a1e8e6 100644
|
| --- a/cc/resources/resource_provider.h
|
| +++ b/cc/resources/resource_provider.h
|
| @@ -31,7 +31,11 @@
|
| #include "third_party/skia/include/core/SkCanvas.h"
|
| #include "ui/gfx/size.h"
|
|
|
| -namespace blink { class WebGraphicsContext3D; }
|
| +namespace gpu {
|
| +namespace gles {
|
| +class GLES2Interface;
|
| +}
|
| +}
|
|
|
| namespace gfx {
|
| class Rect;
|
| @@ -355,7 +359,7 @@ class CC_EXPORT ResourceProvider {
|
| // Indicates if we can currently lock this resource for write.
|
| bool CanLockForWrite(ResourceId id);
|
|
|
| - static GLint GetActiveTextureUnit(blink::WebGraphicsContext3D* context);
|
| + static GLint GetActiveTextureUnit(gpu::gles2::GLES2Interface* gl);
|
|
|
| private:
|
| struct Resource {
|
| @@ -451,7 +455,7 @@ class CC_EXPORT ResourceProvider {
|
| static void PopulateSkBitmapWithResource(SkBitmap* sk_bitmap,
|
| const Resource* resource);
|
|
|
| - void TransferResource(blink::WebGraphicsContext3D* context,
|
| + void TransferResource(gpu::gles2::GLES2Interface* gl,
|
| ResourceId id,
|
| TransferableResource* resource);
|
| enum DeleteStyle {
|
| @@ -474,7 +478,7 @@ class CC_EXPORT ResourceProvider {
|
| GLenum filter);
|
|
|
| // Returns NULL if the output_surface_ does not have a ContextProvider.
|
| - blink::WebGraphicsContext3D* Context3d() const;
|
| + gpu::gles2::GLES2Interface* ContextGL() const;
|
|
|
| OutputSurface* output_surface_;
|
| SharedBitmapManager* shared_bitmap_manager_;
|
|
|