diff options
Diffstat (limited to 'chrome/browser')
-rw-r--r-- | chrome/browser/fav_icon_helper.cc | 6 | ||||
-rw-r--r-- | chrome/browser/importer/importer.cc | 6 | ||||
-rw-r--r-- | chrome/browser/views/tabs/tab_renderer.cc | 6 |
3 files changed, 9 insertions, 9 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); |