Move the platform files form port to skia for Mac only. Hopefully this won't affect other platforms.

Review URL: http://codereview.chromium.org/11357

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@5845 0039d316-1c4b-4281-b951-d872f2087c98

16 files changed, 57 insertions, 48 deletions

diff --git a/base/gfx/bitmap_platform_device_mac.h b/base/gfx/bitmap_platform_device_mac.h
index ff89741..70c2e0e 100755
--- a/base/gfx/bitmap_platform_device_mac.h
+++ b/base/gfx/bitmap_platform_device_mac.h
@@ -7,7 +7,7 @@
 
 // TODO(brettw) this file should be removed and the includes changed to this
 // new location.
-#include "webkit/port/platform/graphics/skia/public/BitmapPlatformDeviceMac.h"
+#include "skia/ext/bitmap_platform_device_mac.h"
 
 #endif  // BASE_GFX_BITMAP_PLATFORM_DEVICE_MAC_H__
 
diff --git a/base/gfx/platform_canvas_mac.h b/base/gfx/platform_canvas_mac.h
index 6ee78e8..def5fc7 100755
--- a/base/gfx/platform_canvas_mac.h
+++ b/base/gfx/platform_canvas_mac.h
@@ -7,7 +7,7 @@
 
 // TODO(brettw) this file should be removed and the includes changed to this
 // new location.
-#include "webkit/port/platform/graphics/skia/public/PlatformCanvasMac.h"
+#include "skia/ext/platform_canvas_mac.h"
 
 #endif  // BASE_GFX_PLATFORM_CANVAS_MAC_H__
 
diff --git a/base/gfx/platform_device_mac.h b/base/gfx/platform_device_mac.h
index f7b1bd0..4a1624c 100755
--- a/base/gfx/platform_device_mac.h
+++ b/base/gfx/platform_device_mac.h
@@ -7,7 +7,7 @@
 
 // TODO(brettw) this file should be removed and the includes changed to this
 // new location.
-#include "webkit/port/platform/graphics/skia/public/PlatformDeviceMac.h"
+#include "skia/ext/platform_device_mac.h"
 
 #endif  // BASE_GFX_PLATFORM_DEVICE_MAC_H__
 
diff --git a/skia/SConscript b/skia/SConscript
index 386a219..95fa1b1 100644
--- a/skia/SConscript
+++ b/skia/SConscript
@@ -167,6 +167,11 @@ if env['PLATFORM'] == 'posix':
 if env['PLATFORM'] in ('darwin', 'posix'):
   input_files.append('ports/SkThread_pthread.cpp')
 
+if env['PLATFORM'] == 'darwin':
+  input_files.append('ext/bitmap_platform_device_mac.cc')
+  input_files.append('ext/platform_canvas_mac.cc')
+  input_files.append('ext/platform_device_mac.cc')
+
 if env['PLATFORM'] == 'win32':
   input_files.append('ports/SkThread_win.cpp')
 
diff --git a/webkit/port/platform/graphics/skia/public/BitmapPlatformDeviceMac.cpp b/skia/ext/bitmap_platform_device_mac.cc
index b52090c..d4458d7 100755
--- a/webkit/port/platform/graphics/skia/public/BitmapPlatformDeviceMac.cpp
+++ b/skia/ext/bitmap_platform_device_mac.cc
@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "config.h"
+#include "skia/ext/bitmap_platform_device_mac.h"
 
 #include <time.h>
 
@@ -10,7 +10,6 @@
 #include "SkRegion.h"
 #include "SkUtils.h"
 
-#include "base/gfx/bitmap_platform_device_mac.h"
 #include "base/gfx/skia_utils_mac.h"
 #include "base/logging.h"
 
diff --git a/webkit/port/platform/graphics/skia/public/BitmapPlatformDeviceMac.h b/skia/ext/bitmap_platform_device_mac.h
index 04383d7..db798eb 100755
--- a/webkit/port/platform/graphics/skia/public/BitmapPlatformDeviceMac.h
+++ b/skia/ext/bitmap_platform_device_mac.h
@@ -2,11 +2,11 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef BitmapPlatformDeviceMac_h
-#define BitmapPlatformDeviceMac_h
+#ifndef SKIA_EXT_BITMAP_PLATFORM_DEVICE_MAC_H_
+#define SKIA_EXT_BITMAP_PLATFORM_DEVICE_MAC_H_
 
-#include "base/gfx/platform_device_mac.h"
 #include "base/ref_counted.h"
