Move base/gfx/skia_util to skia/ext/skia_util_win.

In a later pass, I will separate off the cross-platform part of this file into skia/ext/skia_util (only one function).
Review URL: http://codereview.chromium.org/13101

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

23 files changed, 30 insertions, 31 deletions

diff --git a/base/build/base_gfx.vcproj b/base/build/base_gfx.vcproj
index 355d19a..70875a9 100644
--- a/base/build/base_gfx.vcproj
+++ b/base/build/base_gfx.vcproj
@@ -177,14 +177,6 @@
 			RelativePath="..\gfx\size.h"
 			>
 		</File>
-		<File
-			RelativePath="..\gfx\skia_utils.cc"
-			>
-		</File>
-		<File
-			RelativePath="..\gfx\skia_utils.h"
-			>
-		</File>
 	</Files>
 	<Globals>
 	</Globals>
diff --git a/base/gfx/base_gfx.scons b/base/gfx/base_gfx.scons
index e699344..a69206b 100644
--- a/base/gfx/base_gfx.scons
+++ b/base/gfx/base_gfx.scons
@@ -32,7 +32,6 @@ input_files = [
     'point.cc',
     'rect.cc',
     'size.cc',
-    'skia_utils.cc',
 ]
 
 if env['PLATFORM'] in ('posix', 'darwin'):
@@ -41,7 +40,6 @@ if env['PLATFORM'] in ('posix', 'darwin'):
   to_be_ported_files = [
       'gdi_util.cc',
       'native_theme.cc',
-      'skia_utils.cc',
   ]
   for remove in to_be_ported_files:
     input_files.remove(remove)
diff --git a/chrome/browser/autocomplete/autocomplete_edit.cc b/chrome/browser/autocomplete/autocomplete_edit.cc
index cfef6a6..60f1387 100644
--- a/chrome/browser/autocomplete/autocomplete_edit.cc
+++ b/chrome/browser/autocomplete/autocomplete_edit.cc
@@ -8,7 +8,6 @@
 
 #include "base/base_drag_source.h"
 #include "base/clipboard.h"
-#include "base/gfx/skia_utils.h"
 #include "base/iat_patch.h"
 #include "base/ref_counted.h"
 #include "base/scoped_clipboard_writer.h"
@@ -35,6 +34,7 @@
 #include "chrome/common/win_util.h"
 #include "chrome/views/accessibility/autocomplete_accessibility.h"
 #include "googleurl/src/url_util.h"
+#include "skia/ext/skia_utils_win.h"
 
 #include "generated_resources.h"
 
diff --git a/chrome/browser/views/bookmark_bar_view.cc b/chrome/browser/views/bookmark_bar_view.cc
index aaca5af..54c3c95 100644
--- a/chrome/browser/views/bookmark_bar_view.cc
+++ b/chrome/browser/views/bookmark_bar_view.cc
@@ -7,7 +7,6 @@
 #include <limits>
 
 #include "base/base_drag_source.h"
-#include "base/gfx/skia_utils.h"
 #include "chrome/app/theme/theme_resources.h"
 #include "chrome/browser/bookmarks/bookmark_context_menu.h"
 #include "chrome/browser/bookmarks/bookmark_utils.h"
@@ -45,6 +44,7 @@
 #include "chrome/views/widget.h"
 #include "chrome/views/window.h"
 #include "generated_resources.h"
+#include "skia/ext/skia_utils_win.h"
 
 using views::BaseButton;
 using views::DropTargetEvent;
diff --git a/chrome/browser/views/options/content_page_view.cc b/chrome/browser/views/options/content_page_view.cc
index e4e443d..627c387 100644
--- a/chrome/browser/views/options/content_page_view.cc
+++ b/chrome/browser/views/options/content_page_view.cc
@@ -11,7 +11,6 @@
 
 #include "base/file_util.h"
 #include "base/gfx/native_theme.h"
