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

6 files changed, 8 insertions, 8 deletions

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"