Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(125)

Unified Diff: src/core/SkBitmapController.cpp

Issue 1668033002: don't get dismayed by negative scales for HQ (Closed) Base URL: https://skia.googlesource.com/skia.git@master
Patch Set: add guard Created 4 years, 11 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: src/core/SkBitmapController.cpp
diff --git a/src/core/SkBitmapController.cpp b/src/core/SkBitmapController.cpp
index f4d352507aa616dba7012a677dfce95ad0cad52d..7a317b8c2f324f58b9abb0d15b1043986ba108a7 100644
--- a/src/core/SkBitmapController.cpp
+++ b/src/core/SkBitmapController.cpp
@@ -65,7 +65,11 @@ static inline bool cache_size_okay(const SkBitmapProvider& provider, const SkMat
// return ((origBitmapSize * matrixScaleFactor) < maximumAllocationSize);
// Skip the division step:
const size_t size = provider.info().getSafeSize(provider.info().minRowBytes());
- return size < (maximumAllocation * invMat.getScaleX() * invMat.getScaleY());
+ SkScalar invScaleSqr = invMat.getScaleX() * invMat.getScaleY();
vmpstr 2016/02/04 17:56:07 I forgot to mention this, but there's another smal
+#ifndef SK_SUPPORT_LEGACY_NEG_SCALE_HQ
+ invScaleSqr = SkScalarAbs(invScaleSqr);
+#endif
+ return size < (maximumAllocation * invScaleSqr);
}
/*
@@ -97,6 +101,11 @@ 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
}
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698