-#include "base/gfx/skia_utils.h"
 #include "chrome/app/theme/theme_resources.h"
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/shell_dialogs.h"
@@ -31,6 +30,7 @@
 #include "chrome/views/text_field.h"
 #include "chrome/views/widget.h"
 #include "generated_resources.h"
+#include "skia/ext/skia_utils_win.h"
 #include "skia/include/SkBitmap.h"
 
 namespace {
diff --git a/chrome/browser/views/options/fonts_page_view.cc b/chrome/browser/views/options/fonts_page_view.cc
index b41fb55..d73191b 100644
--- a/chrome/browser/views/options/fonts_page_view.cc
+++ b/chrome/browser/views/options/fonts_page_view.cc
@@ -10,7 +10,6 @@
 
 #include "base/file_util.h"
 #include "base/gfx/native_theme.h"
-#include "base/gfx/skia_utils.h"
 #include "base/string_util.h"
 #include "chrome/app/theme/theme_resources.h"
 #include "chrome/app/locales/locale_settings.h"
diff --git a/chrome/browser/views/options/languages_page_view.cc b/chrome/browser/views/options/languages_page_view.cc
index 118ac10..e9a1e8b 100644
--- a/chrome/browser/views/options/languages_page_view.cc
+++ b/chrome/browser/views/options/languages_page_view.cc
@@ -11,7 +11,6 @@
 #include "base/file_util.h"
 #include "base/string_util.h"
 #include "base/gfx/native_theme.h"
-#include "base/gfx/skia_utils.h"
 #include "base/string_util.h"
 #include "chrome/app/theme/theme_resources.h"
 #include "chrome/browser/browser_process.h"
diff --git a/chrome/browser/views/options/options_group_view.cc b/chrome/browser/views/options/options_group_view.cc
index bdf76ea..9ff07f5 100644
--- a/chrome/browser/views/options/options_group_view.cc
+++ b/chrome/browser/views/options/options_group_view.cc
@@ -8,7 +8,6 @@
 #include "chrome/browser/views/options/options_group_view.h"
 
 #include "base/gfx/native_theme.h"
-#include "base/gfx/skia_utils.h"
 #include "chrome/app/locales/locale_settings.h"
 #include "chrome/browser/views/standard_layout.h"
 #include "chrome/common/gfx/chrome_font.h"
diff --git a/chrome/common/gfx/color_utils.cc b/chrome/common/gfx/color_utils.cc
index 0b40436..1ab1849 100644
--- a/chrome/common/gfx/color_utils.cc
+++ b/chrome/common/gfx/color_utils.cc
@@ -12,10 +12,13 @@
 #include "chrome/common/gfx/color_utils.h"
 
 #include "base/basictypes.h"
-#include "base/gfx/skia_utils.h"
 #include "base/logging.h"
 #include "skia/include/SkBitmap.h"
 
+#if defined(OS_WIN)
+#include "skia/ext/skia_utils_win.h"
+#endif
+
 namespace color_utils {
 
 // These transformations are based on the equations in:
diff --git a/chrome/views/background.cc b/chrome/views/background.cc
index 72352b7..3642924 100644
--- a/chrome/views/background.cc
+++ b/chrome/views/background.cc
@@ -4,11 +4,11 @@
 
 #include "chrome/views/background.h"
 
-#include "base/gfx/skia_utils.h"
 #include "base/logging.h"
 #include "chrome/common/gfx/chrome_canvas.h"
 #include "chrome/views/painter.h"
 #include "chrome/views/view.h"
+#include "skia/ext/skia_utils_win.h"
 #include "skia/include/SkPaint.h"
 
 namespace views {
diff --git a/chrome/views/chrome_menu.cc b/chrome/views/chrome_menu.cc
index 549bedf..309109a 100644
--- a/chrome/views/chrome_menu.cc
+++ b/chrome/views/chrome_menu.cc
@@ -10,7 +10,6 @@
 
 #include "base/base_drag_source.h"
 #include "base/gfx/native_theme.h"
-#include "base/gfx/skia_utils.h"
 #include "base/message_loop.h"
 #include "base/task.h"
 #include "base/timer.h"
@@ -25,6 +24,7 @@
 #include "chrome/views/view_constants.h"
 #include "chrome/views/widget_win.h"
 #include "generated_resources.h"
+#include "skia/ext/skia_utils_win.h"
 
 #undef min
 #undef max
diff --git a/chrome/views/single_split_view.cc b/chrome/views/single_split_view.cc
index 2550c57..36e8519 100644
--- a/chrome/views/single_split_view.cc
+++ b/chrome/views/single_split_view.cc
@@ -4,9 +4,9 @@
 
 #include "chrome/views/single_split_view.h"
 
-#include "base/gfx/skia_utils.h"
 #include "chrome/common/gfx/chrome_canvas.h"
 #include "chrome/views/background.h"
+#include "skia/ext/skia_utils_win.h"
 
 namespace views {
 
diff --git a/chrome/views/tabbed_pane.cc b/chrome/views/tabbed_pane.cc
index 2638972..4ceb2e2 100644
--- a/chrome/views/tabbed_pane.cc
+++ b/chrome/views/tabbed_pane.cc
@@ -7,7 +7,6 @@
 #include <vssym32.h>
 
 #include "base/gfx/native_theme.h"
-#include "base/gfx/skia_utils.h"
 #include "base/logging.h"
 #include "chrome/common/gfx/chrome_canvas.h"
 #include "chrome/common/gfx/chrome_font.h"
@@ -18,6 +17,7 @@
 #include "chrome/views/background.h"
 #include "chrome/views/root_view.h"
 #include "chrome/views/widget_win.h"
+#include "skia/ext/skia_utils_win.h"
 #include "skia/include/SkColor.h"
 
 namespace views {
diff --git a/chrome/views/table_view.cc b/chrome/views/table_view.cc
index 8298cf6..175a96c 100644
--- a/chrome/views/table_view.cc
+++ b/chrome/views/table_view.cc
@@ -9,7 +9,6 @@
 
 #include "base/string_util.h"
 #include "base/win_util.h"
-#include "base/gfx/skia_utils.h"
 #include "chrome/common/gfx/chrome_canvas.h"
 #include "chrome/common/gfx/favicon_size.h"
 #include "chrome/common/gfx/icon_util.h"
@@ -18,6 +17,7 @@
 #include "chrome/views/hwnd_view.h"
 #include "SkBitmap.h"
 #include "SkColorFilter.h"
+#include "skia/ext/skia_utils_win.h"
 
 namespace views {
 
diff --git a/chrome/views/text_field.cc b/chrome/views/text_field.cc
index 24fdc5a..7bc4859 100644
--- a/chrome/views/text_field.cc
+++ b/chrome/views/text_field.cc
@@ -12,7 +12,6 @@
 #include <vsstyle.h>
 
 #include "base/gfx/native_theme.h"
-#include "base/gfx/skia_utils.h"
 #include "base/scoped_clipboard_writer.h"
 #include "base/string_util.h"
 #include "base/win_util.h"
@@ -25,6 +24,7 @@
 #include "chrome/views/hwnd_view.h"
 #include "chrome/views/menu.h"
 #include "chrome/views/widget.h"
+#include "skia/ext/skia_utils_win.h"
 
 #include "generated_resources.h"
 
diff --git a/skia/SConscript b/skia/SConscript
index 6006e6f..8733d466 100644
--- a/skia/SConscript
+++ b/skia/SConscript
@@ -183,6 +183,7 @@ if env['PLATFORM'] == 'win32':
   input_files.append('ext/bitmap_platform_device_win.cc')
   input_files.append('ext/platform_canvas_win.cc')
   input_files.append('ext/platform_device_win.cc')
+  input_files.append('ext/skia_utils_win.cc")
   input_files.append('ext/vector_canvas.cc')
   input_files.append('ext/vector_device.cc')
 
diff --git a/skia/ext/platform_device_win.cc b/skia/ext/platform_device_win.cc
index 15201c0..a712791 100644
--- a/skia/ext/platform_device_win.cc
+++ b/skia/ext/platform_device_win.cc
@@ -5,7 +5,7 @@
 #include "skia/ext/platform_device_win.h"
 
 #include "base/logging.h"
-#include "base/gfx/skia_utils.h"
+#include "skia/ext/skia_utils_win.h"
 #include "SkMatrix.h"
 #include "SkPath.h"
 #include "SkRegion.h"
diff --git a/base/gfx/skia_utils.cc b/skia/ext/skia_utils_win.cc
index 7b70056..dcac26f 100644
--- a/base/gfx/skia_utils.cc
+++ b/skia/ext/skia_utils_win.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 "base/gfx/skia_utils.h"
+#include "skia/ext/skia_utils_win.h"
 
 #include "base/logging.h"
 #include "SkRect.h"
diff --git a/base/gfx/skia_utils.h b/skia/ext/skia_utils_win.h
index 8509072..4ad7910 100644
--- a/base/gfx/skia_utils.h
+++ b/skia/ext/skia_utils_win.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 BASE_GFX_SKIA_UTILS_H__
-#define BASE_GFX_SKIA_UTILS_H__
+#ifndef BASE_GFX_SKIA_UTILS_WIN_H_
+#define BASE_GFX_SKIA_UTILS_WIN_H_
 
 #include "SkColor.h"
 #include "SkShader.h"
@@ -52,5 +52,5 @@ COLORREF SkColorToCOLORREF(SkColor color);
 
 }  // namespace gfx
 
-#endif
+#endif  // SKIA_EXT_SKIA_UTILS_WIN_H_
 
diff --git a/skia/ext/vector_device.cc b/skia/ext/vector_device.cc
index a587e0c..32449ad 100644
--- a/skia/ext/vector_device.cc
+++ b/skia/ext/vector_device.cc
@@ -5,9 +5,9 @@
 #include "skia/ext/vector_device.h"
 
 #include "base/gfx/gdi_util.h"
-#include "base/gfx/skia_utils.h"
 #include "base/logging.h"
 #include "base/scoped_handle.h"
+#include "skia/ext/skia_utils_win.h"
 
 #include "SkUtils.h"
 
diff --git a/skia/skia.vcproj b/skia/skia.vcproj
index 93988ad..b44b455 100644
--- a/skia/skia.vcproj
+++ b/skia/skia.vcproj
@@ -1361,6 +1361,14 @@
 				>
 			</File>
 			<File
+				RelativePath=".\ext\skia_utils_win.cc"
+				>
+			</File>
+			<File
+				RelativePath=".\ext\skia_utils_win.h"
+				>
+			</File>
+			<File
 				RelativePath=".\ext\vector_canvas.cc"
 				>
 			</File>
diff --git a/webkit/port/platform/graphics/PlatformContextSkia.cpp b/webkit/port/platform/graphics/PlatformContextSkia.cpp
index 8933795..e691b5b 100644
--- a/webkit/port/platform/graphics/PlatformContextSkia.cpp
+++ b/webkit/port/platform/graphics/PlatformContextSkia.cpp
@@ -34,7 +34,6 @@
 #include "SkiaUtils.h"
 #include "wtf/MathExtras.h"
 
-#include "base/gfx/skia_utils.h"  // TODO(brettw) remove this depencency.
 #include "skia/ext/image_operations.h"
 #include "skia/ext/platform_canvas.h"
 
diff --git a/webkit/port/rendering/RenderThemeWin.cpp b/webkit/port/rendering/RenderThemeWin.cpp
index 907a6e4..a4614c1 100644
--- a/webkit/port/rendering/RenderThemeWin.cpp
+++ b/webkit/port/rendering/RenderThemeWin.cpp
@@ -37,9 +37,10 @@
 #include "SkiaUtils.h"
 #include "ThemeHelperWin.h"
 
+// TODO(brettw) all of these dependencies should eventually be removed.
 #include "base/gfx/native_theme.h"
-#include "base/gfx/skia_utils.h"
 #include "base/win_util.h"
+#include "skia/ext/skia_utils_win.h"
 
 namespace {