diff options
| author | brettw@google.com <brettw@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2008-12-12 20:19:14 +0000 |
|---|---|---|
| committer | brettw@google.com <brettw@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2008-12-12 20:19:14 +0000 |
| commit | 465b34b73d11d017dfc546821c8dcb8e4dbe4b56 (patch) | |
| tree | 465760a07b08c237db9026fb968374cad3be6e92 /chrome | |
| parent | 76960a40e09420ac2e302f4b307c4dd0d8a61ce8 (diff) | |
| download | chromium_src-465b34b73d11d017dfc546821c8dcb8e4dbe4b56.zip chromium_src-465b34b73d11d017dfc546821c8dcb8e4dbe4b56.tar.gz chromium_src-465b34b73d11d017dfc546821c8dcb8e4dbe4b56.tar.bz2 | |
Move Image operations and convolver to the skia namespace and clean up a few (but not all) base types.
Review URL: http://codereview.chromium.org/13726
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@6921 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome')
| -rw-r--r-- | chrome/browser/fav_icon_helper.cc | 6 | ||||
| -rw-r--r-- | chrome/browser/importer/importer.cc | 5 | ||||
| -rw-r--r-- | chrome/browser/views/tabs/tab_renderer.cc | 6 | ||||
| -rw-r--r-- | chrome/common/gfx/icon_util.cc | 6 | ||||
| -rw-r--r-- | chrome/renderer/render_view.cc | 4 | ||||
| -rw-r--r-- | chrome/views/button.cc | 2 |
6 files changed, 14 insertions, 15 deletions
diff --git a/chrome/browser/fav_icon_helper.cc b/chrome/browser/fav_icon_helper.cc index a2c23e4..63f39e3 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 gfx::ImageOperations::Resize( - image, gfx::ImageOperations::RESIZE_LANCZOS3, - gfx::Size(width, height)); + return skia::ImageOperations::Resize( + image, skia::ImageOperations::RESIZE_LANCZOS3, + width, height); } return image; } diff --git a/chrome/browser/importer/importer.cc b/chrome/browser/importer/importer.cc index f29b292..dcc1438 100644 --- a/chrome/browser/importer/importer.cc +++ b/chrome/browser/importer/importer.cc @@ -384,9 +384,8 @@ 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 = gfx::ImageOperations::Resize( - decoded, gfx::ImageOperations::RESIZE_LANCZOS3, - gfx::Size(new_width, new_height)); + decoded = skia::ImageOperations::Resize( + decoded, skia::ImageOperations::RESIZE_LANCZOS3, 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 6026b9e..4581f6d 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 = gfx::ImageOperations::CreateBlendedBitmap( + SkBitmap left = skia::ImageOperations::CreateBlendedBitmap( (is_otr ? *tab_inactive_otr_l : *tab_inactive_l), *tab_hover_l, opacity); - SkBitmap center = gfx::ImageOperations::CreateBlendedBitmap( + SkBitmap center = skia::ImageOperations::CreateBlendedBitmap( (is_otr ? *tab_inactive_otr_c : *tab_inactive_c), *tab_hover_c, opacity); - SkBitmap right = gfx::ImageOperations::CreateBlendedBitmap( + SkBitmap right = skia::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 58c8020..b3b56a2 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(gfx::ImageOperations::Resize( - bitmap_to_resize, gfx::ImageOperations::RESIZE_LANCZOS3, - gfx::Size(icon_dimensions_[i], icon_dimensions_[i]))); + bitmaps->push_back(skia::ImageOperations::Resize( + bitmap_to_resize, skia::ImageOperations::RESIZE_LANCZOS3, + 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 ec4fec0..4b00d9b 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 = gfx::ImageOperations::Resize( - subset, gfx::ImageOperations::RESIZE_LANCZOS3, gfx::Size(w, h)); + *thumbnail = skia::ImageOperations::Resize( + subset, skia::ImageOperations::RESIZE_LANCZOS3, w, h); score->boring_score = CalculateBoringScore(thumbnail); diff --git a/chrome/views/button.cc b/chrome/views/button.cc index 11dad29..36c228a 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 = gfx::ImageOperations::CreateBlendedBitmap(images_[BS_NORMAL], + img = skia::ImageOperations::CreateBlendedBitmap(images_[BS_NORMAL], images_[BS_HOT], hover_animation_->GetCurrentValue()); } else { img = images_[GetState()]; |