diff options
| author |  commit-bot@chromium.org <commit-bot@chromium.org@2bbb7eff-a529-9590-31e7-b0007b416f81> | 2014-05-30 13:26:10 +0000 |
|---|---|---|
| committer | commit-bot@chromium.org <commit-bot@chromium.org@2bbb7eff-a529-9590-31e7-b0007b416f81> | 2014-05-30 13:26:10 +0000 |
| commit | a3264e53ee3f3c5d6a2c813df7e44b5b96d207f2 (patch) | |
| tree | 5a95db31ba21ba5f0354b3e9e622a046fe6e04c4 /src/device/xps | |
| parent | 16fdbd3141f23a348e4b9f706e77307a947bd5a2 (diff) | |
Revert "Revert of setConfig -> setInfo (https://codereview.chromium.org/308683005/)"
This reverts commit eecaea4148805834f223681f70b6488ceba12d09.
R=robertphillips@google.com, scroggo@google.com
Author: reed@google.com
Review URL: https://codereview.chromium.org/301283003
git-svn-id: http://skia.googlecode.com/svn/trunk@14989 2bbb7eff-a529-9590-31e7-b0007b416f81
Diffstat (limited to 'src/device/xps')
| -rw-r--r-- | src/device/xps/SkXPSDevice.cpp | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/src/device/xps/SkXPSDevice.cpp b/src/device/xps/SkXPSDevice.cpp index 62161df296..bdc612fae6 100644 --- a/src/device/xps/SkXPSDevice.cpp +++ b/src/device/xps/SkXPSDevice.cpp @@ -106,7 +106,7 @@ static HRESULT create_id(wchar_t* buffer, size_t bufferSize, static SkBitmap make_fake_bitmap(int width, int height) { SkBitmap bitmap; - bitmap.setConfig(SkImageInfo::MakeUnknown(width, height)); + bitmap.setInfo(SkImageInfo::MakeUnknown(width, height)); return bitmap; } @@ -1589,11 +1589,7 @@ HRESULT SkXPSDevice::applyMask(const SkDraw& d, xy[1] = (SkShader::TileMode)3; SkBitmap bm; - bm.setConfig(SkBitmap::kA8_Config, - mask.fBounds.width(), - mask.fBounds.height(), - mask.fRowBytes); - bm.setPixels(mask.fImage); + bm.installMaskPixels(mask); SkTScopedComPtr<IXpsOMTileBrush> maskBrush; HR(this->createXpsImageBrush(bm, m, xy, 0xFF, &maskBrush)); |