diff options
| author |  Mike Reed <reed@google.com> | 2016-09-28 17:13:38 -0400 |
|---|---|---|
| committer |  Skia Commit-Bot <skia-commit-bot@chromium.org> | 2016-09-28 21:42:04 +0000 |
| commit | 627778d5ba4fd6f4a4a1238bbf7a1b561469fe21 (patch) | |
| tree | 25438c2d6f388c4b93c03100c44b20e8fa22f36e /src/xps | |
| parent | e95ea08cf4134eff0fa1f7afe624b4a49e3c5ba4 (diff) | |
isABitmap is deprecated, use isAImage
BUG=skia:
GOLD_TRYBOT_URL= https://gold.skia.org/search?issue=2748
Change-Id: I7006a3231ff0e9e39b187deae550364bc97f49d6
Reviewed-on: https://skia-review.googlesource.com/2748
Commit-Queue: Mike Reed <reed@google.com>
Reviewed-by: Florin Malita <fmalita@chromium.org>
Diffstat (limited to 'src/xps')
| -rw-r--r-- | src/xps/SkXPSDevice.cpp | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/src/xps/SkXPSDevice.cpp b/src/xps/SkXPSDevice.cpp index 566651e5d9..7757cb8774 100644 --- a/src/xps/SkXPSDevice.cpp +++ b/src/xps/SkXPSDevice.cpp @@ -30,6 +30,7 @@ #include "SkGeometry.h" #include "SkGlyphCache.h" #include "SkHRESULT.h" +#include "SkImage.h" #include "SkImageEncoder.h" #include "SkIStream.h" #include "SkMaskFilter.h" @@ -1080,7 +1081,8 @@ HRESULT SkXPSDevice::createXpsBrush(const SkPaint& skPaint, SkBitmap outTexture; SkMatrix outMatrix; SkShader::TileMode xy[2]; - if (shader->isABitmap(&outTexture, &outMatrix, xy)) { + SkImage* image = shader->isAImage(&outMatrix, xy); + if (image && image->asLegacyBitmap(&outTexture, SkImage::kRO_LegacyBitmapMode)) { //TODO: outMatrix?? SkMatrix localMatrix = shader->getLocalMatrix(); if (parentTransform) { |