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

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

Index: webkit/port/platform/graphics/skia/public/PlatformDevice.h
===================================================================
--- webkit/port/platform/graphics/skia/public/PlatformDevice.h	(revision 0)
+++ webkit/port/platform/graphics/skia/public/PlatformDevice.h	(working copy)
@@ -6,22 +6,22 @@
 // that can be used by upper-level classes that just need to pass a reference
 // around.
 
-#if defined(OS_WIN)
-#include "base/gfx/platform_device_win.h"
-#elif defined(OS_MACOSX)
-#include "base/gfx/platform_device_mac.h"
-#elif defined(OS_LINUX)
-#include "base/gfx/platform_device_linux.h"
+#if defined(WIN32)
+#include "PlatformDeviceWin.h"
+#elif defined(__APPLE__)
+#include "PlatformDeviceMac.h"
+#elif defined(__linux__)
+#include "PlatformDeviceLinux.h"
 #endif
 
 namespace gfx {
-  
-#if defined(OS_WIN)
+
+#if defined(WIN32)
 typedef PlatformDeviceWin PlatformDevice;
-#elif defined(OS_MACOSX)
+#elif defined(__APPLE__)
 typedef PlatformDeviceMac PlatformDevice;
-#elif defined(OS_LINUX)
+#elif defined(__linux__)
 typedef PlatformDeviceLinux PlatformDevice;
 #endif
-  
+
 }  // namespace gfx
Property changes on: webkit\port\platform\graphics\skia\public\PlatformDevice.h
___________________________________________________________________
Added: svn:mergeinfo
   Merged /branches/chrome_webkit_merge_branch/base/gfx/platform_device.h:r69-2775