Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(164)

Unified Diff: src/device/xps/SkXPSDevice.cpp

Issue 301283003: Revert "Revert of setConfig -> setInfo (https://codereview.chromium.org/308683005/)" (Closed) Base URL: https://skia.googlecode.com/svn/trunk
Patch Set: add guard for android Created 6 years, 7 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « src/core/SkValidationUtils.h ('k') | src/effects/SkPerlinNoiseShader.cpp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: src/device/xps/SkXPSDevice.cpp
diff --git a/src/device/xps/SkXPSDevice.cpp b/src/device/xps/SkXPSDevice.cpp
index 62161df296eaf130d6e77b40ca70174569ef499a..bdc612fae6d1608e0203d9134da7bef5934d20a0 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));
« no previous file with comments | « src/core/SkValidationUtils.h ('k') | src/effects/SkPerlinNoiseShader.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698