Refactor the PlatformContext layer to have only one class.

webkit/api/public/WebCanvas.h

 /*
  * Copyright (C) 2009 Google Inc. All rights reserved.
  * 
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are
  * met:
  * 
  *     * Redistributions of source code must retain the above copyright
  * notice, this list of conditions and the following disclaimer.
  *     * Redistributions in binary form must reproduce the above
@@ skipping 15 matching lines @@
  * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
 #ifndef WebCanvas_h
 #define WebCanvas_h
 
 #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;
 }
+
+namespace WebKit {
+    typedef skia::PlatformCanvas WebCanvas;
+}
+
 #endif
 
-namespace WebKit {
-
-#if WEBKIT_USING_SKIA
-#if defined(WIN32)
-    typedef skia::PlatformCanvasWin WebCanvas;
-#elif defined(__linux__)
-    typedef skia::PlatformCanvasLinux WebCanvas;
 #endif
-#endif
-
-} // namespace WebKit
-
-#endif