Remove base versions of the graphics headers, which previously just forwarded to the skia ones.

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

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

46 files changed, 51 insertions, 212 deletions

diff --git a/base/base.xcodeproj/project.pbxproj b/base/base.xcodeproj/project.pbxproj
index 1fa9482..5709f3c 100644
--- a/base/base.xcodeproj/project.pbxproj
+++ b/base/base.xcodeproj/project.pbxproj
@@ -576,11 +576,6 @@
 		825403D40D92D31D0006B936 /* rect.cc */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = rect.cc; sourceTree = "<group>"; };
 		825403D50D92D31D0006B936 /* rect.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = rect.h; sourceTree = "<group>"; };
 		825403D70D92D31D0006B936 /* size.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = size.h; sourceTree = "<group>"; };
-		825403DD0D92D31D0006B936 /* vector_canvas.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = vector_canvas.h; sourceTree = "<group>"; };
-		825403DF0D92D31D0006B936 /* vector_device.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = vector_device.h; sourceTree = "<group>"; };
-		829E2F950DBFD74B00819EBF /* bitmap_platform_device_mac.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = bitmap_platform_device_mac.h; sourceTree = "<group>"; };
-		829E2F980DBFD76300819EBF /* platform_canvas_mac.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = platform_canvas_mac.h; sourceTree = "<group>"; };
-		829E2F9C0DBFD76F00819EBF /* platform_device_mac.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = platform_device_mac.h; sourceTree = "<group>"; };
 		829E30D60DBFD8ED00819EBF /* skia.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = skia.xcodeproj; path = skia/skia.xcodeproj; sourceTree = "<group>"; };
 		829E36720DC0FBAD00819EBF /* thread_local_storage_posix.cc */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = thread_local_storage_posix.cc; sourceTree = "<group>"; };
 		82D094530E5B892600FEC05C /* time_format.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = time_format.h; sourceTree = "<group>"; };
@@ -610,9 +605,6 @@
 		A5CB82960E5C74E300FD6825 /* platform_test.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = platform_test.h; sourceTree = "<group>"; };
 		A5CB82970E5C74E300FD6825 /* platform_test_mac.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = platform_test_mac.mm; sourceTree = "<group>"; };
 		AB14B6060EBFA74C00FB3807 /* time_posix.cc */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = time_posix.cc; sourceTree = "<group>"; };
