commit 744671639dae1d5589181856d54cf0dfdb59272d
author reed <reed@google.com> Thu Jun 30 08:15:35 2016 -0700
committer Commit bot <commit-bot@chromium.org> Thu Jun 30 08:15:35 2016 -0700
tree 8fbf597653104a86a96642ed761a446fb52dd71f
parent d92b4198aef1ba719222e737edf6e28a39b43b6d

use mapRectScaleTranslate for common case in clipRect

BUG=skia:
GOLD_TRYBOT_URL= https://gold.skia.org/search?issue=2119473002

Review-Url: https://codereview.chromium.org/2119473002

src/core/SkCanvas.cpp

diff --git a/src/core/SkCanvas.cpp b/src/core/SkCanvas.cpp
index df6eccb..ce90275 100644
--- a/src/core/SkCanvas.cpp
+++ b/src/core/SkCanvas.cpp
@@ -75,12 +75,12 @@
     }
 
     if (rect) {
-        if (!this->getTotalMatrix().rectStaysRect()) {
+        if (!this->getTotalMatrix().isScaleTranslate()) {
             return false; // conservative
         }
 
         SkRect devRect;
-        this->getTotalMatrix().mapRect(&devRect, *rect);
+        this->getTotalMatrix().mapRectScaleTranslate(&devRect, *rect);
         if (!devRect.contains(bounds)) {
             return false;
         }
@@ -1531,9 +1531,9 @@
 #ifdef SK_SUPPORT_PRECHECK_CLIPRECT
     // Check if we can quick-accept the clip call (and do nothing)
     //
-    if (SkRegion::kIntersect_Op == op && !doAA && fMCRec->fMatrix.rectStaysRect()) {
+    if (SkRegion::kIntersect_Op == op && !doAA && fMCRec->fMatrix.isScaleTranslate()) {
         SkRect devR;
-        fMCRec->fMatrix.mapRect(&devR, rect);
+        fMCRec->fMatrix.mapRectScaleTranslate(&devR, rect);
         // NOTE: this check is CTM specific, since we might round differently with a different
         //       CTM. Thus this is only 100% reliable if there is not global CTM scale to be
         //       applied later (i.e. if this is going into a picture).
@@ -1570,16 +1570,16 @@
     }
 #endif
 
-    const bool rectStaysRect = fMCRec->fMatrix.rectStaysRect();
+    const bool isScaleTrans = fMCRec->fMatrix.isScaleTranslate();
     SkRect devR;
-    if (rectStaysRect) {
-        fMCRec->fMatrix.mapRect(&devR, rect);
+    if (isScaleTrans) {
+        fMCRec->fMatrix.mapRectScaleTranslate(&devR, rect);
     }
 
 #ifndef SK_SUPPORT_PRECHECK_CLIPRECT
     if (SkRegion::kIntersect_Op == op &&
         kHard_ClipEdgeStyle == edgeStyle
-        && rectStaysRect)
+        && isScaleTrans)
     {
         if (devR.round().contains(fMCRec->fRasterClip.getBounds())) {
 #if 0
@@ -1596,7 +1596,7 @@
     fDeviceCMDirty = true;
     fCachedLocalClipBoundsDirty = true;
 
-    if (rectStaysRect) {
+    if (isScaleTrans) {
         const bool isAA = kSoft_ClipEdgeStyle == edgeStyle;
         fClipStack->clipDevRect(devR, op, isAA);
         fMCRec->fRasterClip.op(devR, this->getTopLayerBounds(), op, isAA);