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

Unified Diff: src/core/SkBitmapProcState.cpp

Issue 516923003: manual revert of bitmap scale change while I investigate failures (Closed) Base URL: https://skia.googlesource.com/skia.git@master
Patch Set: Created 6 years, 4 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 | « src/core/SkBitmapProcState.h ('k') | tests/ScaledImageCache.cpp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: src/core/SkBitmapProcState.cpp
diff --git a/src/core/SkBitmapProcState.cpp b/src/core/SkBitmapProcState.cpp
index 2583cb5011f3feb872fb503b5fae7b72fef13f07..7640573596c5d5bdfe2c4fdb6c541e22ffa8a092 100644
--- a/src/core/SkBitmapProcState.cpp
+++ b/src/core/SkBitmapProcState.cpp
@@ -149,34 +149,21 @@ static inline bool cache_size_okay(const SkBitmap& bm, const SkMatrix& invMat) {
bool SkBitmapProcState::possiblyScaleImage() {
SkASSERT(NULL == fBitmap);
- fAdjustedMatrix = false;
-
if (fFilterLevel <= SkPaint::kLow_FilterLevel) {
return false;
}
// Check to see if the transformation matrix is simple, and if we're
// doing high quality scaling. If so, do the bitmap scale here and
- // remove the (non-fractional) scaling component from the matrix.
-
- SkScalar invScaleX = fInvMatrix.getScaleX();
- SkScalar invScaleY = fInvMatrix.getScaleY();
-
- float trueDestWidth = fOrigBitmap.width() / invScaleX;
- float trueDestHeight = fOrigBitmap.height() / invScaleY;
-
-#ifndef SK_IGNORE_PROPER_FRACTIONAL_SCALING
- float roundedDestWidth = SkScalarRoundToScalar(trueDestWidth);
- float roundedDestHeight = SkScalarRoundToScalar(trueDestHeight);
-#else
- float roundedDestWidth = trueDestWidth;
- float roundedDestHeight = trueDestHeight;
-#endif
+ // remove the scaling component from the matrix.
if (SkPaint::kHigh_FilterLevel == fFilterLevel &&
fInvMatrix.getType() <= (SkMatrix::kScale_Mask | SkMatrix::kTranslate_Mask) &&
kN32_SkColorType == fOrigBitmap.colorType() &&
cache_size_okay(fOrigBitmap, fInvMatrix)) {
+ SkScalar invScaleX = fInvMatrix.getScaleX();
+ SkScalar invScaleY = fInvMatrix.getScaleY();
+
if (SkScalarNearlyEqual(invScaleX,1.0f) &&
SkScalarNearlyEqual(invScaleY,1.0f)) {
// short-circuit identity scaling; the output is supposed to
@@ -193,14 +180,17 @@ bool SkBitmapProcState::possiblyScaleImage() {
return false;
}
- if (!SkBitmapCache::Find(fOrigBitmap, roundedDestWidth, roundedDestHeight, &fScaledBitmap)) {
+ if (!SkBitmapCache::Find(fOrigBitmap, invScaleX, invScaleY, &fScaledBitmap)) {
+ float dest_width = fOrigBitmap.width() / invScaleX;
+ float dest_height = fOrigBitmap.height() / invScaleY;
+
// All the criteria are met; let's make a new bitmap.
if (!SkBitmapScaler::Resize(&fScaledBitmap,
fOrigBitmap,
SkBitmapScaler::RESIZE_BEST,
- roundedDestWidth,
- roundedDestHeight,
+ dest_width,
+ dest_height,
SkScaledImageCache::GetAllocator())) {
// we failed to create fScaledBitmap, so just return and let
// the scanline proc handle it.
@@ -209,7 +199,7 @@ bool SkBitmapProcState::possiblyScaleImage() {
}
SkASSERT(NULL != fScaledBitmap.getPixels());
- SkBitmapCache::Add(fOrigBitmap, roundedDestWidth, roundedDestHeight, fScaledBitmap);
+ SkBitmapCache::Add(fOrigBitmap, invScaleX, invScaleY, fScaledBitmap);
}
SkASSERT(NULL != fScaledBitmap.getPixels());
@@ -219,19 +209,9 @@ bool SkBitmapProcState::possiblyScaleImage() {
fInvMatrix.setTranslate(fInvMatrix.getTranslateX() / fInvMatrix.getScaleX(),
fInvMatrix.getTranslateY() / fInvMatrix.getScaleY());
-#ifndef SK_IGNORE_PROPER_FRACTIONAL_SCALING
- // reintroduce any fractional scaling missed by our integral scale done above.
-
- float fractionalScaleX = trueDestWidth/roundedDestWidth;
- float fractionalScaleY = trueDestHeight/roundedDestHeight;
-
- fInvMatrix.postScale(fractionalScaleX, fractionalScaleY);
-#endif
- fAdjustedMatrix = true;
-
// Set our filter level to low -- the only post-filtering this
// image might require is some interpolation if the translation
- // is fractional or if there's any remaining scaling to be done.
+ // is fractional.
fFilterLevel = SkPaint::kLow_FilterLevel;
return true;
}
@@ -387,7 +367,7 @@ bool SkBitmapProcState::chooseProcs(const SkMatrix& inv, const SkPaint& paint) {
bool clampClamp = SkShader::kClamp_TileMode == fTileModeX &&
SkShader::kClamp_TileMode == fTileModeY;
- if (!(fAdjustedMatrix || clampClamp || trivialMatrix)) {
+ if (!(clampClamp || trivialMatrix)) {
fInvMatrix.postIDiv(fOrigBitmap.width(), fOrigBitmap.height());
}
« no previous file with comments | « src/core/SkBitmapProcState.h ('k') | tests/ScaledImageCache.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698