diff options
| author | reed@google.com <reed@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-07-01 13:02:52 +0000 |
|---|---|---|
| committer | reed@google.com <reed@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-07-01 13:02:52 +0000 |
| commit | b2f17e925b2bf0dfdbcc7e518703f3d5795c9622 (patch) | |
| tree | 2958e6b421e3de2a318ff5ff1e9dafe66b65681e /components/favicon_base | |
| parent | 73c5b69dc3c8d77403eaa0e2a3f2617842f05582 (diff) | |
| download | chromium_src-b2f17e925b2bf0dfdbcc7e518703f3d5795c9622.zip chromium_src-b2f17e925b2bf0dfdbcc7e518703f3d5795c9622.tar.gz chromium_src-b2f17e925b2bf0dfdbcc7e518703f3d5795c9622.tar.bz2 | |
setConfig is deprecated, use setInfo or allocPixels instead
kPMColor_SkColorType -> kN32_SkColorType
TBR=scherkus@chromium.org,benwells@chromium.org
BUG=skia:2706
Review URL: https://codereview.chromium.org/357213002
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@280805 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'components/favicon_base')
| -rw-r--r-- | components/favicon_base/favicon_util.cc | 5 | ||||
| -rw-r--r-- | components/favicon_base/select_favicon_frames.cc | 3 |
2 files changed, 2 insertions, 6 deletions
diff --git a/components/favicon_base/favicon_util.cc b/components/favicon_base/favicon_util.cc index 84ead61..54efdf4 100644 --- a/components/favicon_base/favicon_util.cc +++ b/components/favicon_base/favicon_util.cc @@ -116,10 +116,7 @@ SkBitmap ResizeBitmapByDownsamplingIfPossible( // Use nearest neighbour resampling if upsampling by an integer. This // makes the result look similar to the result of SelectFaviconFrames(). SkBitmap bitmap; - bitmap.setConfig(SkBitmap::kARGB_8888_Config, - desired_size_in_pixel, - desired_size_in_pixel); - bitmap.allocPixels(); + bitmap.allocN32Pixels(desired_size_in_pixel, desired_size_in_pixel); if (!best_bitmap.isOpaque()) bitmap.eraseARGB(0, 0, 0, 0); diff --git a/components/favicon_base/select_favicon_frames.cc b/components/favicon_base/select_favicon_frames.cc index 3122365..671d732 100644 --- a/components/favicon_base/select_favicon_frames.cc +++ b/components/favicon_base/select_favicon_frames.cc @@ -35,8 +35,7 @@ size_t BiggestCandidate(const std::vector<gfx::Size>& candidate_sizes) { SkBitmap SampleNearestNeighbor(const SkBitmap& contents, int desired_size) { SkBitmap bitmap; - bitmap.setConfig(SkBitmap::kARGB_8888_Config, desired_size, desired_size); - bitmap.allocPixels(); + bitmap.allocN32Pixels(desired_size, desired_size); if (!contents.isOpaque()) bitmap.eraseARGB(0, 0, 0, 0); |