AuroraMiddleware/skia2
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Revert r8701 and r8700 due to layout test discrepancies

Browse Source 
git-svn-id: http://skia.googlecode.com/svn/trunk@8731 2bbb7eff-a529-9590-31e7-b0007b416f81
This commit is contained in:
robertphillips@google.com 2013-04-17 21:32:03 +00:00
parent 4c6adf9a08
commit 717d0cbf66
1 changed files with 27 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

52
src/core/SkBitmapProcState.cpp
View File

@ -30,39 +30,36 @@ extern void Clamp_SI8_opaque_D32_filter_DX_shaderproc_neon(const SkBitmapProcSt
/////////////////////////////////////////////////////////////////////////////// ///////////////////////////////////////////////////////////////////////////////
// true iff the matrix contains, at most, scale and translate elements
static bool matrix_only_scale_translate(const SkMatrix& m) {
return m.getType() <= (SkMatrix::kScale_Mask | SkMatrix::kTranslate_Mask);
}
/** /**
* For the purposes of drawing bitmaps, if a matrix is "almost" translate * For the purposes of drawing bitmaps, if a matrix is "almost" translate
* go ahead and treat it as if it were, so that subsequent code can go fast. * go ahead and treat it as if it were, so that subsequent code can go fast.
*/ */
static bool just_trans_clamp(const SkMatrix& matrix, const SkBitmap& bitmap) { static bool just_trans_clamp(const SkMatrix& matrix, const SkBitmap& bitmap) {
SkASSERT(matrix_only_scale_translate(matrix)); SkMatrix::TypeMask mask = matrix.getType();
if (matrix.getType() & SkMatrix::kScale_Mask) { if (mask & (SkMatrix::kAffine_Mask | SkMatrix::kPerspective_Mask)) {
SkRect src, dst; return false;
bitmap.getBounds(&src); }
matrix.mapRect(&dst, src); if (mask & SkMatrix::kScale_Mask) {
SkScalar sx = matrix[SkMatrix::kMScaleX];
// Now round all 4 edges to device space, and then compare the device SkScalar sy = matrix[SkMatrix::kMScaleY];
// width/height to the original. Note: we must map all 4 and subtract int w = bitmap.width();
// rather than map the "width" and compare, since we care about the int h = bitmap.height();
// phase (in pixel space) that any translate in the matrix might impart. int sw = SkScalarRound(SkScalarMul(sx, SkIntToScalar(w)));
SkIRect idst; int sh = SkScalarRound(SkScalarMul(sy, SkIntToScalar(h)));
dst.round(&idst); return sw == w && sh == h;
return idst.width() == bitmap.width() && idst.height() == bitmap.height();
} }
// if we got here, we're either kTranslate_Mask or identity // if we got here, we're either kTranslate_Mask or identity
return true; return true;
} }
static bool just_trans_general(const SkMatrix& matrix) { static bool just_trans_general(const SkMatrix& matrix) {
SkASSERT(matrix_only_scale_translate(matrix)); SkMatrix::TypeMask mask = matrix.getType();
if (matrix.getType() & SkMatrix::kScale_Mask) { if (mask & (SkMatrix::kAffine_Mask | SkMatrix::kPerspective_Mask)) {
return false;
}
if (mask & SkMatrix::kScale_Mask) {
const SkScalar tol = SK_Scalar1 / 32768; const SkScalar tol = SK_Scalar1 / 32768;
if (!SkScalarNearlyZero(matrix[SkMatrix::kMScaleX] - SK_Scalar1, tol)) { if (!SkScalarNearlyZero(matrix[SkMatrix::kMScaleX] - SK_Scalar1, tol)) {
@ -123,11 +120,16 @@ bool SkBitmapProcState::chooseProcs(const SkMatrix& inv, const SkPaint& paint) {
} }
// wack our matrix to exactly no-scale, if we're really close to begin with // wack our matrix to exactly no-scale, if we're really close to begin with
if (matrix_only_scale_translate(*m)) { {
SkMatrix forward; bool fixupMatrix = clamp_clamp ?
if (m->invert(&forward)) { just_trans_clamp(*m, *fBitmap) : just_trans_general(*m);
if (clamp_clamp ? just_trans_clamp(forward, *fBitmap) if (fixupMatrix) {
: just_trans_general(forward)) { // If we can be treated just like translate, construct that inverse
// such that we landed in the proper place. Given that m may have
// some slight scale, we have to invert it to compute this new
// matrix.
SkMatrix forward;
if (m->invert(&forward)) {
SkScalar tx = -SkScalarRoundToScalar(forward.getTranslateX()); SkScalar tx = -SkScalarRoundToScalar(forward.getTranslateX());
SkScalar ty = -SkScalarRoundToScalar(forward.getTranslateY()); SkScalar ty = -SkScalarRoundToScalar(forward.getTranslateY());
fUnitInvMatrix.setTranslate(tx, ty); fUnitInvMatrix.setTranslate(tx, ty);