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

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

Index: webkit/port/platform/graphics/skia/public/PlatformCanvasMac.h
===================================================================
--- webkit/port/platform/graphics/skia/public/PlatformCanvasMac.h	(revision 0)
+++ webkit/port/platform/graphics/skia/public/PlatformCanvasMac.h	(working copy)
@@ -2,13 +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_MAC_H__
-#define BASE_GFX_PLATFORM_CANVAS_MAC_H__
+#ifndef PlatformCanvasMac_h
+#define PlatformCanvasMac_h
 
-#include "base/gfx/platform_device_mac.h"
-#include "base/basictypes.h"
+#include "PlatformDeviceMac.h"
 
-#import "SkCanvas.h"
+#include "SkCanvas.h"
 
 namespace gfx {
 
@@ -45,7 +44,7 @@
   // If there is no layer that is not all clipped out, this will return a
   // dummy device so callers do not have to check. If you are concerned about
   // performance, check the clip before doing any painting.
-  //  
+  //
   // This is different than SkCanvas' getDevice, because that returns the
   // bottommost device.
   //
@@ -78,10 +77,12 @@
   // CoreGraphics.
   SkDevice* setBitmapDevice(const SkBitmap& bitmap);
 
-  DISALLOW_COPY_AND_ASSIGN(PlatformCanvasMac);
+  // Disallow copy and assign.
+  PlatformCanvasMac(const PlatformCanvasMac&);
+  PlatformCanvasMac& operator=(const PlatformCanvasMac&);
 };
 
 }  // namespace gfx
 
-#endif  // BASE_GFX_PLATFORM_CANVAS_MAC_H__
+#endif  // PlatformCanvasMac_h
 
Property changes on: webkit\port\platform\graphics\skia\public\PlatformCanvasMac.h
___________________________________________________________________
Added: svn:mergeinfo
   Merged /branches/chrome_webkit_merge_branch/base/gfx/platform_canvas_mac.h:r69-2775