"Fix" debugger's setMatrix handling

src/utils/debugger/SkDrawCommand.cpp

 
 /*
  * Copyright 2012 Google Inc.
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
 
 #include "SkDrawCommand.h"
@@ skipping 946 matching lines @@
     fInfo.push(SkObjectParser::ScalarToString(sx, "SkScalar sx: "));
     fInfo.push(SkObjectParser::ScalarToString(sy, "SkScalar sy: "));
 }
 
 void SkScaleCommand::execute(SkCanvas* canvas) {
     canvas->scale(fSx, fSy);
 }
 
 SkSetMatrixCommand::SkSetMatrixCommand(const SkMatrix& matrix)
     : INHERITED(SET_MATRIX) {
+    fUserMatrix.reset();
     fMatrix = matrix;
 
     fInfo.push(SkObjectParser::MatrixToString(matrix));
 }
 
+void SkSetMatrixCommand::setUserMatrix(const SkMatrix& userMatrix) {
+    fUserMatrix = userMatrix;
+}
+
 void SkSetMatrixCommand::execute(SkCanvas* canvas) {
-    canvas->setMatrix(fMatrix);
+    SkMatrix temp = SkMatrix::Concat(fUserMatrix, fMatrix);
+    canvas->setMatrix(temp);
 }
 
 SkSkewCommand::SkSkewCommand(SkScalar sx, SkScalar sy)
     : INHERITED(SKEW) {
     fSx = sx;
     fSy = sy;
 
     fInfo.push(SkObjectParser::ScalarToString(sx, "SkScalar sx: "));
     fInfo.push(SkObjectParser::ScalarToString(sy, "SkScalar sy: "));
 }
@@ skipping 32 matching lines @@
     p.setColor(SK_ColorCYAN);
     p.setStyle(SkPaint::kStroke_Style);
     canvas->drawRect(fCullRect, p);
 }
 
 SkPopCullCommand::SkPopCullCommand() : INHERITED(POP_CULL) { }
 
 void SkPopCullCommand::execute(SkCanvas* canvas) {
     canvas->popCull();
 }