summaryrefslogtreecommitdiffstats
path: root/chrome
diff options
context:
space:
mode:
authorbrettw@google.com <brettw@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2008-12-10 16:16:35 +0000
committerbrettw@google.com <brettw@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2008-12-10 16:16:35 +0000
commitc4b347b36152d693f2914f13c3b6f83f16a6d9b8 (patch)
tree9ef3b6ea138959fb4f59f97a791c0c4c4efebecd /chrome
parentf3750b3846cc639d75046be16826ff1cf109d76e (diff)
downloadchromium_src-c4b347b36152d693f2914f13c3b6f83f16a6d9b8.zip
chromium_src-c4b347b36152d693f2914f13c3b6f83f16a6d9b8.tar.gz
chromium_src-c4b347b36152d693f2914f13c3b6f83f16a6d9b8.tar.bz2
Reverting 6709,6708,6706.
Review URL: http://codereview.chromium.org/13345 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@6710 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome')
-rw-r--r--chrome/browser/fav_icon_helper.cc6
-rw-r--r--chrome/browser/importer/importer.cc6
-rw-r--r--chrome/browser/views/tabs/tab_renderer.cc6
-rw-r--r--chrome/common/gfx/icon_util.cc6
-rw-r--r--chrome/renderer/render_view.cc4
-rw-r--r--chrome/views/button.cc2
6 files changed, 15 insertions, 15 deletions
diff --git a/chrome/browser/fav_icon_helper.cc b/chrome/browser/fav_icon_helper.cc
index b7258a5..a2c23e4 100644
--- a/chrome/browser/fav_icon_helper.cc
+++ b/chrome/browser/fav_icon_helper.cc
@@ -257,9 +257,9 @@ SkBitmap FavIconHelper::ConvertToFavIconSize(const SkBitmap& image) {
int height = image.height();
if (width > 0 && height > 0) {
calc_favicon_target_size(&width, &height);
- return skia::ImageOperations::Resize(image,
- skia::ImageOperations::RESIZE_LANCZOS3,
- width, height);
+ return gfx::ImageOperations::Resize(
+ image, gfx::ImageOperations::RESIZE_LANCZOS3,
+ gfx::Size(width, height));
}
return image;
}
diff --git a/chrome/browser/importer/importer.cc b/chrome/browser/importer/importer.cc
index 9b83e30..77711ac 100644
--- a/chrome/browser/importer/importer.cc
+++ b/chrome/browser/importer/importer.cc
@@ -384,9 +384,9 @@ bool Importer::ReencodeFavicon(const unsigned char* src_data, size_t src_len,
int new_width = decoded.width();
int new_height = decoded.height();
calc_favicon_target_size(&new_width, &new_height);
- decoded = skia::ImageOperations::Resize(
- decoded, skia::ImageOperations::RESIZE_LANCZOS3,
- new_width, new_height);
+ decoded = gfx::ImageOperations::Resize(
+ decoded, gfx::ImageOperations::RESIZE_LANCZOS3,
+ gfx::Size(new_width, new_height));
}
// Encode our bitmap as a PNG.
diff --git a/chrome/browser/views/tabs/tab_renderer.cc b/chrome/browser/views/tabs/tab_renderer.cc
index 4581f6d..6026b9e 100644
--- a/chrome/browser/views/tabs/tab_renderer.cc
+++ b/chrome/browser/views/tabs/tab_renderer.cc
@@ -586,13 +586,13 @@ void TabRenderer::PaintActiveTabBackground(ChromeCanvas* canvas) {
void TabRenderer::PaintHoverTabBackground(ChromeCanvas* canvas,
double opacity) {
bool is_otr = data_.off_the_record;
- SkBitmap left = skia::ImageOperations::CreateBlendedBitmap(
+ SkBitmap left = gfx::ImageOperations::CreateBlendedBitmap(
(is_otr ? *tab_inactive_otr_l : *tab_inactive_l),
*tab_hover_l, opacity);
- SkBitmap center = skia::ImageOperations::CreateBlendedBitmap(
+ SkBitmap center = gfx::ImageOperations::CreateBlendedBitmap(
(is_otr ? *tab_inactive_otr_c : *tab_inactive_c),
*tab_hover_c, opacity);
- SkBitmap right = skia::ImageOperations::CreateBlendedBitmap(
+ SkBitmap right = gfx::ImageOperations::CreateBlendedBitmap(
(is_otr ? *tab_inactive_otr_r : *tab_inactive_r),
*tab_hover_r, opacity);
diff --git a/chrome/common/gfx/icon_util.cc b/chrome/common/gfx/icon_util.cc
index b3b56a2..58c8020 100644
--- a/chrome/common/gfx/icon_util.cc
+++ b/chrome/common/gfx/icon_util.cc
@@ -403,9 +403,9 @@ void IconUtil::CreateResizedBitmapSet(const SkBitmap& bitmap_to_resize,
inserted_original_bitmap = true;
}
}
- bitmaps->push_back(skia::ImageOperations::Resize(
- bitmap_to_resize, skia::ImageOperations::RESIZE_LANCZOS3,
- icon_dimensions_[i], icon_dimensions_[i]));
+ bitmaps->push_back(gfx::ImageOperations::Resize(
+ bitmap_to_resize, gfx::ImageOperations::RESIZE_LANCZOS3,
+ gfx::Size(icon_dimensions_[i], icon_dimensions_[i])));
}
if (!inserted_original_bitmap) {
diff --git a/chrome/renderer/render_view.cc b/chrome/renderer/render_view.cc
index 4b00d9b..ec4fec0 100644
--- a/chrome/renderer/render_view.cc
+++ b/chrome/renderer/render_view.cc
@@ -798,8 +798,8 @@ bool RenderView::CaptureThumbnail(WebFrame* frame,
device->accessBitmap(false).extractSubset(&subset, src_rect);
// Resample the subset that we want to get it the right size.
- *thumbnail = skia::ImageOperations::Resize(
- subset, skia::ImageOperations::RESIZE_LANCZOS3, w, h);
+ *thumbnail = gfx::ImageOperations::Resize(
+ subset, gfx::ImageOperations::RESIZE_LANCZOS3, gfx::Size(w, h));
score->boring_score = CalculateBoringScore(thumbnail);
diff --git a/chrome/views/button.cc b/chrome/views/button.cc
index 36c228a..11dad29 100644
--- a/chrome/views/button.cc
+++ b/chrome/views/button.cc
@@ -105,7 +105,7 @@ SkBitmap Button::GetImageToPaint() {
SkBitmap img;
if (!images_[BS_HOT].isNull() && hover_animation_->IsAnimating()) {
- img = skia::ImageOperations::CreateBlendedBitmap(images_[BS_NORMAL],
+ img = gfx::ImageOperations::CreateBlendedBitmap(images_[BS_NORMAL],
images_[BS_HOT], hover_animation_->GetCurrentValue());
} else {
img = images_[GetState()];