| Index: Source/platform/graphics/ImageBuffer.h
|
| diff --git a/Source/platform/graphics/ImageBuffer.h b/Source/platform/graphics/ImageBuffer.h
|
| index 6638122cde8ea6065c296799ea1bef9188315b55..f52516a4c97c6fd81d9b7c794c827ad93b11747d 100644
|
| --- a/Source/platform/graphics/ImageBuffer.h
|
| +++ b/Source/platform/graphics/ImageBuffer.h
|
| @@ -46,10 +46,6 @@
|
| class SkCanvas;
|
|
|
| namespace blink {
|
| -class WebGraphicsContext3D;
|
| -}
|
| -
|
| -namespace blink {
|
|
|
| class DrawingBuffer;
|
| class GraphicsContext;
|
| @@ -57,6 +53,7 @@ class Image;
|
| class ImageBufferClient;
|
| class IntPoint;
|
| class IntRect;
|
| +class WebGraphicsContext3D;
|
|
|
| enum Multiply {
|
| Premultiplied,
|
| @@ -112,13 +109,13 @@ public:
|
| String toDataURL(const String& mimeType, const double* quality = 0) const;
|
| AffineTransform baseTransform() const { return AffineTransform(); }
|
| void transformColorSpace(ColorSpace srcColorSpace, ColorSpace dstColorSpace);
|
| - blink::WebLayer* platformLayer() const;
|
| + WebLayer* platformLayer() const;
|
|
|
| // FIXME: current implementations of this method have the restriction that they only work
|
| // with textures that are RGB or RGBA format, UNSIGNED_BYTE type and level 0, as specified in
|
| // Extensions3D::canUseCopyTextureCHROMIUM().
|
| // Destroys the TEXTURE_2D binding for the active texture unit of the passed context
|
| - bool copyToPlatformTexture(blink::WebGraphicsContext3D*, Platform3DObject, GLenum, GLenum, GLint, bool, bool);
|
| + bool copyToPlatformTexture(WebGraphicsContext3D*, Platform3DObject, GLenum, GLenum, GLint, bool, bool);
|
|
|
| Platform3DObject getBackingTexture();
|
|
|
| @@ -132,7 +129,7 @@ private:
|
| ImageBuffer(PassOwnPtr<ImageBufferSurface>);
|
|
|
| void draw(GraphicsContext*, const FloatRect&, const FloatRect* = 0, CompositeOperator = CompositeSourceOver, WebBlendMode = WebBlendModeNormal);
|
| - void drawPattern(GraphicsContext*, const FloatRect&, const FloatSize&, const FloatPoint&, CompositeOperator, const FloatRect&, blink::WebBlendMode, const IntSize& repeatSpacing = IntSize());
|
| + void drawPattern(GraphicsContext*, const FloatRect&, const FloatSize&, const FloatPoint&, CompositeOperator, const FloatRect&, WebBlendMode, const IntSize& repeatSpacing = IntSize());
|
| static PassRefPtr<SkColorFilter> createColorSpaceFilter(ColorSpace srcColorSpace, ColorSpace dstColorSpace);
|
|
|
| friend class GraphicsContext;
|
|
|