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/WebKit2/Shared/WebGraphicsContext.cpp | |
| 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/WebKit2/Shared/WebGraphicsContext.cpp')
| -rw-r--r-- | Source/WebKit2/Shared/WebGraphicsContext.cpp | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/Source/WebKit2/Shared/WebGraphicsContext.cpp b/Source/WebKit2/Shared/WebGraphicsContext.cpp index 3d319e4..72220b3 100644 --- a/Source/WebKit2/Shared/WebGraphicsContext.cpp +++ b/Source/WebKit2/Shared/WebGraphicsContext.cpp @@ -26,15 +26,19 @@ #include "config.h" #include "WebGraphicsContext.h" +#if PLATFORM(GTK) +#include <WebCore/PlatformContextCairo.h> +#endif + using namespace WebCore; namespace WebKit { WebGraphicsContext::WebGraphicsContext(GraphicsContext* graphicsContext) -#if PLATFORM(CG) +#if USE(CG) : m_platformContext(graphicsContext->platformContext()) #elif PLATFORM(GTK) - : m_platformContext(graphicsContext->platformContext()) + : m_platformContext(graphicsContext->platformContext()->cr()) #endif { } |