Record concat as setMatrix.

src/core/SkRecorder.cpp

 /*
  * Copyright 2014 Google Inc.
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
 #include "SkRecorder.h"
 #include "SkPatchUtils.h"
 #include "SkPicture.h"
@@ skipping 225 matching lines @@
 
 void SkRecorder::onPushCull(const SkRect& rect) {
     APPEND(PushCull, rect);
 }
 
 void SkRecorder::onPopCull() {
     APPEND(PopCull);
 }
 
 void SkRecorder::didConcat(const SkMatrix& matrix) {
-    APPEND(Concat, matrix);
+    this->didSetMatrix(this->getTotalMatrix());
     INHERITED(didConcat, matrix);

[reed1, 2014/08/19 13:59:31]

I vote to either move this INHERITED line above the getTotalMatrix call, or
remove it. As written it makes me (a naive reviewer) worry that the value of
getTotalMatrix might be modified after we sniff it.

[mtklein, 2014/08/19 14:01:58]

Done, to all the INHERITED calls which are always no-ops.

 }
 
 void SkRecorder::didSetMatrix(const SkMatrix& matrix) {
     SkASSERT(matrix == this->getTotalMatrix());
     APPEND(SetMatrix, matrix);
     INHERITED(didSetMatrix, matrix);
 }
 
 void SkRecorder::onClipRect(const SkRect& rect, SkRegion::Op op, ClipEdgeStyle edgeStyle) {
     INHERITED(onClipRect, rect, op, edgeStyle);
     APPEND(ClipRect, this->devBounds(), rect, op, edgeStyle == kSoft_ClipEdgeStyle);
 }
 
 void SkRecorder::onClipRRect(const SkRRect& rrect, SkRegion::Op op, ClipEdgeStyle edgeStyle) {
     INHERITED(updateClipConservativelyUsingBounds, rrect.getBounds(), op, false);
     APPEND(ClipRRect, this->devBounds(), rrect, op, edgeStyle == kSoft_ClipEdgeStyle);
 }
 
 void SkRecorder::onClipPath(const SkPath& path, SkRegion::Op op, ClipEdgeStyle edgeStyle) {
     INHERITED(updateClipConservativelyUsingBounds, path.getBounds(), op, path.isInverseFillType());
     APPEND(ClipPath, this->devBounds(), delay_copy(path), op, edgeStyle == kSoft_ClipEdgeStyle);
 }
 
 void SkRecorder::onClipRegion(const SkRegion& deviceRgn, SkRegion::Op op) {
     INHERITED(onClipRegion, deviceRgn, op);
     APPEND(ClipRegion, this->devBounds(), delay_copy(deviceRgn), op);
 }