-		AB6BC1ED0E54E836006436D5 /* bitmap_platform_device.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = bitmap_platform_device.h; sourceTree = "<group>"; };
-		AB6BC1F10E54E900006436D5 /* platform_canvas.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = platform_canvas.h; sourceTree = "<group>"; };
-		AB6BC1F50E54E97B006436D5 /* platform_device.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = platform_device.h; sourceTree = "<group>"; };
 		ABE1BA290E7574D1009041DA /* ApplicationServices.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = ApplicationServices.framework; path = System/Library/Frameworks/ApplicationServices.framework; sourceTree = "<group>"; };
 		ABE1BA600E75757C009041DA /* skia_utils_mac.cc */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = skia_utils_mac.cc; sourceTree = "<group>"; };
 		ABF4B98E0DC2BA6900A6E319 /* base_paths_mac.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = base_paths_mac.mm; sourceTree = "<group>"; };
@@ -1081,8 +1073,6 @@
 		825403B40D92D2EC0006B936 /* gfx */ = {
 			isa = PBXGroup;
 			children = (
-				AB6BC1ED0E54E836006436D5 /* bitmap_platform_device.h */,
-				829E2F950DBFD74B00819EBF /* bitmap_platform_device_mac.h */,
 				E48A06680E3F70B500172919 /* convolver.cc */,
 				E48A06690E3F70B500172919 /* convolver.h */,
 				E48A06790E3F714300172919 /* convolver_unittest.cc */,
@@ -1094,10 +1084,6 @@
 				825403C90D92D31D0006B936 /* native_theme.h */,
 				7B8505A20E5B3FBE00730B43 /* native_theme_unittest.cc */,
 				7B1435DF0E78419700901940 /* native_widget_types.h */,
-				AB6BC1F10E54E900006436D5 /* platform_canvas.h */,
-				829E2F980DBFD76300819EBF /* platform_canvas_mac.h */,
-				AB6BC1F50E54E97B006436D5 /* platform_device.h */,
-				829E2F9C0DBFD76F00819EBF /* platform_device_mac.h */,
 				E4562A200E27C8C1005E4685 /* png_codec_unittest.cc */,
 				825403CD0D92D31D0006B936 /* png_decoder.cc */,
 				825403CE0D92D31D0006B936 /* png_decoder.h */,
@@ -1114,8 +1100,6 @@
 				7B8505A60E5B3FBE00730B43 /* skia_utils.h */,
 				ABE1BA600E75757C009041DA /* skia_utils_mac.cc */,
 				7B1435DE0E78416400901940 /* skia_utils_mac.h */,
-				825403DD0D92D31D0006B936 /* vector_canvas.h */,
-				825403DF0D92D31D0006B936 /* vector_device.h */,
 			);
 			path = gfx;
 			sourceTree = "<group>";
diff --git a/base/build/base_gfx.vcproj b/base/build/base_gfx.vcproj
index 8b2bc64..ef4b5de 100644
--- a/base/build/base_gfx.vcproj
+++ b/base/build/base_gfx.vcproj
@@ -122,10 +122,6 @@
 	</References>
 	<Files>
 		<File
-			RelativePath="..\gfx\bitmap_platform_device_win.h"
-			>
-		</File>
-		<File
 			RelativePath="..\gfx\convolver.cc"
 			>
 		</File>
@@ -158,14 +154,6 @@
 			>
 		</File>
 		<File
-			RelativePath="..\gfx\platform_canvas_win.h"
-			>
-		</File>
-		<File
-			RelativePath="..\gfx\platform_device_win.h"
-			>
-		</File>
-		<File
 			RelativePath="..\gfx\png_decoder.cc"
 			>
 		</File>
diff --git a/base/gfx/bitmap_platform_device.h b/base/gfx/bitmap_platform_device.h
deleted file mode 100644
index 19a35ba..0000000
--- a/base/gfx/bitmap_platform_device.h
+++ /dev/null
@@ -1,7 +0,0 @@
-// Copyright (c) 2006-2008 The Chromium Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
-// TODO(brettw) this file should be removed and the includes changed to this
-// new location.
-#include "skia/ext/bitmap_platform_device.h"
diff --git a/base/gfx/bitmap_platform_device_linux.h b/base/gfx/bitmap_platform_device_linux.h
deleted file mode 100644
index 25b2894..0000000
--- a/base/gfx/bitmap_platform_device_linux.h
+++ /dev/null
@@ -1,12 +0,0 @@
-// Copyright (c) 2006-2008 The Chromium Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
-#ifndef BASE_GFX_BITMAP_PLATFORM_DEVICE_LINUX_H_
-#define BASE_GFX_BITMAP_PLATFORM_DEVICE_LINUX_H_
-
-// TODO(brettw) this file should be removed and the includes changed to this
-// new location.
-#include "skia/ext/bitmap_platform_device_linux.h"
-
-#endif  // BASE_GFX_BITMAP_PLATFORM_DEVICE_LINUX_H_
diff --git a/base/gfx/bitmap_platform_device_mac.h b/base/gfx/bitmap_platform_device_mac.h
deleted file mode 100755
index 70c2e0e..0000000
--- a/base/gfx/bitmap_platform_device_mac.h
+++ /dev/null
@@ -1,13 +0,0 @@
-// Copyright (c) 2006-2008 The Chromium Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
-#ifndef BASE_GFX_BITMAP_PLATFORM_DEVICE_MAC_H__
-#define BASE_GFX_BITMAP_PLATFORM_DEVICE_MAC_H__
-
-// TODO(brettw) this file should be removed and the includes changed to this
-// new location.
-#include "skia/ext/bitmap_platform_device_mac.h"
-
-#endif  // BASE_GFX_BITMAP_PLATFORM_DEVICE_MAC_H__
-
diff --git a/base/gfx/bitmap_platform_device_win.h b/base/gfx/bitmap_platform_device_win.h
deleted file mode 100644
index 5adfa34..0000000
--- a/base/gfx/bitmap_platform_device_win.h
+++ /dev/null
@@ -1,13 +0,0 @@
-// Copyright (c) 2006-2008 The Chromium Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
-#ifndef BASE_GFX_BITMAP_PLATFORM_DEVICE_WIN_H_
-#define BASE_GFX_BITMAP_PLATFORM_DEVICE_WIN_H_
-
-// TODO(brettw) this file should be removed and the includes changed to this
-// new location.
-#include "skia/ext/bitmap_platform_device_win.h"
-
-#endif  // BASE_GFX_BITMAP_PLATFORM_DEVICE_WIN_H_
-
diff --git a/base/gfx/native_theme.cc b/base/gfx/native_theme.cc
index 7fdc459e..71289d8 100644
--- a/base/gfx/native_theme.cc
+++ b/base/gfx/native_theme.cc
@@ -10,11 +10,11 @@
 #include <vssym32.h>
 
 #include "base/gfx/gdi_util.h"
-#include "base/gfx/platform_canvas_win.h"
 #include "base/gfx/skia_utils.h"
 #include "base/gfx/rect.h"
 #include "base/logging.h"
 #include "base/scoped_handle.h"
+#include "skia/ext/platform_canvas.h"
 #include "skia/include/SkShader.h"
 
 namespace gfx {
diff --git a/base/gfx/platform_canvas_win.h b/base/gfx/platform_canvas_win.h
deleted file mode 100644
index 3af1c0d..0000000
--- a/base/gfx/platform_canvas_win.h
+++ /dev/null
@@ -1,13 +0,0 @@
-// Copyright (c) 2006-2008 The Chromium Authors. All rights reserved.
-// 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_WIN_H_
-#define BASE_GFX_PLATFORM_CANVAS_WIN_H_
-
-// TODO(brettw) this file should be removed and the includes changed to this
-// new location.
-#include "skia/ext/platform_canvas_win.h"
-
-#endif  // BASE_GFX_PLATFORM_CANVAS_WIN_H_
-
diff --git a/base/gfx/platform_device.h b/base/gfx/platform_device.h
deleted file mode 100644
index 2c2acd2..0000000
--- a/base/gfx/platform_device.h
+++ /dev/null
@@ -1,7 +0,0 @@
-// Copyright (c) 2006-2008 The Chromium Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
-// TODO(brettw) this file should be removed and the includes changed to this
-// new location.
-#include "skia/ext/platform_device.h"
diff --git a/base/gfx/platform_device_win.h b/base/gfx/platform_device_win.h
deleted file mode 100644
index 3851e60..0000000
--- a/base/gfx/platform_device_win.h
+++ /dev/null
@@ -1,13 +0,0 @@
-// Copyright (c) 2006-2008 The Chromium Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
-#ifndef BASE_GFX_PLATFORM_DEVICE_WIN_H__
-#define BASE_GFX_PLATFORM_DEVICE_WIN_H__
-
-// TODO(brettw) this file should be removed and the includes changed to this
-// new location.
-#include "skia/ext/platform_device_win.h"
-
-#endif  // BASE_GFX_PLATFORM_DEVICE_WIN_H__
-
diff --git a/base/gfx/vector_canvas.h b/base/gfx/vector_canvas.h
deleted file mode 100644
index 8538366..0000000
--- a/base/gfx/vector_canvas.h
+++ /dev/null
@@ -1,46 +0,0 @@
-// Copyright (c) 2006-2008 The Chromium Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
-#ifndef BASE_GFX_VECTOR_CANVAS_H_
-#define BASE_GFX_VECTOR_CANVAS_H_
-
-#include "base/gfx/platform_canvas_win.h"
-#include "base/gfx/vector_device.h"
-
-namespace gfx {
-
-// This class is a specialization of the regular PlatformCanvas. It is designed
-// to work with a VectorDevice to manage platform-specific drawing. It allows
-// using both Skia operations and platform-specific operations. It *doesn't*
-// support reading back from the bitmap backstore since it is not used.
-class VectorCanvas : public PlatformCanvasWin {
- public:
-  VectorCanvas();
-  VectorCanvas(HDC dc, int width, int height);
-  virtual ~VectorCanvas();
-
-  // For two-part init, call if you use the no-argument constructor above
-  bool initialize(HDC context, int width, int height);
-
-  virtual SkBounder* setBounder(SkBounder*);
-  virtual SkDevice* createDevice(SkBitmap::Config config,
-                                 int width, int height,
-                                 bool is_opaque, bool isForLayer);
-  virtual SkDrawFilter* setDrawFilter(SkDrawFilter* filter);
-
- private:
-  // |is_opaque| is unused. |shared_section| is in fact the HDC used for output.
-  virtual SkDevice* createPlatformDevice(int width, int height, bool is_opaque,
-                                         HANDLE shared_section);
-
-  // Returns true if the top device is vector based and not bitmap based.
-  bool IsTopDeviceVectorial() const;
-
-  DISALLOW_COPY_AND_ASSIGN(VectorCanvas);
-};
-
-}  // namespace gfx
-
-#endif  // BASE_GFX_VECTOR_CANVAS_H_
-
diff --git a/base/gfx/vector_device.h b/base/gfx/vector_device.h
deleted file mode 100644
index 8ba1724..0000000
--- a/base/gfx/vector_device.h
+++ /dev/null
@@ -1,7 +0,0 @@
-// Copyright (c) 2006-2008 The Chromium Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
-// TODO(brettw) this file should be removed and the includes changed to this
-// new location.
-#include "skia/ext/vector_device.h"
diff --git a/chrome/browser/browser_main.cc b/chrome/browser/browser_main.cc
index 5bc0e9b..ff87093 100644
--- a/chrome/browser/browser_main.cc
+++ b/chrome/browser/browser_main.cc
@@ -9,7 +9,6 @@
 
 #include "base/command_line.h"
 #include "base/file_util.h"
-#include "base/gfx/vector_canvas.h"
 #include "base/histogram.h"
 #include "base/lazy_instance.h"
 #include "base/path_service.h"
diff --git a/chrome/browser/printing/printed_document.cc b/chrome/browser/printing/printed_document.cc
index b5eecb3..f6e783c 100644
--- a/chrome/browser/printing/printed_document.cc
+++ b/chrome/browser/printing/printed_document.cc
@@ -6,7 +6,6 @@
 
 #include <set>
 
-#include "base/gfx/platform_device_win.h"
 #include "base/message_loop.h"
 #include "base/time.h"
 #include "chrome/browser/printing/page_number.h"
@@ -20,6 +19,7 @@
 #include "chrome/common/time_format.h"
 #include "chrome/common/notification_service.h"
 #include "chrome/common/win_util.h"
+#include "skia/ext/platform_device.h"
 
 using base::Time;
 
diff --git a/chrome/browser/printing/printing_layout_uitest.cc b/chrome/browser/printing/printing_layout_uitest.cc
index e8ac2e2..213e199 100644
--- a/chrome/browser/printing/printing_layout_uitest.cc
+++ b/chrome/browser/printing/printing_layout_uitest.cc
@@ -5,7 +5,7 @@
 #include "base/command_line.h"
 #include "base/file_util.h"
 #include "base/gfx/gdi_util.h"
-#include "base/gfx/platform_device_win.h"
+#include "skia/ext/platform_device.h"
 #include "base/gfx/png_decoder.h"
 #include "base/gfx/png_encoder.h"
 #include "base/time.h"
diff --git a/chrome/browser/printing/win_printing_context.cc b/chrome/browser/printing/win_printing_context.cc
index f4343ff..8fb9c28 100644
--- a/chrome/browser/printing/win_printing_context.cc
+++ b/chrome/browser/printing/win_printing_context.cc
@@ -7,10 +7,10 @@
 #include <winspool.h>
 
 #include "base/file_util.h"
-#include "base/gfx/platform_device_win.h"
 #include "base/time_format.h"
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/printing/print_job_manager.h"
+#include "skia/ext/platform_device_win.h"
 
 using base::Time;
 
diff --git a/chrome/browser/views/theme_helpers.cc b/chrome/browser/views/theme_helpers.cc
index df5fb3c..710e1ee 100644
--- a/chrome/browser/views/theme_helpers.cc
+++ b/chrome/browser/views/theme_helpers.cc
@@ -8,9 +8,9 @@
 #include <atlapp.h>
 #include <atltheme.h>
 
-#include "base/gfx/bitmap_platform_device_win.h"
 #include "chrome/common/gfx/chrome_canvas.h"
 #include "base/logging.h"
+#include "skia/ext/bitmap_platform_device_win.h"
 #include "SkGradientShader.h"
 
 void GetRebarGradientColors(int width, int x1, int x2, SkColor* c1, SkColor* c2) {
diff --git a/chrome/common/gfx/chrome_canvas.h b/chrome/common/gfx/chrome_canvas.h
index ddc3f28..313f5db 100644
--- a/chrome/common/gfx/chrome_canvas.h
+++ b/chrome/common/gfx/chrome_canvas.h
@@ -7,8 +7,9 @@
 
 #include <windows.h>
 #include <string>
+
 #include "base/basictypes.h"
-#include "base/gfx/platform_canvas_win.h"
+#include "skia/ext/platform_canvas_win.h"
 
 class ChromeFont;
 namespace gfx {
diff --git a/chrome/plugin/webplugin_delegate_stub.cc b/chrome/plugin/webplugin_delegate_stub.cc
index 91df155..11703b6 100644
--- a/chrome/plugin/webplugin_delegate_stub.cc
+++ b/chrome/plugin/webplugin_delegate_stub.cc
@@ -6,7 +6,6 @@
 
 #include "base/command_line.h"
 #include "base/time.h"
-#include "base/gfx/platform_device_win.h"
 #include "chrome/common/chrome_switches.h"
 #include "chrome/common/gfx/emf.h"
 #include "chrome/common/plugin_messages.h"
@@ -17,6 +16,7 @@
 #include "chrome/plugin/webplugin_proxy.h"
 #include "third_party/npapi/bindings/npapi.h"
 #include "third_party/npapi/bindings/npruntime.h"
+#include "skia/ext/platform_device.h"
 #include "webkit/glue/plugins/webplugin_delegate_impl.h"
 #include "webkit/glue/webcursor.h"
 
diff --git a/chrome/plugin/webplugin_proxy.cc b/chrome/plugin/webplugin_proxy.cc
index 255c843..7ab78629 100644
--- a/chrome/plugin/webplugin_proxy.cc
+++ b/chrome/plugin/webplugin_proxy.cc
@@ -5,7 +5,6 @@
 #include "chrome/plugin/webplugin_proxy.h"
 
 #include "base/gfx/gdi_util.h"
-#include "base/gfx/platform_device_win.h"
 #include "base/scoped_handle.h"
 #include "base/shared_memory.h"
 #include "base/singleton.h"
@@ -16,6 +15,7 @@
 #include "chrome/plugin/webplugin_delegate_stub.h"
 #include "chrome/plugin/npobject_proxy.h"
 #include "chrome/plugin/npobject_util.h"
+#include "skia/ext/platform_device.h"
 #include "webkit/glue/plugins/webplugin_delegate_impl.h"
 
 typedef std::map<CPBrowsingContext, WebPluginProxy*> ContextMap;
diff --git a/chrome/renderer/render_view.cc b/chrome/renderer/render_view.cc
index 3c041cb..3fd05d1 100644
--- a/chrome/renderer/render_view.cc
+++ b/chrome/renderer/render_view.cc
@@ -10,10 +10,8 @@
 
 #include "base/command_line.h"
 #include "base/gfx/gdi_util.h"
-#include "base/gfx/bitmap_platform_device_win.h"
 #include "base/gfx/image_operations.h"
 #include "base/gfx/native_theme.h"
-#include "base/gfx/vector_canvas.h"
 #include "base/gfx/png_encoder.h"
 #include "base/string_piece.h"
 #include "base/string_util.h"
@@ -39,6 +37,8 @@
 #include "chrome/views/message_box_view.h"
 #include "net/base/escape.h"
 #include "net/base/net_errors.h"
+#include "skia/ext/bitmap_platform_device.h"
+#include "skia/ext/vector_canvas.h"
 #include "webkit/default_plugin/default_plugin_shared.h"
 #include "webkit/glue/dom_operations.h"
 #include "webkit/glue/dom_serializer.h"
diff --git a/chrome/renderer/render_widget.cc b/chrome/renderer/render_widget.cc
index c94f769..40aee5f 100644
--- a/chrome/renderer/render_widget.cc
+++ b/chrome/renderer/render_widget.cc
@@ -10,9 +10,9 @@
 #include "base/gfx/size.h"
 #include "base/logging.h"
 #include "base/message_loop.h"
-#include "base/gfx/platform_canvas_win.h"
 #include "base/scoped_ptr.h"
 #include "chrome/renderer/render_process.h"
+#include "skia/ext/platform_canvas_win.h"
 
 #include "webkit/glue/webinputevent.h"
 #include "webkit/glue/webwidget.h"
diff --git a/skia/ext/bitmap_platform_device_win.h b/skia/ext/bitmap_platform_device_win.h
index 49b72a4..e392306ea 100644
--- a/skia/ext/bitmap_platform_device_win.h
+++ b/skia/ext/bitmap_platform_device_win.h
@@ -5,8 +5,8 @@
 #ifndef SKIA_BITMAP_PLATFORM_DEVICE_WIN_H_
 #define SKIA_BITMAP_PLATFORM_DEVICE_WIN_H_
 
-#include "base/gfx/platform_device_win.h"
 #include "base/ref_counted.h"
+#include "skia/ext/platform_device_win.h"
 
 namespace gfx {
 
diff --git a/skia/ext/platform_canvas_linux.cc b/skia/ext/platform_canvas_linux.cc
index 126c7ff..ba2fe81 100644
--- a/skia/ext/platform_canvas_linux.cc
+++ b/skia/ext/platform_canvas_linux.cc
@@ -4,9 +4,9 @@
 
 #include "skia/ext/platform_canvas_linux.h"
 
-#include "base/gfx/platform_device_linux.h"
-#include "base/gfx/bitmap_platform_device_linux.h"
 #include "base/logging.h"
+#include "skia/ext/platform_device_linux.h"
+#include "skia/ext/bitmap_platform_device_linux.h"
 
 namespace gfx {
 
diff --git a/skia/ext/platform_canvas_unittest.cc b/skia/ext/platform_canvas_unittest.cc
index 8e227ad..a59ef1c 100644
--- a/skia/ext/platform_canvas_unittest.cc
+++ b/skia/ext/platform_canvas_unittest.cc
@@ -12,8 +12,8 @@
 #include <unistd.h>
 #endif
 
-#include "base/gfx/platform_canvas.h"
-#include "base/gfx/platform_device.h"
+#include "skia/ext/platform_canvas.h"
+#include "skia/ext/platform_device.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 #include "SkColor.h"
diff --git a/skia/ext/vector_canvas.cc b/skia/ext/vector_canvas.cc
index 440ee64..a671852 100644
--- a/skia/ext/vector_canvas.cc
+++ b/skia/ext/vector_canvas.cc
@@ -2,10 +2,10 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "base/gfx/vector_canvas.h"
+#include "skia/ext/vector_canvas.h"
 
-#include "base/gfx/vector_device.h"
 #include "base/logging.h"
+#include "skia/ext/vector_device.h"
 
 namespace gfx {
 
diff --git a/skia/ext/vector_canvas.h b/skia/ext/vector_canvas.h
index 8538366..66a45eb 100644
--- a/skia/ext/vector_canvas.h
+++ b/skia/ext/vector_canvas.h
@@ -5,8 +5,8 @@
 #ifndef BASE_GFX_VECTOR_CANVAS_H_
 #define BASE_GFX_VECTOR_CANVAS_H_
 
-#include "base/gfx/platform_canvas_win.h"
-#include "base/gfx/vector_device.h"
+#include "skia/ext/platform_canvas_win.h"
+#include "skia/ext/vector_device.h"
 
 namespace gfx {
 
diff --git a/skia/ext/vector_device.h b/skia/ext/vector_device.h
index 8579689..b4f3336 100644
--- a/skia/ext/vector_device.h
+++ b/skia/ext/vector_device.h
@@ -6,7 +6,7 @@
 #define VectorDevice_h
 
 #include "base/basictypes.h"
-#include "base/gfx/platform_device_win.h"
+#include "skia/ext/platform_device_win.h"
 #include "SkMatrix.h"
 #include "SkRegion.h"
 
diff --git a/webkit/glue/webframe.h b/webkit/glue/webframe.h
index 9fd4daf..2962173 100644
--- a/webkit/glue/webframe.h
+++ b/webkit/glue/webframe.h
@@ -9,9 +9,9 @@
 
 #include "base/basictypes.h"
 #include "base/ref_counted.h"
-#include "base/gfx/bitmap_platform_device.h"
-#include "base/gfx/platform_canvas.h"
 #include "base/gfx/size.h"
+#include "skia/ext/bitmap_platform_device.h"
+#include "skia/ext/platform_canvas.h"
 #include "webkit/glue/console_message_level.h"
 #include "webkit/glue/find_in_page_request.h"
 
diff --git a/webkit/glue/webframe_impl.cc b/webkit/glue/webframe_impl.cc
index a5a8fda..ecd839b 100644
--- a/webkit/glue/webframe_impl.cc
+++ b/webkit/glue/webframe_impl.cc
@@ -116,8 +116,6 @@ MSVC_POP_WARNING();
 #undef LOG
 
 #include "base/basictypes.h"
-#include "base/gfx/bitmap_platform_device.h"
-#include "base/gfx/platform_canvas.h"
 #include "base/gfx/rect.h"
 #include "base/logging.h"
 #include "base/message_loop.h"
@@ -125,6 +123,8 @@ MSVC_POP_WARNING();
 #include "base/string_util.h"
 #include "base/time.h"
 #include "net/base/net_errors.h"
+#include "skia/ext/bitmap_platform_device.h"
+#include "skia/ext/platform_canvas.h"
 #include "webkit/glue/alt_error_page_resource_fetcher.h"
 #include "webkit/glue/dom_operations.h"
 #include "webkit/glue/glue_serialize.h"
diff --git a/webkit/glue/webframe_impl.h b/webkit/glue/webframe_impl.h
index d50762d..fefe2ba 100644
--- a/webkit/glue/webframe_impl.h
+++ b/webkit/glue/webframe_impl.h
@@ -30,9 +30,9 @@
 
 #include "base/basictypes.h"
 #include "base/compiler_specific.h"
-#include "base/gfx/platform_canvas.h"
 #include "base/scoped_ptr.h"
 #include "base/task.h"
+#include "skia/ext/platform_canvas.h"
 #include "webkit/glue/password_autocomplete_listener.h"
 #include "webkit/glue/webdatasource_impl.h"
 #include "webkit/glue/webframe.h"
diff --git a/webkit/glue/webview_impl.h b/webkit/glue/webview_impl.h
index f53f211..a9b4763 100644
--- a/webkit/glue/webview_impl.h
+++ b/webkit/glue/webview_impl.h
@@ -9,9 +9,9 @@
 
 #include "base/basictypes.h"
 #include "base/compiler_specific.h"
-#include "base/gfx/platform_canvas.h"
 #include "base/gfx/point.h"
 #include "base/gfx/size.h"
+#include "skia/ext/platform_canvas.h"
 #include "webkit/glue/webdropdata.h"
 #include "webkit/glue/webframe_impl.h"
 #include "webkit/glue/webpreferences.h"
diff --git a/webkit/glue/webwidget.h b/webkit/glue/webwidget.h
index d3c28f4..9995cc2 100644
--- a/webkit/glue/webwidget.h
+++ b/webkit/glue/webwidget.h
@@ -5,8 +5,8 @@
 #ifndef WEBKIT_GLUE_WEBWIDGET_H__
 #define WEBKIT_GLUE_WEBWIDGET_H__
 
-#include "base/gfx/platform_canvas.h"
 #include "base/ref_counted.h"
+#include "skia/ext/platform_canvas.h"
 
 namespace gfx {
 class Rect;
diff --git a/webkit/glue/webwidget_impl.cc b/webkit/glue/webwidget_impl.cc
index 262b9b3..d15e015 100644
--- a/webkit/glue/webwidget_impl.cc
+++ b/webkit/glue/webwidget_impl.cc
@@ -19,9 +19,9 @@ MSVC_PUSH_WARNING_LEVEL(0);
 MSVC_POP_WARNING();
 
 #undef LOG
-#include "base/gfx/platform_canvas.h"
 #include "base/gfx/rect.h"
 #include "base/logging.h"
+#include "skia/ext/platform_canvas.h"
 #include "webkit/glue/event_conversion.h"
 #include "webkit/glue/glue_util.h"
 #include "webkit/glue/webinputevent.h"
diff --git a/webkit/port/platform/graphics/FontWin.cpp b/webkit/port/platform/graphics/FontWin.cpp
index 17c3668..ac28623 100644
--- a/webkit/port/platform/graphics/FontWin.cpp
+++ b/webkit/port/platform/graphics/FontWin.cpp
@@ -32,12 +32,11 @@
 #include "GlyphBuffer.h"
 #include "PlatformContextSkia.h"
 #include "SimpleFontData.h"
+#include "SkiaUtils.h"
 #include "UniscribeHelperTextRun.h"
 
-#include "base/gfx/platform_canvas_win.h"
-#include "base/gfx/skia_utils.h"
-#include "graphics/SkiaUtils.h"
-
+#include "base/gfx/skia_utils.h"  // TODO(brettw) remove this dependency.
+#include "skia/ext/platform_canvas_win.h"
 
 namespace WebCore {
 
diff --git a/webkit/port/platform/graphics/GraphicsContextSkia.cpp b/webkit/port/platform/graphics/GraphicsContextSkia.cpp
index 5579170..7f78bab 100644
--- a/webkit/port/platform/graphics/GraphicsContextSkia.cpp
+++ b/webkit/port/platform/graphics/GraphicsContextSkia.cpp
@@ -14,9 +14,9 @@
 ** limitations under the License.
 */
 
+#include "config.h"
 #include <math.h>
 
-#include "config.h"
 #include "GraphicsContext.h"
 #include "GraphicsContextPlatformPrivate.h"
 #include "GraphicsContextPrivate.h"
@@ -33,12 +33,11 @@
 #include "SkBitmap.h"
 #include "SkBlurDrawLooper.h"
 #include "SkCornerPathEffect.h"
+#include "skia/ext/platform_canvas.h"
 #include "SkiaUtils.h"
 #include "SkShader.h"
 #include "wtf/MathExtras.h"
 
-#include "base/gfx/platform_canvas.h"
-
 using namespace std;
 
 namespace WebCore {
diff --git a/webkit/port/platform/graphics/ImageSkia.cpp b/webkit/port/platform/graphics/ImageSkia.cpp
index bdfb0f1..cfdc739 100644
--- a/webkit/port/platform/graphics/ImageSkia.cpp
+++ b/webkit/port/platform/graphics/ImageSkia.cpp
@@ -43,8 +43,8 @@
 #include "SkiaUtils.h"
 #include "SkShader.h"
 
-#include "base/gfx/image_operations.h"
-#include "base/gfx/platform_canvas.h"
+#include "base/gfx/image_operations.h"  // TODO(brettw) remove this dependency.
+#include "skia/ext/platform_canvas.h"
 
 namespace WebCore {
 
diff --git a/webkit/port/platform/graphics/PlatformContextSkia.cpp b/webkit/port/platform/graphics/PlatformContextSkia.cpp
index fd5cf91..06b3c0a 100644
--- a/webkit/port/platform/graphics/PlatformContextSkia.cpp
+++ b/webkit/port/platform/graphics/PlatformContextSkia.cpp
@@ -34,9 +34,9 @@
 #include "SkiaUtils.h"
 #include "wtf/MathExtras.h"
 
-#include "base/gfx/image_operations.h"
-#include "base/gfx/platform_canvas.h"
-#include "base/gfx/skia_utils.h"
+#include "base/gfx/image_operations.h"  // TODO(brettw) remove this depencency.
+#include "base/gfx/skia_utils.h"  // TODO(brettw) remove this depencency.
+#include "skia/ext/platform_canvas.h"
 
 #include "SkBitmap.h"
 #include "SkColorPriv.h"
diff --git a/webkit/port/platform/graphics/PlatformContextSkia.h b/webkit/port/platform/graphics/PlatformContextSkia.h
index e4ddfb1..2e6e4b6 100644
--- a/webkit/port/platform/graphics/PlatformContextSkia.h
+++ b/webkit/port/platform/graphics/PlatformContextSkia.h
@@ -29,11 +29,11 @@
 #ifndef PlatformContextSkia_h
 #define PlatformContextSkia_h
 
-#include "base/gfx/platform_canvas.h"
 
 #include "SkDashPathEffect.h"
 #include "SkDrawLooper.h"
 #include "SkDeque.h"
+#include "skia/ext/platform_canvas.h"
 #include "SkPaint.h"
 #include "SkPath.h"
 
diff --git a/webkit/tools/test_shell/test_shell.cc b/webkit/tools/test_shell/test_shell.cc
index 523bd83..01cd638 100644
--- a/webkit/tools/test_shell/test_shell.cc
+++ b/webkit/tools/test_shell/test_shell.cc
@@ -8,7 +8,6 @@
 #include "base/debug_on_start.h"
 #include "base/file_path.h"
 #include "base/file_util.h"
-#include "base/gfx/bitmap_platform_device.h"
 #include "base/gfx/png_encoder.h"
 #include "base/gfx/size.h"
 #include "base/icu_util.h"
@@ -22,6 +21,7 @@
 #include "net/base/mime_util.h"
 #include "net/url_request/url_request_file_job.h"
 #include "net/url_request/url_request_filter.h"
+#include "skia/ext/bitmap_platform_device.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "webkit/glue/webdatasource.h"
 #include "webkit/glue/webframe.h"
diff --git a/webkit/tools/test_shell/test_shell_win.cc b/webkit/tools/test_shell/test_shell_win.cc
index eac2e02f..5b41439 100644
--- a/webkit/tools/test_shell/test_shell_win.cc
+++ b/webkit/tools/test_shell/test_shell_win.cc
@@ -12,7 +12,6 @@
 #include "webkit/tools/test_shell/test_shell.h"
 
 #include "base/command_line.h"
-#include "base/gfx/bitmap_platform_device.h"
 #include "base/memory_debug.h"
 #include "base/message_loop.h"
 #include "base/path_service.h"
@@ -24,6 +23,7 @@
 #include "breakpad/src/client/windows/handler/exception_handler.h"
 #include "net/http/http_network_layer.h"
 #include "net/url_request/url_request_file_job.h"
+#include "skia/ext/bitmap_platform_device.h"
 #include "webkit/glue/webdatasource.h"
 #include "webkit/glue/webframe.h"
 #include "webkit/glue/webkit_glue.h"
diff --git a/webkit/tools/test_shell/webview_host_gtk.cc b/webkit/tools/test_shell/webview_host_gtk.cc
index 1f95274..9673f2f 100644
--- a/webkit/tools/test_shell/webview_host_gtk.cc
+++ b/webkit/tools/test_shell/webview_host_gtk.cc
@@ -6,10 +6,10 @@
 
 #include "webkit/tools/test_shell/webview_host.h"
 
-#include "base/gfx/platform_canvas.h"
 #include "base/gfx/rect.h"
 #include "base/gfx/size.h"
 #include "base/logging.h"
+#include "skia/ext/platform_canvas.h"
 #include "webkit/glue/webinputevent.h"
 #include "webkit/glue/webview.h"
 
diff --git a/webkit/tools/test_shell/webview_host_win.cc b/webkit/tools/test_shell/webview_host_win.cc
index 3713b3f..5b13a7b 100644
--- a/webkit/tools/test_shell/webview_host_win.cc
+++ b/webkit/tools/test_shell/webview_host_win.cc
@@ -4,10 +4,10 @@
 
 #include "webkit/tools/test_shell/webview_host.h"
 
-#include "base/gfx/platform_canvas.h"
 #include "base/gfx/rect.h"
 #include "base/gfx/size.h"
 #include "base/win_util.h"
+#include "skia/ext/platform_canvas.h"
 #include "webkit/glue/webinputevent.h"
 #include "webkit/glue/webview.h"
 
diff --git a/webkit/tools/test_shell/webwidget_host.h b/webkit/tools/test_shell/webwidget_host.h
index 3cb400a..cb6c3f1 100644
--- a/webkit/tools/test_shell/webwidget_host.h
+++ b/webkit/tools/test_shell/webwidget_host.h
@@ -7,9 +7,9 @@
 
 #include "base/basictypes.h"
 #include "base/gfx/native_widget_types.h"
-#include "base/gfx/platform_canvas.h"
 #include "base/gfx/rect.h"
 #include "base/scoped_ptr.h"
+#include "skia/ext/platform_canvas.h"
 
 class WebWidget;
 class WebWidgetDelegate;
diff --git a/webkit/tools/test_shell/webwidget_host_gtk.cc b/webkit/tools/test_shell/webwidget_host_gtk.cc
index 23d8d8a..08e8753 100644
--- a/webkit/tools/test_shell/webwidget_host_gtk.cc
+++ b/webkit/tools/test_shell/webwidget_host_gtk.cc
@@ -8,9 +8,9 @@
 #include <gtk/gtk.h>
 
 #include "base/logging.h"
-#include "base/gfx/platform_canvas_linux.h"
-#include "base/gfx/platform_device_linux.h"
-#include "base/gfx/bitmap_platform_device_linux.h"
+#include "skia/ext/bitmap_platform_device_linux.h"
+#include "skia/ext/platform_canvas_linux.h"
+#include "skia/ext/platform_device_linux.h"
 #include "webkit/glue/webinputevent.h"
 #include "webkit/glue/webwidget.h"
 
diff --git a/webkit/tools/test_shell/webwidget_host_win.cc b/webkit/tools/test_shell/webwidget_host_win.cc
index 5c384a5..6783b91 100644
--- a/webkit/tools/test_shell/webwidget_host_win.cc
+++ b/webkit/tools/test_shell/webwidget_host_win.cc
@@ -4,11 +4,11 @@
 
 #include "webkit/tools/test_shell/webwidget_host.h"
 
-#include "base/gfx/platform_canvas.h"
-#include "base/gfx/platform_canvas_win.h"
 #include "base/gfx/rect.h"
 #include "base/logging.h"
 #include "base/win_util.h"
+#include "skia/ext/platform_canvas.h"
+#include "skia/ext/platform_canvas_win.h"
 #include "webkit/glue/webinputevent.h"
 #include "webkit/glue/webwidget.h"