diff options
| author | reed@google.com <reed@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-06-03 22:25:05 +0000 |
|---|---|---|
| committer | reed@google.com <reed@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-06-03 22:25:05 +0000 |
| commit | ff200183d43aa15ee91dd9bb428f88c5a1119493 (patch) | |
| tree | 392bd8d2b104d30369419e869a9549ff9ac29c7f /skia | |
| parent | b01b9e2488a8075aebb7a8f295e462dd18906ca7 (diff) | |
| download | chromium_src-ff200183d43aa15ee91dd9bb428f88c5a1119493.zip chromium_src-ff200183d43aa15ee91dd9bb428f88c5a1119493.tar.gz chromium_src-ff200183d43aa15ee91dd9bb428f88c5a1119493.tar.bz2 | |
use non-deprecated version of installPixel() that takes colortable
NOTRY=True
only failing/retrying bot is android, and this change is explicitly only for windows.
Review URL: https://codereview.chromium.org/316663002
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@274651 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'skia')
| -rw-r--r-- | skia/ext/bitmap_platform_device_win.cc | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/skia/ext/bitmap_platform_device_win.cc b/skia/ext/bitmap_platform_device_win.cc index f12f086..f526488 100644 --- a/skia/ext/bitmap_platform_device_win.cc +++ b/skia/ext/bitmap_platform_device_win.cc @@ -107,8 +107,9 @@ static bool InstallHBitmapPixels(SkBitmap* bitmap, int width, int height, const SkAlphaType at = is_opaque ? kOpaque_SkAlphaType : kPremul_SkAlphaType; const SkImageInfo info = SkImageInfo::MakeN32(width, height, at); const size_t rowBytes = info.minRowBytes(); - return bitmap->installPixels(info, data, rowBytes, DeleteHBitmapCallback, - hbitmap); + SkColorTable* color_table = NULL; + return bitmap->installPixels(info, data, rowBytes, color_table, + DeleteHBitmapCallback, hbitmap); } // We use this static factory function instead of the regular constructor so |