Revert of Change mapRectScaleTranslate to pass args/ret by value

src/core/SkCanvas.cpp

 /*
  * Copyright 2008 The Android Open Source Project
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
 #include "SkBitmapDevice.h"
 #include "SkCanvas.h"
 #include "SkCanvasPriv.h"
@@ skipping 59 matching lines @@
                   (int)kNotOpaque_ShaderOverrideOpacity,
                   "need_matching_enums2");
 
     const SkISize size = this->getBaseLayerSize();
     const SkRect bounds = SkRect::MakeIWH(size.width(), size.height());
     if (!this->getClipStack()->quickContains(bounds)) {
         return false;
     }
 
     if (rect) {
-        const SkMatrix& ctm = this->getTotalMatrix();
-        if (!ctm.isScaleTranslate()) {
+        if (!this->getTotalMatrix().isScaleTranslate()) {
             return false; // conservative
         }
-        if (!ctm.mapRectScaleTranslate(*rect).contains(bounds)) {
+
+        SkRect devRect;
+        this->getTotalMatrix().mapRectScaleTranslate(&devRect, *rect);
+        if (!devRect.contains(bounds)) {
             return false;
         }
     }
 
     if (paint) {
         SkPaint::Style paintStyle = paint->getStyle();
         if (!(paintStyle == SkPaint::kFill_Style ||
               paintStyle == SkPaint::kStrokeAndFill_Style)) {
             return false;
         }
@@ skipping 1440 matching lines @@
 
 void SkCanvas::clipRect(const SkRect& rect, SkRegion::Op op, bool doAA) {
     if (!fAllowSoftClip) {
         doAA = false;
     }
 
 #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.isScaleTranslate()) {
-        SkRect devR = fMCRec->fMatrix.mapRectScaleTranslate(rect);
+        SkRect devR;
+        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).
         if (devR.round().contains(fMCRec->fRasterClip.getBounds())) {
 #if 0
             SkDebugf("ignored clipRect [%g %g %g %g]\n",
                      rect.left(), rect.top(), rect.right(), rect.bottom());
 #endif
             return;
         }
@@ skipping 19 matching lines @@
             fClipStack->clipEmpty();
             (void)fMCRec->fRasterClip.setEmpty();
             return;
         }
     }
 #endif
 
     const bool isScaleTrans = fMCRec->fMatrix.isScaleTranslate();
     SkRect devR;
     if (isScaleTrans) {
-        devR = fMCRec->fMatrix.mapRectScaleTranslate(rect);
+        fMCRec->fMatrix.mapRectScaleTranslate(&devR, rect);
     }
 
 #ifndef SK_SUPPORT_PRECHECK_CLIPRECT
     if (SkRegion::kIntersect_Op == op &&
         kHard_ClipEdgeStyle == edgeStyle
         && isScaleTrans)
     {
         if (devR.round().contains(fMCRec->fRasterClip.getBounds())) {
 #if 0
             SkDebugf("------- ignored clipRect [%g %g %g %g]\n",
@@ skipping 1697 matching lines @@
 
 SkAutoCanvasMatrixPaint::~SkAutoCanvasMatrixPaint() {
     fCanvas->restoreToCount(fSaveCount);
 }
 
 #ifdef SK_SUPPORT_LEGACY_NEW_SURFACE_API
 SkSurface* SkCanvas::newSurface(const SkImageInfo& info, const SkSurfaceProps* props) {
     return this->makeSurface(info, props).release();
 }
 #endif