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/WebKit/chromium/public/WebCanvas.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/WebKit/chromium/public/WebCanvas.h')
| -rw-r--r-- | Source/WebKit/chromium/public/WebCanvas.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/Source/WebKit/chromium/public/WebCanvas.h b/Source/WebKit/chromium/public/WebCanvas.h index 4675487..4cf729e 100644 --- a/Source/WebKit/chromium/public/WebCanvas.h +++ b/Source/WebKit/chromium/public/WebCanvas.h @@ -34,7 +34,7 @@ #include "WebCommon.h" #if WEBKIT_USING_SKIA -namespace skia { class PlatformCanvas; } +class SkCanvas; #elif WEBKIT_USING_CG struct CGContext; #endif @@ -42,7 +42,7 @@ struct CGContext; namespace WebKit { #if WEBKIT_USING_SKIA -typedef skia::PlatformCanvas WebCanvas; +typedef SkCanvas WebCanvas; #elif WEBKIT_USING_CG typedef struct CGContext WebCanvas; #else |