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

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

Index: webkit/port/platform/graphics/skia/public/PlatformCanvasWin.h
===================================================================
--- webkit/port/platform/graphics/skia/public/PlatformCanvasWin.h	(revision 0)
+++ webkit/port/platform/graphics/skia/public/PlatformCanvasWin.h	(working copy)
@@ -2,10 +2,12 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef BASE_GFX_PLATFORM_CANVAS_WIN_H_
-#define BASE_GFX_PLATFORM_CANVAS_WIN_H_
+#ifndef PlatformCanvasWin_h
+#define PlatformCanvasWin_h
 
-#include "base/gfx/platform_device_win.h"
+#include <windows.h>
+
+#include "PlatformDeviceWin.h"
 #include "base/basictypes.h"
 
 #include "SkCanvas.h"
@@ -72,7 +74,9 @@
   // Unimplemented.
   virtual SkDevice* setBitmapDevice(const SkBitmap& bitmap);
 
-  DISALLOW_COPY_AND_ASSIGN(PlatformCanvasWin);
+  // Disallow copy and assign.
+  PlatformCanvasWin(const PlatformCanvasWin&);
+  PlatformCanvasWin& operator=(const PlatformCanvasWin&);
 };
 
 // A class designed to help with WM_PAINT operations on Windows. It will
@@ -185,12 +189,14 @@
   // If true, this canvas was created for a BeginPaint.
   const bool for_paint_;
 
-  DISALLOW_COPY_AND_ASSIGN(CanvasPaintT);
+  // Disallow copy and assign.
+  CanvasPaintT(const CanvasPaintT&);
+  CanvasPaintT& operator=(const CanvasPaintT&);
 };
 
 typedef CanvasPaintT<PlatformCanvasWin> PlatformCanvasWinPaint;
 
 }  // namespace gfx
 
-#endif  // BASE_GFX_PLATFORM_CANVAS_WIN_H_
+#endif  // PlatformCanvasWin_h
 
Property changes on: webkit\port\platform\graphics\skia\public\PlatformCanvasWin.h
___________________________________________________________________
Added: svn:mergeinfo
   Merged /branches/chrome_webkit_merge_branch/base/gfx/platform_canvas_win.h:r69-2775