diff options
Diffstat (limited to 'Source/WebCore/platform/graphics/chromium/PlatformCanvas.h')
| -rw-r--r-- | Source/WebCore/platform/graphics/chromium/PlatformCanvas.h | 14 |
1 files changed, 8 insertions, 6 deletions
diff --git a/Source/WebCore/platform/graphics/chromium/PlatformCanvas.h b/Source/WebCore/platform/graphics/chromium/PlatformCanvas.h index 262fdd0..b002d26 100644 --- a/Source/WebCore/platform/graphics/chromium/PlatformCanvas.h +++ b/Source/WebCore/platform/graphics/chromium/PlatformCanvas.h @@ -31,7 +31,7 @@ #include <wtf/Noncopyable.h> #include <wtf/OwnPtr.h> -#if PLATFORM(CG) +#if USE(CG) #include <CoreGraphics/CGColorSpace.h> #include <CoreGraphics/CGContext.h> #include <wtf/OwnArrayPtr.h> @@ -39,8 +39,8 @@ #endif #if USE(SKIA) -namespace skia { class PlatformCanvas; } class SkBitmap; +class SkCanvas; #endif namespace WebCore { @@ -78,7 +78,9 @@ public: class Painter { WTF_MAKE_NONCOPYABLE(Painter); public: - explicit Painter(PlatformCanvas*); + enum TextOption { GrayscaleText, SubpixelText }; + + Painter(PlatformCanvas*, TextOption); ~Painter(); GraphicsContext* context() const { return m_context.get(); } @@ -86,7 +88,7 @@ public: OwnPtr<GraphicsContext> m_context; #if USE(SKIA) OwnPtr<PlatformContextSkia> m_skiaContext; -#elif PLATFORM(CG) +#elif USE(CG) RetainPtr<CGColorSpaceRef> m_colorSpace; RetainPtr<CGContextRef> m_contextCG; #endif @@ -97,8 +99,8 @@ public: private: #if USE(SKIA) - OwnPtr<skia::PlatformCanvas> m_skiaCanvas; -#elif PLATFORM(CG) + OwnPtr<SkCanvas> m_skiaCanvas; +#elif USE(CG) OwnArrayPtr<uint8_t> m_pixelData; #endif IntSize m_size; |