From 84a4e5a8d683bf17d6c3058b977b9dfb000428af Mon Sep 17 00:00:00 2001 From: bsalomon Date: Mon, 29 Feb 2016 11:41:52 -0800 Subject: 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 --- src/core/SkPictureImageGenerator.cpp | 3 ++- src/core/SkSpecialImage.cpp | 21 +++++++++++---------- src/image/SkImage.cpp | 4 ++-- src/image/SkImage_Base.h | 2 +- src/image/SkImage_Gpu.cpp | 2 +- src/image/SkImage_Gpu.h | 6 ++---- src/image/SkSurface_Gpu.cpp | 2 +- 7 files changed, 20 insertions(+), 20 deletions(-) (limited to 'src') diff --git a/src/core/SkPictureImageGenerator.cpp b/src/core/SkPictureImageGenerator.cpp index db192a36e2..67834876ca 100644 --- a/src/core/SkPictureImageGenerator.cpp +++ b/src/core/SkPictureImageGenerator.cpp @@ -5,6 +5,7 @@ * found in the LICENSE file. */ +#include "SkImage_Base.h" #include "SkImageGenerator.h" #include "SkCanvas.h" #include "SkMatrix.h" @@ -154,6 +155,6 @@ GrTexture* SkPictureImageGenerator::onGenerateTexture(GrContext* ctx, const SkIR if (!image.get()) { return nullptr; } - return SkSafeRef(image->getTexture()); + return SkSafeRef(as_IB(image)->peekTexture()); } #endif diff --git a/src/core/SkSpecialImage.cpp b/src/core/SkSpecialImage.cpp index 50117b2e83..88d90b8602 100644 --- a/src/core/SkSpecialImage.cpp +++ b/src/core/SkSpecialImage.cpp @@ -6,6 +6,7 @@ */ #include "SkCanvas.h" +#include "SkImage_Base.h" #include "SkSpecialImage.h" #include "SkSpecialSurface.h" @@ -33,24 +34,24 @@ private: }; /////////////////////////////////////////////////////////////////////////////// -static inline const SkSpecialImage_Base* as_IB(const SkSpecialImage* image) { +static inline const SkSpecialImage_Base* as_SIB(const SkSpecialImage* image) { return static_cast(image); } void SkSpecialImage::draw(SkCanvas* canvas, SkScalar x, SkScalar y, const SkPaint* paint) const { - return as_IB(this)->onDraw(canvas, x, y, paint); + return as_SIB(this)->onDraw(canvas, x, y, paint); } bool SkSpecialImage::peekPixels(SkPixmap* pixmap) const { - return as_IB(this)->onPeekPixels(pixmap); + return as_SIB(this)->onPeekPixels(pixmap); } GrTexture* SkSpecialImage::peekTexture() const { - return as_IB(this)->onPeekTexture(); + return as_SIB(this)->onPeekTexture(); } SkSpecialSurface* SkSpecialImage::newSurface(const SkImageInfo& info) const { - return as_IB(this)->onNewSurface(info); + return as_SIB(this)->onNewSurface(info); } #if SK_SUPPORT_GPU @@ -72,7 +73,7 @@ SkSpecialImage* SkSpecialImage::internal_fromBM(SkImageFilter::Proxy* proxy, } bool SkSpecialImage::internal_getBM(SkBitmap* result) { - const SkSpecialImage_Base* ib = as_IB(this); + const SkSpecialImage_Base* ib = as_SIB(this); // TODO: need to test offset case! (see skbug.com/4967) return ib->getBitmap(result); @@ -102,8 +103,8 @@ public: size_t getSize() const override { #if SK_SUPPORT_GPU - if (fImage->getTexture()) { - return fImage->getTexture()->gpuMemorySize(); + if (GrTexture* texture = as_IB(fImage.get())->peekTexture()) { + return texture->gpuMemorySize(); } else #endif { @@ -128,7 +129,7 @@ public: return fImage->peekPixels(pixmap); } - GrTexture* onPeekTexture() const override { return fImage->getTexture(); } + GrTexture* onPeekTexture() const override { return as_IB(fImage.get())->peekTexture(); } bool getBitmap(SkBitmap* result) const override { return false; @@ -136,7 +137,7 @@ public: SkSpecialSurface* onNewSurface(const SkImageInfo& info) const override { #if SK_SUPPORT_GPU - GrTexture* texture = fImage->getTexture(); + GrTexture* texture = as_IB(fImage.get())->peekTexture(); if (texture) { GrSurfaceDesc desc = GrImageInfoToSurfaceDesc(info); desc.fFlags = kRenderTarget_GrSurfaceFlag; diff --git a/src/image/SkImage.cpp b/src/image/SkImage.cpp index 5521b6e305..674a735743 100644 --- a/src/image/SkImage.cpp +++ b/src/image/SkImage.cpp @@ -169,10 +169,10 @@ GrTexture* SkImage::getTexture() const { return as_IB(this)->peekTexture(); } -bool SkImage::isTextureBacked() const { return SkToBool(as_IB(this)->getTexture()); } +bool SkImage::isTextureBacked() const { return SkToBool(as_IB(this)->peekTexture()); } GrBackendObject SkImage::getTextureHandle(bool flushPendingGrContextIO) const { - GrTexture* texture = as_IB(this)->getTexture(); + GrTexture* texture = as_IB(this)->peekTexture(); if (texture) { GrContext* context = texture->getContext(); if (context) { diff --git a/src/image/SkImage_Base.h b/src/image/SkImage_Base.h index 83e51a58b7..da87e42888 100644 --- a/src/image/SkImage_Base.h +++ b/src/image/SkImage_Base.h @@ -74,7 +74,7 @@ private: typedef SkImage INHERITED; }; -static inline SkImage_Base* as_IB(SkImage* image) { +static inline SkImage_Base* as_IB(SkImage* image) { return static_cast(image); } diff --git a/src/image/SkImage_Gpu.cpp b/src/image/SkImage_Gpu.cpp index e28a31d4bf..57ee33957b 100644 --- a/src/image/SkImage_Gpu.cpp +++ b/src/image/SkImage_Gpu.cpp @@ -38,7 +38,7 @@ SkImage_Gpu::~SkImage_Gpu() { } extern void SkTextureImageApplyBudgetedDecision(SkImage* image) { - if (as_IB(image)->getTexture()) { + if (as_IB(image)->peekTexture()) { ((SkImage_Gpu*)image)->applyBudgetDecision(); } } diff --git a/src/image/SkImage_Gpu.h b/src/image/SkImage_Gpu.h index d4640d4afc..c640322a65 100644 --- a/src/image/SkImage_Gpu.h +++ b/src/image/SkImage_Gpu.h @@ -26,12 +26,10 @@ public: ~SkImage_Gpu() override; void applyBudgetDecision() const { - GrTexture* tex = this->getTexture(); - SkASSERT(tex); if (SkBudgeted::kYes == fBudgeted) { - tex->resourcePriv().makeBudgeted(); + fTexture->resourcePriv().makeBudgeted(); } else { - tex->resourcePriv().makeUnbudgeted(); + fTexture->resourcePriv().makeUnbudgeted(); } } diff --git a/src/image/SkSurface_Gpu.cpp b/src/image/SkSurface_Gpu.cpp index 173a0d81d7..35c521ca86 100644 --- a/src/image/SkSurface_Gpu.cpp +++ b/src/image/SkSurface_Gpu.cpp @@ -116,7 +116,7 @@ void SkSurface_Gpu::onCopyOnWrite(ContentChangeMode mode) { // image because onCopyOnWrite is only called when there is a cached image. SkAutoTUnref image(this->refCachedImage(SkBudgeted::kNo, kNo_ForceUnique)); SkASSERT(image); - if (rt->asTexture() == as_IB(image)->getTexture()) { + if (rt->asTexture() == as_IB(image)->peekTexture()) { this->fDevice->replaceRenderTarget(SkSurface::kRetain_ContentChangeMode == mode); SkTextureImageApplyBudgetedDecision(image); } else if (kDiscard_ContentChangeMode == mode) { -- cgit v1.2.3