diff options
| author | reed@google.com <reed@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-07-02 15:56:30 +0000 |
|---|---|---|
| committer | reed@google.com <reed@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-07-02 15:56:30 +0000 |
| commit | f47d8ca1c22207d5d2d0d34724bcc41ae72bbc1a (patch) | |
| tree | 51804fd4f5ae58849e8224350263392662a67439 /ash/desktop_background | |
| parent | 5ba847593e0009ed9e40be8fc9adfc1ffda93310 (diff) | |
| download | chromium_src-f47d8ca1c22207d5d2d0d34724bcc41ae72bbc1a.zip chromium_src-f47d8ca1c22207d5d2d0d34724bcc41ae72bbc1a.tar.gz chromium_src-f47d8ca1c22207d5d2d0d34724bcc41ae72bbc1a.tar.bz2 | |
setConfig is deprecated, use setInfo or allocPixels instead.
kPNColor_SkColorType is now kN32_SkColorType
TBR=
BUG=skia:2706
Review URL: https://codereview.chromium.org/363933002
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@281044 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ash/desktop_background')
| -rw-r--r-- | ash/desktop_background/desktop_background_controller_unittest.cc | 3 | ||||
| -rw-r--r-- | ash/desktop_background/wallpaper_resizer_unittest.cc | 3 |
2 files changed, 2 insertions, 4 deletions
diff --git a/ash/desktop_background/desktop_background_controller_unittest.cc b/ash/desktop_background/desktop_background_controller_unittest.cc index 609ea14..fa2e2a4 100644 --- a/ash/desktop_background/desktop_background_controller_unittest.cc +++ b/ash/desktop_background/desktop_background_controller_unittest.cc @@ -94,8 +94,7 @@ class DesktopBackgroundControllerTest : public test::AshTestBase { // Creates an image of size |size|. gfx::ImageSkia CreateImage(int width, int height, SkColor color) { SkBitmap bitmap; - bitmap.setConfig(SkBitmap::kARGB_8888_Config, width, height); - bitmap.allocPixels(); + bitmap.allocN32Pixels(width, height); bitmap.eraseColor(color); gfx::ImageSkia image = gfx::ImageSkia::CreateFrom1xBitmap(bitmap); return image; diff --git a/ash/desktop_background/wallpaper_resizer_unittest.cc b/ash/desktop_background/wallpaper_resizer_unittest.cc index 240dc8e..fb951ef 100644 --- a/ash/desktop_background/wallpaper_resizer_unittest.cc +++ b/ash/desktop_background/wallpaper_resizer_unittest.cc @@ -27,8 +27,7 @@ gfx::ImageSkia CreateTestImage(const gfx::Size& size) { SkBitmap src; int w = size.width(); int h = size.height(); - src.setConfig(SkBitmap::kARGB_8888_Config, w, h); - src.allocPixels(); + src.allocN32Pixels(w, h); // Fill bitmap with data. for (int y = 0; y < h; ++y) { |