Move PlatformCanvas and PlatformDevice from base/gfx to webkit/port. I left h...

webkit/port/platform/graphics/skia/public/PlatformCanvasWin.cpp

Index: webkit/port/platform/graphics/skia/public/PlatformCanvasWin.cpp
===================================================================
--- webkit/port/platform/graphics/skia/public/PlatformCanvasWin.cpp	(revision 0)
+++ webkit/port/platform/graphics/skia/public/PlatformCanvasWin.cpp	(working copy)
@@ -2,17 +2,13 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "base/gfx/platform_canvas_win.h"
+#include "PlatformCanvasWin.h"
 
-#include "base/gfx/bitmap_platform_device_win.h"
+#include "BitmapPlatformDeviceWin.h"
+
 #include "base/logging.h"
 #include "base/process_util.h"
 
-#ifdef ARCH_CPU_64_BITS
-#error This code does not work on x64. Please make sure all the base unit tests\
- pass before doing any real work.
-#endif
-
 namespace gfx {
 
 // Crashes the process. This is called when a bitmap allocation fails, and this
@@ -49,17 +45,17 @@
 PlatformCanvasWin::PlatformCanvasWin(int width, int height, bool is_opaque)
     : SkCanvas() {
   bool initialized = initialize(width, height, is_opaque, NULL);
-  if (!initialized) 
+  if (!initialized)
     CrashForBitmapAllocationFailure(width, height);
 }
 
 PlatformCanvasWin::PlatformCanvasWin(int width,
-                               int height,
-                               bool is_opaque,
-                               HANDLE shared_section)
+                                     int height,
+                                     bool is_opaque,
+                                     HANDLE shared_section)
     : SkCanvas() {
   bool initialized = initialize(width, height, is_opaque, shared_section);
-  if (!initialized) 
+  if (!initialized)
     CrashForBitmapAllocationFailure(width, height);
 }
 
@@ -96,17 +92,17 @@
 }
 
 SkDevice* PlatformCanvasWin::createDevice(SkBitmap::Config config,
-                                       int width,
-                                       int height,
-                                       bool is_opaque, bool isForLayer) {
+                                          int width,
+                                          int height,
+                                          bool is_opaque, bool isForLayer) {
   DCHECK(config == SkBitmap::kARGB_8888_Config);
   return createPlatformDevice(width, height, is_opaque, NULL);
 }
 
 SkDevice* PlatformCanvasWin::createPlatformDevice(int width,
-                                               int height,
-                                               bool is_opaque,
-                                               HANDLE shared_section) {
+                                                  int height,
+                                                  bool is_opaque,
+                                                  HANDLE shared_section) {
   HDC screen_dc = GetDC(NULL);
   SkDevice* device = BitmapPlatformDeviceWin::create(screen_dc, width, height,
                                                   is_opaque, shared_section);
Property changes on: webkit\port\platform\graphics\skia\public\PlatformCanvasWin.cpp
___________________________________________________________________
Added: svn:mergeinfo
   Merged /branches/chrome_webkit_merge_branch/base/gfx/platform_canvas_win.cc:r69-2775