+#include "skia/ext/platform_device_mac.h"
 
 namespace gfx {
 
@@ -62,7 +62,7 @@ class BitmapPlatformDeviceMac : public PlatformDeviceMac {
                              const CGRect* src_rect);
   virtual bool IsVectorial() { return false; }
   virtual void fixupAlphaBeforeCompositing() { };
-  
+
   // Returns the color value at the specified location. This does not
   // consider any transforms that may be set on the device.
   SkColor getColorAt(int x, int y);
@@ -91,5 +91,5 @@ class BitmapPlatformDeviceMac : public PlatformDeviceMac {
 
 }  // namespace gfx
 
-#endif  // BitmapPlatformDeviceMac_h
+#endif  // SKIA_EXT_BITMAP_PLATFORM_DEVICE_MAC_H_
 
diff --git a/webkit/port/platform/graphics/skia/public/PlatformCanvasMac.cpp b/skia/ext/platform_canvas_mac.cc
index fc026e8..0bb56f4 100755
--- a/webkit/port/platform/graphics/skia/public/PlatformCanvasMac.cpp
+++ b/skia/ext/platform_canvas_mac.cc
@@ -2,12 +2,10 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "config.h"
+#include "skia/ext/platform_canvas_mac.h"
 
-#include "PlatformCanvasMac.h"
-
-#include "base/gfx/bitmap_platform_device_mac.h"
 #include "base/logging.h"
+#include "skia/ext/bitmap_platform_device_mac.h"
 
 namespace gfx {
 
diff --git a/webkit/port/platform/graphics/skia/public/PlatformCanvasMac.h b/skia/ext/platform_canvas_mac.h
index 8a39637..3f43fb2 100755
--- a/webkit/port/platform/graphics/skia/public/PlatformCanvasMac.h
+++ b/skia/ext/platform_canvas_mac.h
@@ -2,10 +2,10 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef PlatformCanvasMac_h
-#define PlatformCanvasMac_h
+#ifndef SKIA_EXT_PLATFORM_CANVAS_MAC_H_
+#define SKIA_EXT_PLATFORM_CANVAS_MAC_H_
 
-#include "PlatformDeviceMac.h"
+#include "skia/ext/platform_device_mac.h"
 
 #include "SkCanvas.h"
 
@@ -84,5 +84,5 @@ class PlatformCanvasMac : public SkCanvas {
 
 }  // namespace gfx
 
-#endif  // PlatformCanvasMac_h
+#endif  // SKIA_EXT_PLATFORM_CANVAS_MAC_H_
 
diff --git a/webkit/port/platform/graphics/skia/public/PlatformDeviceMac.cpp b/skia/ext/platform_device_mac.cc
index f2f4cb6..9539e0f 100755
--- a/webkit/port/platform/graphics/skia/public/PlatformDeviceMac.cpp
+++ b/skia/ext/platform_device_mac.cc
@@ -2,9 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "config.h"
-
-#include "PlatformDeviceMac.h"
+#include "skia/ext/bitmap_platform_device_mac.h"
 
 #include "base/logging.h"
 #include "base/gfx/skia_utils_mac.h"
diff --git a/webkit/port/platform/graphics/skia/public/PlatformDeviceMac.h b/skia/ext/platform_device_mac.h
index 0e1dc61..589448c 100755
--- a/webkit/port/platform/graphics/skia/public/PlatformDeviceMac.h
+++ b/skia/ext/platform_device_mac.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef PlatformDeviceMac_h
-#define PlatformDeviceMac_h
+#ifndef SKIA_EXT_PLATFORM_DEVICE_MAC_H_
+#define SKIA_EXT_PLATFORM_DEVICE_MAC_H_
 
 #import <ApplicationServices/ApplicationServices.h>
 #include "SkDevice.h"
@@ -82,5 +82,5 @@ class PlatformDeviceMac : public SkDevice {
 
 }  // namespace gfx
 
-#endif  // PlatformDeviceMac_h
+#endif  // SKIA_EXT_PLATFORM_DEVICE_MAC_H_
 
diff --git a/skia/skia.xcodeproj/project.pbxproj b/skia/skia.xcodeproj/project.pbxproj
index cd45e94..7ecdb3b 100644
--- a/skia/skia.xcodeproj/project.pbxproj
+++ b/skia/skia.xcodeproj/project.pbxproj
@@ -10,6 +10,9 @@
 		7B4DF47E0E5B5FE0004D7619 /* SkNinePatch.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 7B4DF47D0E5B5FE0004D7619 /* SkNinePatch.cpp */; };
 		7B4DF4800E5B6005004D7619 /* SkScaledBitmapSampler.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 7B4DF47F0E5B6005004D7619 /* SkScaledBitmapSampler.cpp */; };
 		7B4DF48A0E5B609B004D7619 /* SkTypeface_fake.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 7B4DF4820E5B6087004D7619 /* SkTypeface_fake.cpp */; };
