| Index: webkit/api/public/WebCanvas.h
|
| diff --git a/webkit/api/public/WebCanvas.h b/webkit/api/public/WebCanvas.h
|
| index 1eae3a0cfbb2fb3275415b8517bc377bfc360966..0cd5d0887b24140bbe7e29fcf46ad4c43b4b0baa 100644
|
| --- a/webkit/api/public/WebCanvas.h
|
| +++ b/webkit/api/public/WebCanvas.h
|
| @@ -33,27 +33,16 @@
|
|
|
| #include "WebCommon.h"
|
|
|
| -// FIXME: PlatformCanvas should not be a typedef
|
| -#if WEBKIT_USING_SKIA
|
| +#if WEBKIT_USING_SKIA && (defined(WIN32) || defined(__linux__))
|
| +
|
| namespace skia {
|
| -#if defined(WIN32)
|
| - class PlatformCanvasWin;
|
| -#elif defined(__linux__)
|
| - class PlatformCanvasLinux;
|
| -#endif
|
| + class PlatformCanvas;
|
| }
|
| -#endif
|
|
|
| namespace WebKit {
|
| + typedef skia::PlatformCanvas WebCanvas;
|
| +}
|
|
|
| -#if WEBKIT_USING_SKIA
|
| -#if defined(WIN32)
|
| - typedef skia::PlatformCanvasWin WebCanvas;
|
| -#elif defined(__linux__)
|
| - typedef skia::PlatformCanvasLinux WebCanvas;
|
| -#endif
|
| #endif
|
|
|
| -} // namespace WebKit
|
| -
|
| #endif
|
|
|