remove dead SK_SUPPORT_LEGACY_NEG_SCALE_HQ flag
authorreed <reed@google.com>
Mon, 8 Feb 2016 19:57:52 +0000 (11:57 -0800)
committerCommit bot <commit-bot@chromium.org>
Mon, 8 Feb 2016 19:57:52 +0000 (11:57 -0800)
BUG=skia:
GOLD_TRYBOT_URL= https://gold.skia.org/search2?unt=true&query=source_type%3Dgm&master=false&issue=1674263003

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

src/core/SkBitmapController.cpp

index 7a317b8c2f324f58b9abb0d15b1043986ba108a7..34697736661412470612ae7ccd4bbffc6e2b8421 100644 (file)
@@ -66,10 +66,7 @@ static inline bool cache_size_okay(const SkBitmapProvider& provider, const SkMat
     // Skip the division step:
     const size_t size = provider.info().getSafeSize(provider.info().minRowBytes());
     SkScalar invScaleSqr = invMat.getScaleX() * invMat.getScaleY();
-#ifndef SK_SUPPORT_LEGACY_NEG_SCALE_HQ
-    invScaleSqr = SkScalarAbs(invScaleSqr);
-#endif
-    return size < (maximumAllocation * invScaleSqr);
+    return size < (maximumAllocation * SkScalarAbs(invScaleSqr));
 }
 
 /*
@@ -101,10 +98,8 @@ bool SkDefaultBitmapControllerState::processHQRequest(const SkBitmapProvider& pr
         invScaleX = scale.width();
         invScaleY = scale.height();
     }
-#ifndef SK_SUPPORT_LEGACY_NEG_SCALE_HQ
     invScaleX = SkScalarAbs(invScaleX);
     invScaleY = SkScalarAbs(invScaleY);
-#endif
 
     if (SkScalarNearlyEqual(invScaleX, 1) && SkScalarNearlyEqual(invScaleY, 1)) {
         return false; // no need for HQ