From 83c9e65546312a8d70df850a82f390f190fe4413 Mon Sep 17 00:00:00 2001 From: "brettw@google.com" Date: Wed, 3 Dec 2008 16:22:10 +0000 Subject: Move convolver and image_operations from base/gfx to skia/ext. This is just like my previous change except does no namespace renaming and doesn't touch skia_utils. Review URL: http://codereview.chromium.org/13080 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@6290 0039d316-1c4b-4281-b951-d872f2087c98 --- chrome/browser/download/download_util.cc | 2 +- chrome/browser/fav_icon_helper.cc | 2 +- chrome/browser/importer/importer.cc | 2 +- chrome/browser/views/tabs/tab_renderer.cc | 2 +- chrome/common/gfx/icon_util.cc | 2 +- chrome/renderer/render_view.cc | 2 +- chrome/views/button.cc | 2 +- 7 files changed, 7 insertions(+), 7 deletions(-) (limited to 'chrome') diff --git a/chrome/browser/download/download_util.cc b/chrome/browser/download/download_util.cc index 262c507..5af7c47 100644 --- a/chrome/browser/download/download_util.cc +++ b/chrome/browser/download/download_util.cc @@ -11,7 +11,6 @@ #include "base/base_drag_source.h" #include "base/file_util.h" #include "base/scoped_clipboard_writer.h" -#include "base/gfx/image_operations.h" #include "base/string_util.h" #include "chrome/app/locales/locale_settings.h" #include "chrome/app/theme/theme_resources.h" @@ -25,6 +24,7 @@ #include "chrome/common/resource_bundle.h" #include "chrome/views/view.h" #include "generated_resources.h" +#include "skia/ext/image_operations.h" #include "SkPath.h" #include "SkShader.h" diff --git a/chrome/browser/fav_icon_helper.cc b/chrome/browser/fav_icon_helper.cc index f77b05c..a2c23e4 100644 --- a/chrome/browser/fav_icon_helper.cc +++ b/chrome/browser/fav_icon_helper.cc @@ -4,7 +4,6 @@ #include "chrome/browser/fav_icon_helper.h" -#include "base/gfx/image_operations.h" #include "base/gfx/png_decoder.h" #include "base/gfx/png_encoder.h" #include "chrome/browser/navigation_entry.h" @@ -13,6 +12,7 @@ #include "chrome/browser/render_view_host.h" #include "chrome/browser/web_contents.h" #include "chrome/common/gfx/favicon_size.h" +#include "skia/ext/image_operations.h" FavIconHelper::FavIconHelper(WebContents* web_contents) : web_contents_(web_contents), diff --git a/chrome/browser/importer/importer.cc b/chrome/browser/importer/importer.cc index 3ce8996..77711ac 100644 --- a/chrome/browser/importer/importer.cc +++ b/chrome/browser/importer/importer.cc @@ -8,7 +8,6 @@ #include #include "base/file_util.h" -#include "base/gfx/image_operations.h" #include "base/gfx/png_encoder.h" #include "base/string_util.h" #include "chrome/browser/bookmarks/bookmark_model.h" @@ -31,6 +30,7 @@ #include "chrome/common/pref_service.h" #include "chrome/common/win_util.h" #include "chrome/views/window.h" +#include "skia/ext/image_operations.h" #include "webkit/glue/image_decoder.h" #include "generated_resources.h" diff --git a/chrome/browser/views/tabs/tab_renderer.cc b/chrome/browser/views/tabs/tab_renderer.cc index f1d00b3..6026b9e 100644 --- a/chrome/browser/views/tabs/tab_renderer.cc +++ b/chrome/browser/views/tabs/tab_renderer.cc @@ -6,7 +6,6 @@ #include "chrome/browser/views/tabs/tab_renderer.h" -#include "base/gfx/image_operations.h" #include "chrome/app/theme/theme_resources.h" #include "chrome/browser/browser.h" #include "chrome/browser/tabs/tab_strip_model.h" @@ -17,6 +16,7 @@ #include "chrome/common/resource_bundle.h" #include "chrome/common/win_util.h" #include "generated_resources.h" +#include "skia/ext/image_operations.h" static const int kLeftPadding = 16; static const int kTopPadding = 6; diff --git a/chrome/common/gfx/icon_util.cc b/chrome/common/gfx/icon_util.cc index e717c79..58c8020 100644 --- a/chrome/common/gfx/icon_util.cc +++ b/chrome/common/gfx/icon_util.cc @@ -4,10 +4,10 @@ #include "chrome/common/gfx/icon_util.h" #include "base/file_util.h" -#include "base/gfx/image_operations.h" #include "base/gfx/size.h" #include "base/logging.h" #include "chrome/common/win_util.h" +#include "skia/ext/image_operations.h" #include "skia/include/SkBitmap.h" // Defining the dimensions for the icon images. We store only one value because diff --git a/chrome/renderer/render_view.cc b/chrome/renderer/render_view.cc index 23fab18..ec8bce5 100644 --- a/chrome/renderer/render_view.cc +++ b/chrome/renderer/render_view.cc @@ -10,7 +10,6 @@ #include "base/command_line.h" #include "base/gfx/gdi_util.h" -#include "base/gfx/image_operations.h" #include "base/gfx/native_theme.h" #include "base/gfx/png_encoder.h" #include "base/string_piece.h" @@ -38,6 +37,7 @@ #include "net/base/escape.h" #include "net/base/net_errors.h" #include "skia/ext/bitmap_platform_device.h" +#include "skia/ext/image_operations.h" #include "skia/ext/vector_canvas.h" #include "webkit/default_plugin/default_plugin_shared.h" #include "webkit/glue/dom_operations.h" diff --git a/chrome/views/button.cc b/chrome/views/button.cc index 93e2e3c..11dad29 100644 --- a/chrome/views/button.cc +++ b/chrome/views/button.cc @@ -7,12 +7,12 @@ #include #include -#include "base/gfx/image_operations.h" #include "chrome/app/chrome_dll_resource.h" #include "chrome/common/gfx/chrome_canvas.h" #include "chrome/common/l10n_util.h" #include "chrome/common/throb_animation.h" #include "chrome/views/event.h" +#include "skia/ext/image_operations.h" #include "generated_resources.h" -- cgit v1.1