+		A70A3BAE0ED7385F00C31871 /* bitmap_platform_device_mac.cc in Sources */ = {isa = PBXBuildFile; fileRef = A70A3BA80ED7385F00C31871 /* bitmap_platform_device_mac.cc */; };
+		A70A3BAF0ED7385F00C31871 /* platform_canvas_mac.cc in Sources */ = {isa = PBXBuildFile; fileRef = A70A3BAA0ED7385F00C31871 /* platform_canvas_mac.cc */; };
+		A70A3BB00ED7385F00C31871 /* platform_device_mac.cc in Sources */ = {isa = PBXBuildFile; fileRef = A70A3BAC0ED7385F00C31871 /* platform_device_mac.cc */; };
 		E48EE4D20E34E873009DE966 /* Sk1DPathEffect.cpp in Sources */ = {isa = PBXBuildFile; fileRef = AB4C46860DAE9C4F00FC0DB7 /* Sk1DPathEffect.cpp */; };
 		E48EE4D30E34E873009DE966 /* Sk2DPathEffect.cpp in Sources */ = {isa = PBXBuildFile; fileRef = AB4C46870DAE9C4F00FC0DB7 /* Sk2DPathEffect.cpp */; };
 		E48EE4D40E34E873009DE966 /* Sk64.cpp in Sources */ = {isa = PBXBuildFile; fileRef = AB4C465C0DAE9C4A00FC0DB7 /* Sk64.cpp */; };
