diff options
| author |  bsalomon <bsalomon@google.com> | 2016-02-29 11:41:52 -0800 |
|---|---|---|
| committer |  Commit bot <commit-bot@chromium.org> | 2016-02-29 11:41:52 -0800 |
| commit | 84a4e5a8d683bf17d6c3058b977b9dfb000428af (patch) | |
| tree | 2d1a39c9baee537c1457f03ea1c51d5a911c2432 /gm | |
| parent | 3a9be690772f0417df2abe318c71e9b2fec0f8c5 (diff) | |
Remove internal calls to SkImage::getTexture
BUG=skia:
GOLD_TRYBOT_URL= https://gold.skia.org/search2?unt=true&query=source_type%3Dgm&master=false&issue=1744243002
Review URL: https://codereview.chromium.org/1744243002
Diffstat (limited to 'gm')
| -rw-r--r-- | gm/drawbitmaprect.cpp | 6 | ||||
| -rw-r--r-- | gm/image_pict.cpp | 2 |
2 files changed, 4 insertions, 4 deletions
diff --git a/gm/drawbitmaprect.cpp b/gm/drawbitmaprect.cpp index d4fa141482..c90ac2eaa1 100644 --- a/gm/drawbitmaprect.cpp +++ b/gm/drawbitmaprect.cpp @@ -11,6 +11,7 @@ #include "SkColorPriv.h" #include "SkGradientShader.h" #include "SkImage.h" +#include "SkImage_Base.h" #include "SkShader.h" #include "SkSurface.h" @@ -85,9 +86,8 @@ static SkImage* makebm(SkCanvas* origCanvas, SkBitmap* resultBM, int w, int h) { SkBitmap tempBM; #if SK_SUPPORT_GPU - if (image->getTexture()) { - GrWrapTextureInBitmap(image->getTexture(), - image->width(), image->height(), image->isOpaque(), &tempBM); + if (GrTexture* texture = as_IB(image)->peekTexture()) { + GrWrapTextureInBitmap(texture, image->width(), image->height(), image->isOpaque(), &tempBM); } else #endif { diff --git a/gm/image_pict.cpp b/gm/image_pict.cpp index 968ecda398..52c9309bc8 100644 --- a/gm/image_pict.cpp +++ b/gm/image_pict.cpp @@ -217,7 +217,7 @@ public: surface->getCanvas()->translate(-100, -100); surface->getCanvas()->drawPicture(pic); SkAutoTUnref<SkImage> image(surface->newImageSnapshot()); - fTexture.reset(SkRef(image->getTexture())); + fTexture.reset(SkRef(as_IB(image)->peekTexture())); } protected: GrTexture* onGenerateTexture(GrContext* ctx, const SkIRect* subset) override { |