diff options
| author | reed@chromium.org <reed@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-03-10 12:17:11 +0000 |
|---|---|---|
| committer | reed@chromium.org <reed@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-03-10 12:17:11 +0000 |
| commit | d3e31f71ccd2dcc81170632bd5d26be144434282 (patch) | |
| tree | 479238df343cac029395c8707a3a8de67647d9ea /ui/native_theme/native_theme_win.cc | |
| parent | 6f9d2c65f825f2a68502333722910061ef9678e7 (diff) | |
| download | chromium_src-d3e31f71ccd2dcc81170632bd5d26be144434282.zip chromium_src-d3e31f71ccd2dcc81170632bd5d26be144434282.tar.gz chromium_src-d3e31f71ccd2dcc81170632bd5d26be144434282.tar.bz2 | |
use SkColorType instead of (deprecated) SkBitmap::Config for copyTo
TBR=ben@chromium.org
Review URL: https://codereview.chromium.org/192373004
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@255918 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ui/native_theme/native_theme_win.cc')
| -rw-r--r-- | ui/native_theme/native_theme_win.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/ui/native_theme/native_theme_win.cc b/ui/native_theme/native_theme_win.cc index 43d38f3..6eab39c 100644 --- a/ui/native_theme/native_theme_win.cc +++ b/ui/native_theme/native_theme_win.cc @@ -87,7 +87,7 @@ void SetCheckerboardShader(SkPaint* paint, const RECT& align_rect) { temp_bitmap.setConfig(SkBitmap::kARGB_8888_Config, 2, 2); temp_bitmap.setPixels(buffer); SkBitmap bitmap; - temp_bitmap.copyTo(&bitmap, temp_bitmap.config()); + temp_bitmap.copyTo(&bitmap); skia::RefPtr<SkShader> shader = skia::AdoptRef( SkShader::CreateBitmapShader( bitmap, SkShader::kRepeat_TileMode, SkShader::kRepeat_TileMode)); @@ -664,7 +664,7 @@ void NativeThemeWin::PaintIndirect(SkCanvas* canvas, const SkBitmap& hdc_bitmap = offscreen_canvas.getDevice()->accessBitmap(false); SkBitmap bitmap; - hdc_bitmap.copyTo(&bitmap, SkBitmap::kARGB_8888_Config); + hdc_bitmap.copyTo(&bitmap, kPMColor_SkColorType); // Post-process the pixels to fix up the alpha values (see big comment above). const SkPMColor placeholder_value = SkPreMultiplyColor(placeholder); |