aboutsummaryrefslogtreecommitdiffstats
path: root/src/effects/SkDisplacementMapEffect.cpp
diff options
context:
space:
mode:
authorrobertphillips <robertphillips@google.com>2015-07-22 11:54:44 -0700
committerCommit bot <commit-bot@chromium.org>2015-07-22 11:54:44 -0700
commitff0ca5ed825d9106edc2df6ab3865e1c17c326bf (patch)
tree43c617a6914e3255d77242cd0142b4609d68994d /src/effects/SkDisplacementMapEffect.cpp
parent425535f1626932e4e22f61a2571f9c3c2b1c5977 (diff)
downloadplatform_external_skqp-ff0ca5ed825d9106edc2df6ab3865e1c17c326bf.tar.gz
platform_external_skqp-ff0ca5ed825d9106edc2df6ab3865e1c17c326bf.tar.bz2
platform_external_skqp-ff0ca5ed825d9106edc2df6ab3865e1c17c326bf.zip
Misc cleanup
This is split off of https://codereview.chromium.org/1225923010/ (Start tightening correspondence betweeen GrDrawContext and GrRenderTarget). It: fixes some style nits replaces some passing of GrContext with GrTextureProvider & GrDrawContext does a bit of the finer grained creation of GrDrawContexts Review URL: https://codereview.chromium.org/1245183002
Diffstat (limited to 'src/effects/SkDisplacementMapEffect.cpp')
-rw-r--r--src/effects/SkDisplacementMapEffect.cpp22
1 files changed, 11 insertions, 11 deletions
diff --git a/src/effects/SkDisplacementMapEffect.cpp b/src/effects/SkDisplacementMapEffect.cpp
index 27509dc55b..45137d5159 100644
--- a/src/effects/SkDisplacementMapEffect.cpp
+++ b/src/effects/SkDisplacementMapEffect.cpp
@@ -213,8 +213,8 @@ bool SkDisplacementMapEffect::onFilterImage(Proxy* proxy,
SkBitmap* dst,
SkIPoint* offset) const {
SkBitmap displ = src, color = src;
- const SkImageFilter* colorInput = getColorInput();
- const SkImageFilter* displInput = getDisplacementInput();
+ const SkImageFilter* colorInput = this->getColorInput();
+ const SkImageFilter* displInput = this->getDisplacementInput();
SkIPoint colorOffset = SkIPoint::Make(0, 0), displOffset = SkIPoint::Make(0, 0);
if ((colorInput && !colorInput->filterImage(proxy, src, ctx, &color, &colorOffset)) ||
(displInput && !displInput->filterImage(proxy, src, ctx, &displ, &displOffset))) {
@@ -260,8 +260,8 @@ bool SkDisplacementMapEffect::onFilterImage(Proxy* proxy,
}
void SkDisplacementMapEffect::computeFastBounds(const SkRect& src, SkRect* dst) const {
- if (getColorInput()) {
- getColorInput()->computeFastBounds(src, dst);
+ if (this->getColorInput()) {
+ this->getColorInput()->computeFastBounds(src, dst);
} else {
*dst = src;
}
@@ -275,8 +275,8 @@ bool SkDisplacementMapEffect::onFilterBounds(const SkIRect& src, const SkMatrix&
ctm.mapVectors(&scale, 1);
bounds.outset(SkScalarCeilToInt(scale.fX * SK_ScalarHalf),
SkScalarCeilToInt(scale.fY * SK_ScalarHalf));
- if (getColorInput()) {
- return getColorInput()->filterBounds(bounds, ctm, dst);
+ if (this->getColorInput()) {
+ return this->getColorInput()->filterBounds(bounds, ctm, dst);
}
*dst = bounds;
return true;
@@ -398,15 +398,15 @@ bool SkDisplacementMapEffect::filterImageGPU(Proxy* proxy, const SkBitmap& src,
SkBitmap* result, SkIPoint* offset) const {
SkBitmap colorBM = src;
SkIPoint colorOffset = SkIPoint::Make(0, 0);
- if (getColorInput() && !getColorInput()->getInputResultGPU(proxy, src, ctx, &colorBM,
- &colorOffset)) {
+ if (this->getColorInput() &&
+ !this->getColorInput()->getInputResultGPU(proxy, src, ctx, &colorBM, &colorOffset)) {
return false;
}
SkBitmap displacementBM = src;
SkIPoint displacementOffset = SkIPoint::Make(0, 0);
- if (getDisplacementInput() &&
- !getDisplacementInput()->getInputResultGPU(proxy, src, ctx, &displacementBM,
- &displacementOffset)) {
+ if (this->getDisplacementInput() &&
+ !this->getDisplacementInput()->getInputResultGPU(proxy, src, ctx, &displacementBM,
+ &displacementOffset)) {
return false;
}
SkIRect bounds;