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

18 files changed, 29 insertions, 31 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"
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"