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

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

 // Copyright (c) 2006-2008 The Chromium Authors. All rights reserved.
 // 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"
 
 namespace gfx {
 
 // This class is a specialization of the regular SkCanvas that is designed to
 // work with a gfx::PlatformDevice to manage platform-specific drawing. It
 // allows using both Skia operations and platform-specific operations.
 class PlatformCanvasWin : public SkCanvas {
@@ skipping 46 matching lines @@
 
   // Creates a device store for use by the canvas. By default, it creates a
   // BitmapPlatformDeviceWin. Can be overridden to change the object type.
   virtual SkDevice* createPlatformDevice(int width, int height, bool is_opaque,
                                          HANDLE shared_section);
 
  private:
   // 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
 // do BeginPaint/EndPaint on init/destruction, and will create the bitmap and
 // canvas with the correct size and transform for the dirty rect. The bitmap
 // will be automatically painted to the screen on destruction.
 //
 // You MUST call isEmpty before painting to determine if anything needs
 // painting. Sometimes the dirty rect can actually be empty, and this makes
 // the bitmap functions we call unhappy. The caller should not paint in this
@@ skipping 92 matching lines @@
 
     // This will bring the canvas into the screen coordinate system for the
     // dirty rect
     translate(SkIntToScalar(-ps_.rcPaint.left),
               SkIntToScalar(-ps_.rcPaint.top));
   }
 
   // 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