@@ -144,6 +147,12 @@
 		7B4DF47F0E5B6005004D7619 /* SkScaledBitmapSampler.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = SkScaledBitmapSampler.cpp; sourceTree = "<group>"; };
 		7B4DF4810E5B6087004D7619 /* SkDrawProcs.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SkDrawProcs.h; sourceTree = "<group>"; };
 		7B4DF4820E5B6087004D7619 /* SkTypeface_fake.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = SkTypeface_fake.cpp; sourceTree = "<group>"; };
+		A70A3BA80ED7385F00C31871 /* bitmap_platform_device_mac.cc */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = bitmap_platform_device_mac.cc; path = ext/bitmap_platform_device_mac.cc; sourceTree = "<group>"; };
+		A70A3BA90ED7385F00C31871 /* bitmap_platform_device_mac.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = bitmap_platform_device_mac.h; path = ext/bitmap_platform_device_mac.h; sourceTree = "<group>"; };
+		A70A3BAA0ED7385F00C31871 /* platform_canvas_mac.cc */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = platform_canvas_mac.cc; path = ext/platform_canvas_mac.cc; sourceTree = "<group>"; };
+		A70A3BAB0ED7385F00C31871 /* platform_canvas_mac.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = platform_canvas_mac.h; path = ext/platform_canvas_mac.h; sourceTree = "<group>"; };
+		A70A3BAC0ED7385F00C31871 /* platform_device_mac.cc */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = platform_device_mac.cc; path = ext/platform_device_mac.cc; sourceTree = "<group>"; };
+		A70A3BAD0ED7385F00C31871 /* platform_device_mac.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = platform_device_mac.h; path = ext/platform_device_mac.h; sourceTree = "<group>"; };
 		AB4C45B00DAE9C3700FC0DB7 /* SkTime.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = SkTime.cpp; sourceTree = "<group>"; };
 		AB4C465C0DAE9C4A00FC0DB7 /* Sk64.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = Sk64.cpp; sourceTree = "<group>"; };
 		AB4C465D0DAE9C4A00FC0DB7 /* SkBuffer.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = SkBuffer.cpp; sourceTree = "<group>"; };
@@ -476,12 +485,26 @@
 			path = ../build;
 			sourceTree = "<group>";
 		};
+		A70A3BA70ED7385100C31871 /* ext */ = {
+			isa = PBXGroup;
+			children = (
+				A70A3BA80ED7385F00C31871 /* bitmap_platform_device_mac.cc */,
+				A70A3BA90ED7385F00C31871 /* bitmap_platform_device_mac.h */,
+				A70A3BAA0ED7385F00C31871 /* platform_canvas_mac.cc */,
+				A70A3BAB0ED7385F00C31871 /* platform_canvas_mac.h */,
+				A70A3BAC0ED7385F00C31871 /* platform_device_mac.cc */,
+				A70A3BAD0ED7385F00C31871 /* platform_device_mac.h */,
+			);
+			name = ext;
+			sourceTree = "<group>";
+		};
 		AB4C450D0DAE9B9100FC0DB7 /* Source */ = {
 			isa = PBXGroup;
 			children = (
 				AB4C45130DAE9C3700FC0DB7 /* animator */,
 				AB4C46580DAE9C4A00FC0DB7 /* corecg */,
 				AB4C46850DAE9C4F00FC0DB7 /* effects */,
+				A70A3BA70ED7385100C31871 /* ext */,
 				AB4C46C00DAE9C7000FC0DB7 /* images */,
 				AB4C46DF0DAE9C7900FC0DB7 /* include */,
 				E48EE5A20E34F13C009DE966 /* picture */,
@@ -896,6 +919,9 @@
 			isa = PBXSourcesBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
+				A70A3BAE0ED7385F00C31871 /* bitmap_platform_device_mac.cc in Sources */,
+				A70A3BAF0ED7385F00C31871 /* platform_canvas_mac.cc in Sources */,
+				A70A3BB00ED7385F00C31871 /* platform_device_mac.cc in Sources */,
 				E48EE4D20E34E873009DE966 /* Sk1DPathEffect.cpp in Sources */,
 				E48EE4D30E34E873009DE966 /* Sk2DPathEffect.cpp in Sources */,
 				E48EE4D40E34E873009DE966 /* Sk64.cpp in Sources */,
@@ -1041,12 +1067,14 @@
 			isa = XCBuildConfiguration;
 			baseConfigurationReference = 7B4DF44D0E5B5E5C004D7619 /* staticlib.xcconfig */;
 			buildSettings = {
+				FRAMEWORK_SEARCH_PATHS = "$(SYSTEM_LIBRARY_DIR)/Frameworks/ApplicationServices.framework/Versions/A/Frameworks";
 				GCC_PREFIX_HEADER = skia_Prefix.pch;
 				GCC_PREPROCESSOR_DEFINITIONS = (
 					"$(GCC_PREPROCESSOR_DEFINITIONS)",
 					SK_BUILD_FOR_MAC,
 				);
 				HEADER_SEARCH_PATHS = (
+					..,
 					corecg,
 					include,
 					include/corecg,
@@ -1061,12 +1089,14 @@
 			isa = XCBuildConfiguration;
 			baseConfigurationReference = 7B4DF44D0E5B5E5C004D7619 /* staticlib.xcconfig */;
 			buildSettings = {
+				FRAMEWORK_SEARCH_PATHS = "$(SYSTEM_LIBRARY_DIR)/Frameworks/ApplicationServices.framework/Versions/A/Frameworks";
 				GCC_PREFIX_HEADER = skia_Prefix.pch;
 				GCC_PREPROCESSOR_DEFINITIONS = (
 					"$(GCC_PREPROCESSOR_DEFINITIONS)",
 					SK_BUILD_FOR_MAC,
 				);
 				HEADER_SEARCH_PATHS = (
+					..,
 					corecg,
 					include,
 					include/corecg,
diff --git a/webkit/SConscript.port b/webkit/SConscript.port
index ac4f785..7f3132d 100644
--- a/webkit/SConscript.port
+++ b/webkit/SConscript.port
@@ -147,9 +147,6 @@ if env['PLATFORM'] == 'darwin':
     '$PORT_DIR/platform/chromium/ScrollbarThemeChromium.cpp',
     '$PORT_DIR/platform/graphics/FontCustomPlatformData.cpp',
     '$PORT_DIR/platform/graphics/ImageSkia.cpp',
-
-    '$PORT_DIR/platform/graphics/skia/public/PlatformCanvasMac.cpp',
-    '$PORT_DIR/platform/graphics/skia/public/PlatformDeviceMac.cpp',
   ]
   for remove in remove_files:
     input_files.remove(remove)
diff --git a/webkit/port/platform/graphics/skia/public/BitmapPlatformDevice.h b/webkit/port/platform/graphics/skia/public/BitmapPlatformDevice.h
index dd1f87d..1f933a4 100644
--- a/webkit/port/platform/graphics/skia/public/BitmapPlatformDevice.h
+++ b/webkit/port/platform/graphics/skia/public/BitmapPlatformDevice.h
@@ -14,7 +14,7 @@ typedef BitmapPlatformDeviceWin BitmapPlatformDevice;
 
 }  // namespace gfx
 #elif defined(__APPLE__)
-#include "BitmapPlatformDeviceMac.h"
+#include "skia/ext/bitmap_platform_device_mac.h"
 namespace gfx {
 
 typedef BitmapPlatformDeviceMac BitmapPlatformDevice;
diff --git a/webkit/port/platform/graphics/skia/public/PlatformCanvas.h b/webkit/port/platform/graphics/skia/public/PlatformCanvas.h
index 9fdfd68..162bf3e 100644
--- a/webkit/port/platform/graphics/skia/public/PlatformCanvas.h
+++ b/webkit/port/platform/graphics/skia/public/PlatformCanvas.h
@@ -14,7 +14,7 @@ typedef PlatformCanvasWin PlatformCanvas;
 
 }  // namespace gfx
 #elif defined(__APPLE__)
-#include "PlatformCanvasMac.h"
+#include "skia/ext/platform_canvas_mac.h"
 namespace gfx {
 
 typedef PlatformCanvasMac PlatformCanvas;
diff --git a/webkit/port/platform/graphics/skia/public/PlatformDevice.h b/webkit/port/platform/graphics/skia/public/PlatformDevice.h
index 3072e08..a381fd1 100644
--- a/webkit/port/platform/graphics/skia/public/PlatformDevice.h
+++ b/webkit/port/platform/graphics/skia/public/PlatformDevice.h
@@ -9,7 +9,7 @@
 #if defined(WIN32)
 #include "PlatformDeviceWin.h"
 #elif defined(__APPLE__)
-#include "PlatformDeviceMac.h"
+#include "skia/ext/platform_device_mac.h"
 #elif defined(__linux__)
 #include "PlatformDeviceLinux.h"
 #endif
diff --git a/webkit/webkit.xcodeproj/project.pbxproj b/webkit/webkit.xcodeproj/project.pbxproj
index 3b5dfb7..50094c7 100644
--- a/webkit/webkit.xcodeproj/project.pbxproj
+++ b/webkit/webkit.xcodeproj/project.pbxproj
@@ -74,9 +74,6 @@
 		4D2A644A0EBBC16700B55603 /* V8HTMLMediaElement.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4D2A64450EBBC16700B55603 /* V8HTMLMediaElement.cpp */; };
 		4D2A644B0EBBC16700B55603 /* V8HTMLSourceElement.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4D2A64470EBBC16700B55603 /* V8HTMLSourceElement.cpp */; };
 		4D329F8C0EB908A40041FB7E /* V8MessageChannel.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4D329F8A0EB908A40041FB7E /* V8MessageChannel.cpp */; };
-		4D35546E0ED499E000FB28B1 /* BitmapPlatformDeviceMac.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4D3554660ED499E000FB28B1 /* BitmapPlatformDeviceMac.cpp */; };
-		4D35546F0ED499E000FB28B1 /* PlatformCanvasMac.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4D3554690ED499E000FB28B1 /* PlatformCanvasMac.cpp */; };
-		4D3554700ED499E000FB28B1 /* PlatformDeviceMac.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4D35546C0ED499E000FB28B1 /* PlatformDeviceMac.cpp */; };
 		4D35557D0ED4ACF600FB28B1 /* dtoa.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4D35557B0ED4ACF600FB28B1 /* dtoa.cpp */; };
 		4D7B071F0E9DAE56009A6919 /* GraphicsContextStub.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4D7B071E0E9DAE56009A6919 /* GraphicsContextStub.cpp */; };
 		4DB043A40EB1577900A5633C /* webcursor.cc in Sources */ = {isa = PBXBuildFile; fileRef = 825405300D92E3DA0006B936 /* webcursor.cc */; };
