diff options
| author | Ben Murdoch <benm@google.com> | 2011-06-02 12:07:03 +0100 |
|---|---|---|
| committer | Ben Murdoch <benm@google.com> | 2011-06-10 10:47:21 +0100 |
| commit | 2daae5fd11344eaa88a0d92b0f6d65f8d2255c00 (patch) | |
| tree | e4964fbd1cb70599f7718ff03e50ea1dab33890b /Source/WebCore/platform/graphics/ImageBuffer.h | |
| parent | 87bdf0060a247bfbe668342b87e0874182e0ffa9 (diff) | |
| download | external_webkit-2daae5fd11344eaa88a0d92b0f6d65f8d2255c00.zip external_webkit-2daae5fd11344eaa88a0d92b0f6d65f8d2255c00.tar.gz external_webkit-2daae5fd11344eaa88a0d92b0f6d65f8d2255c00.tar.bz2 | |
Merge WebKit at r84325: Initial merge by git.
Change-Id: Ic1a909300ecc0a13ddc6b4e784371d2ac6e3d59b
Diffstat (limited to 'Source/WebCore/platform/graphics/ImageBuffer.h')
| -rw-r--r-- | Source/WebCore/platform/graphics/ImageBuffer.h | 11 |
1 files changed, 4 insertions, 7 deletions
diff --git a/Source/WebCore/platform/graphics/ImageBuffer.h b/Source/WebCore/platform/graphics/ImageBuffer.h index 860f574..c184bbe 100644 --- a/Source/WebCore/platform/graphics/ImageBuffer.h +++ b/Source/WebCore/platform/graphics/ImageBuffer.h @@ -41,10 +41,6 @@ #include <wtf/PassRefPtr.h> #include <wtf/Vector.h> -#if (PLATFORM(MAC) && PLATFORM(CA) && !defined(BUILDING_ON_TIGER) && !defined(BUILDING_ON_LEOPARD) && !defined(BUILDING_ON_SNOW_LEOPARD)) -#define WTF_USE_IOSURFACE_CANVAS_BACKING_STORE 1 -#endif - namespace WebCore { class GraphicsContext; @@ -86,6 +82,7 @@ namespace WebCore { GraphicsContext* context() const; + bool isAccelerated() const { return m_accelerateRendering; } bool drawsUsingCopy() const; // If the image buffer has to render using a copied image, it will return true. PassRefPtr<Image> copyImage() const; // Return a new image that is a copy of the buffer. @@ -96,7 +93,7 @@ namespace WebCore { void putPremultipliedImageData(ByteArray*, const IntSize& sourceSize, const IntRect& sourceRect, const IntPoint& destPoint); String toDataURL(const String& mimeType, const double* quality = 0) const; -#if !PLATFORM(CG) +#if !USE(CG) AffineTransform baseTransform() const { return AffineTransform(); } void transformColorSpace(ColorSpace srcColorSpace, ColorSpace dstColorSpace); void platformTransformColorSpace(const Vector<int>&); @@ -122,7 +119,7 @@ namespace WebCore { bool m_accelerateRendering; OwnPtr<GraphicsContext> m_context; -#if !PLATFORM(CG) +#if !USE(CG) Vector<int> m_linearRgbLUT; Vector<int> m_deviceRgbLUT; #endif @@ -132,7 +129,7 @@ namespace WebCore { ImageBuffer(const IntSize&, ColorSpace colorSpace, RenderingMode renderingMode, bool& success); }; -#if PLATFORM(CG) || USE(SKIA) +#if USE(CG) || USE(SKIA) String ImageDataToDataURL(const ImageData& input, const String& mimeType, const double* quality); #endif |