Remove "unused" parameter from filterInputGPU
authorrobertphillips <robertphillips@google.com>
Fri, 8 Jan 2016 17:28:23 +0000 (09:28 -0800)
committerCommit bot <commit-bot@chromium.org>
Fri, 8 Jan 2016 17:28:24 +0000 (09:28 -0800)
GOLD_TRYBOT_URL= https://gold.skia.org/search2?unt=true&query=source_type%3Dgm&master=false&issue=1569553007

Review URL: https://codereview.chromium.org/1569553007

include/core/SkImageFilter.h
src/core/SkImageFilter.cpp

index 6ece16c..e197664 100644 (file)
@@ -264,7 +264,7 @@ public:
     // Otherwise, the filter will be processed in software and
     // uploaded to the GPU.
     bool filterInputGPU(int index, SkImageFilter::Proxy* proxy, const SkBitmap& src, const Context&,
-                        SkBitmap* result, SkIPoint* offset, bool relaxSizeConstraint = true) const;
+                        SkBitmap* result, SkIPoint* offset) const;
 #endif
 
     SK_TO_STRING_PUREVIRT()
index 95988f8..7518501 100644 (file)
@@ -520,8 +520,7 @@ void SkImageFilter::WrapTexture(GrTexture* texture, int width, int height, SkBit
 
 bool SkImageFilter::filterInputGPU(int index, SkImageFilter::Proxy* proxy,
                                    const SkBitmap& src, const Context& origCtx,
-                                   SkBitmap* result, SkIPoint* offset,
-                                   bool relaxSizeConstraint) const {
+                                   SkBitmap* result, SkIPoint* offset) const {
     SkImageFilter* input = this->getInput(index);
     if (!input) {
         return true;
@@ -531,11 +530,7 @@ bool SkImageFilter::filterInputGPU(int index, SkImageFilter::Proxy* proxy,
     // called are restored before we return to the caller.
     GrContext* context = src.getTexture()->getContext();
 
-    SizeConstraint constraint = origCtx.sizeConstraint();
-    if (relaxSizeConstraint && (kExact_SizeConstraint == constraint)) {
-        constraint = kApprox_SizeConstraint;
-    }
-    Context ctx(origCtx.ctm(), origCtx.clipBounds(), origCtx.cache(), constraint);
+    Context ctx(origCtx.ctm(), origCtx.clipBounds(), origCtx.cache(), kApprox_SizeConstraint);
 
     if (input->filterImage(proxy, src, this->mapContext(ctx), result, offset)) {
         if (!result->getTexture()) {