Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(616)

Unified Diff: webkit/port/platform/graphics/skia/public/BitmapPlatformDevice.h

Issue 11244: Move PlatformCanvas and PlatformDevice from base/gfx to webkit/port. I left h... (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: '' Created 12 years, 1 month ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: webkit/port/platform/graphics/skia/public/BitmapPlatformDevice.h
===================================================================
--- webkit/port/platform/graphics/skia/public/BitmapPlatformDevice.h (revision 0)
+++ webkit/port/platform/graphics/skia/public/BitmapPlatformDevice.h (working copy)
@@ -6,22 +6,25 @@
// that can be used by upper-level classes that just need to pass a reference
// around.
-#if defined(OS_WIN)
-#include "base/gfx/bitmap_platform_device_win.h"
-#elif defined(OS_MACOSX)
-#include "base/gfx/bitmap_platform_device_mac.h"
-#elif defined(OS_LINUX)
-#include "base/gfx/bitmap_platform_device_linux.h"
-#endif
+#if defined(WIN32)
+#include "BitmapPlatformDeviceWin.h"
+namespace gfx {
+typedef BitmapPlatformDeviceWin BitmapPlatformDevice;
+
+} // namespace gfx
+#elif defined(__APPLE__)
+#include "BitmapPlatformDeviceMac.h"
namespace gfx {
-#if defined(OS_WIN)
-typedef BitmapPlatformDeviceWin BitmapPlatformDevice;
-#elif defined(OS_MACOSX)
typedef BitmapPlatformDeviceMac BitmapPlatformDevice;
-#elif defined(OS_LINUX)
+
+} // namespace gfx
+#elif defined(__linux__)
+#include "BitmapPlatformDeviceLinux.h"
+namespace gfx {
+
typedef BitmapPlatformDeviceLinux BitmapPlatformDevice;
-#endif
-}
+} // namespace gfx
+#endif
Property changes on: webkit\port\platform\graphics\skia\public\BitmapPlatformDevice.h
___________________________________________________________________
Added: svn:mergeinfo
Merged /branches/chrome_webkit_merge_branch/base/gfx/bitmap_platform_device.h:r69-2775
« no previous file with comments | « webkit/build/port/port.vcproj ('k') | webkit/port/platform/graphics/skia/public/BitmapPlatformDeviceLinux.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698