@@ -1547,14 +1544,8 @@
 		4D329F8A0EB908A40041FB7E /* V8MessageChannel.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = V8MessageChannel.cpp; sourceTree = "<group>"; };
 		4D329F8B0EB908A40041FB7E /* V8MessageChannel.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = V8MessageChannel.h; sourceTree = "<group>"; };
 		4D3554650ED499E000FB28B1 /* BitmapPlatformDevice.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = BitmapPlatformDevice.h; sourceTree = "<group>"; };
-		4D3554660ED499E000FB28B1 /* BitmapPlatformDeviceMac.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = BitmapPlatformDeviceMac.cpp; sourceTree = "<group>"; };
-		4D3554670ED499E000FB28B1 /* BitmapPlatformDeviceMac.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = BitmapPlatformDeviceMac.h; sourceTree = "<group>"; };
 		4D3554680ED499E000FB28B1 /* PlatformCanvas.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = PlatformCanvas.h; sourceTree = "<group>"; };
-		4D3554690ED499E000FB28B1 /* PlatformCanvasMac.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = PlatformCanvasMac.cpp; sourceTree = "<group>"; };
-		4D35546A0ED499E000FB28B1 /* PlatformCanvasMac.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = PlatformCanvasMac.h; sourceTree = "<group>"; };
 		4D35546B0ED499E000FB28B1 /* PlatformDevice.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = PlatformDevice.h; sourceTree = "<group>"; };
-		4D35546C0ED499E000FB28B1 /* PlatformDeviceMac.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = PlatformDeviceMac.cpp; sourceTree = "<group>"; };
-		4D35546D0ED499E000FB28B1 /* PlatformDeviceMac.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = PlatformDeviceMac.h; sourceTree = "<group>"; };
 		4D3554710ED499EF00FB28B1 /* VectorCanvas.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = VectorCanvas.cpp; sourceTree = "<group>"; };
 		4D3554720ED499EF00FB28B1 /* VectorCanvas.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = VectorCanvas.h; sourceTree = "<group>"; };
 		4D3554730ED499EF00FB28B1 /* VectorDevice.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = VectorDevice.cpp; sourceTree = "<group>"; };
@@ -4413,14 +4404,8 @@
 			isa = PBXGroup;
 			children = (
 				4D3554650ED499E000FB28B1 /* BitmapPlatformDevice.h */,
