diff options
| author | Steve Block <steveblock@google.com> | 2011-05-25 19:08:45 +0100 |
|---|---|---|
| committer | Steve Block <steveblock@google.com> | 2011-06-08 13:51:31 +0100 |
| commit | 2bde8e466a4451c7319e3a072d118917957d6554 (patch) | |
| tree | 28f4a1b869a513e565c7760d0e6a06e7cf1fe95a /Source/WebCore/platform/graphics/GraphicsContext.h | |
| parent | 6939c99b71d9372d14a0c74a772108052e8c48c8 (diff) | |
| download | external_webkit-2bde8e466a4451c7319e3a072d118917957d6554.zip external_webkit-2bde8e466a4451c7319e3a072d118917957d6554.tar.gz external_webkit-2bde8e466a4451c7319e3a072d118917957d6554.tar.bz2 | |
Merge WebKit at r82507: Initial merge by git
Change-Id: I60ce9d780725b58b45e54165733a8ffee23b683e
Diffstat (limited to 'Source/WebCore/platform/graphics/GraphicsContext.h')
| -rw-r--r-- | Source/WebCore/platform/graphics/GraphicsContext.h | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/Source/WebCore/platform/graphics/GraphicsContext.h b/Source/WebCore/platform/graphics/GraphicsContext.h index 5eafa16..c555a5f 100644 --- a/Source/WebCore/platform/graphics/GraphicsContext.h +++ b/Source/WebCore/platform/graphics/GraphicsContext.h @@ -42,8 +42,9 @@ typedef struct CGContext PlatformGraphicsContext; #elif PLATFORM(CAIRO) namespace WebCore { class ContextShadow; +class PlatformContextCairo; } -typedef struct _cairo PlatformGraphicsContext; +typedef WebCore::PlatformContextCairo PlatformGraphicsContext; #elif PLATFORM(OPENVG) namespace WebCore { class SurfaceOpenVG; @@ -279,6 +280,9 @@ namespace WebCore { void setIsCALayerContext(bool); bool isCALayerContext() const; + + void setIsAcceleratedContext(bool); + bool isAcceleratedContext() const; #endif #if PLATFORM(ANDROID) @@ -522,6 +526,7 @@ namespace WebCore { #endif #if PLATFORM(CAIRO) + GraphicsContext(cairo_t*); void pushImageMask(cairo_surface_t*, const FloatRect&); #endif |