Index: webkit/port/platform/graphics/skia/public/PlatformCanvas.h |
=================================================================== |
--- webkit/port/platform/graphics/skia/public/PlatformCanvas.h (revision 0) |
+++ webkit/port/platform/graphics/skia/public/PlatformCanvas.h (working copy) |
@@ -6,24 +6,22 @@ |
// that can be used by upper-level classes that just need to pass a reference |
// around. |
-#include "build/build_config.h" |
- |
-#if defined(OS_WIN) |
-#include "base/gfx/platform_canvas_win.h" |
+#if defined(WIN32) |
+#include "PlatformCanvasWin.h" |
namespace gfx { |
typedef PlatformCanvasWin PlatformCanvas; |
} // namespace gfx |
-#elif defined(OS_MACOSX) |
-#include "base/gfx/platform_canvas_mac.h" |
+#elif defined(__APPLE__) |
+#include "PlatformCanvasMac.h" |
namespace gfx { |
typedef PlatformCanvasMac PlatformCanvas; |
} // namespace gfx |
-#elif defined(OS_LINUX) |
-#include "base/gfx/platform_canvas_linux.h" |
+#elif defined(__linux__) |
+#include "PlatformCanvasLinux.h" |
namespace gfx { |
typedef PlatformCanvasLinux PlatformCanvas; |
Property changes on: webkit\port\platform\graphics\skia\public\PlatformCanvas.h |
___________________________________________________________________ |
Added: svn:mergeinfo |
Merged /branches/chrome_webkit_merge_branch/base/gfx/platform_canvas.h:r69-2775 |