-				4D3554660ED499E000FB28B1 /* BitmapPlatformDeviceMac.cpp */,
-				4D3554670ED499E000FB28B1 /* BitmapPlatformDeviceMac.h */,
 				4D3554680ED499E000FB28B1 /* PlatformCanvas.h */,
-				4D3554690ED499E000FB28B1 /* PlatformCanvasMac.cpp */,
-				4D35546A0ED499E000FB28B1 /* PlatformCanvasMac.h */,
 				4D35546B0ED499E000FB28B1 /* PlatformDevice.h */,
-				4D35546C0ED499E000FB28B1 /* PlatformDeviceMac.cpp */,
-				4D35546D0ED499E000FB28B1 /* PlatformDeviceMac.h */,
 				4D3554710ED499EF00FB28B1 /* VectorCanvas.cpp */,
 				4D3554720ED499EF00FB28B1 /* VectorCanvas.h */,
 				4D3554730ED499EF00FB28B1 /* VectorDevice.cpp */,
@@ -9357,7 +9342,6 @@
 				93BF8E990EA6B0E50030F05C /* AuthenticationChallengeChromium.cpp in Sources */,
 				E4006ABA0EC235870055B38E /* AXObjectCacheChromium.cpp in Sources */,
 				E45627EF0E2694B8005E4685 /* BackForwardList.cpp in Sources */,
-				4D35546E0ED499E000FB28B1 /* BitmapPlatformDeviceMac.cpp in Sources */,
 				E45627EA0E2694B8005E4685 /* BMPImageDecoder.cpp in Sources */,
 				E45627E90E2694B8005E4685 /* BMPImageReader.cpp in Sources */,
 				E45627EE0E2694B8005E4685 /* CachedPage.cpp in Sources */,
@@ -9397,9 +9381,7 @@
 				E48A07280E3F95A000172919 /* NativeImageSkia.cpp in Sources */,
 				93BF8E9C0EA6B0F30030F05C /* NetworkStateNotifierChromium.cpp in Sources */,
 				532E351C0ECA0F290097577C /* PasteboardChromium.cpp in Sources */,
-				4D35546F0ED499E000FB28B1 /* PlatformCanvasMac.cpp in Sources */,
 				E4E4C8560E7832E2009A687C /* PlatformContextSkia.cpp in Sources */,
-				4D3554700ED499E000FB28B1 /* PlatformDeviceMac.cpp in Sources */,
 				E473F6530EAE002F006C2098 /* PlatformKeyboardEventChromium.cpp in Sources */,
 				E40FB28F0EAFF0BC006F380A /* PlatformScreenMac.mm in Sources */,
 				B507F51C0E9BE98B00D16D77 /* PluginStubsMac.cpp in Sources */,