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

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

Index: webkit/port/platform/graphics/skia/public/PlatformCanvasLinux.h
===================================================================
--- webkit/port/platform/graphics/skia/public/PlatformCanvasLinux.h	(revision 0)
+++ webkit/port/platform/graphics/skia/public/PlatformCanvasLinux.h	(working copy)
@@ -2,11 +2,10 @@
 // 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_LINUX_H_
-#define BASE_GFX_PLATFORM_CANVAS_LINUX_H_
+#ifndef PlatformCanvasLinux_h
+#define PlatformCanvasLinux_h
 
-#include "base/gfx/platform_device_linux.h"
-#include "base/basictypes.h"
+#include "PlatformCanvasLinux.h"
 
 namespace gfx {
 
@@ -43,9 +42,11 @@
   // BitmapPlatformDevice object. Can be overridden to change the object type.
   virtual SkDevice* createPlatformDevice(int width, int height, bool is_opaque);
 
-  DISALLOW_COPY_AND_ASSIGN(PlatformCanvasLinux);
+  // Disallow copy and assign.
+  PlatformCanvasLinux(const PlatformCanvasLinux&);
+  PlatformCanvasLinux& operator=(const PlatformCanvasLinux&);
 };
 
 }  // namespace gfx
 
-#endif  // BASE_GFX_PLATFORM_CANVAS_MAC_H_
+#endif  // PlatformCanvasLinux_h
Property changes on: webkit\port\platform\graphics\skia\public\PlatformCanvasLinux.h
___________________________________________________________________
Added: svn:mergeinfo
   Merged /branches/chrome_webkit_merge_branch/base/gfx/platform_canvas_linux.h:r69-2775