Merge "Sync canvas proxy CTM (b/21945972)" into mnc-dev

diff --combined libs/hwui/DisplayListCanvas.cpp
index 02a4877,1988f5e..b08187b
--- 1/libs/hwui/DisplayListCanvas.cpp
--- 2/libs/hwui/DisplayListCanvas.cpp
+++ b/libs/hwui/DisplayListCanvas.cpp
@@@ -99,6 -99,14 +99,14 @@@ SkCanvas* DisplayListCanvas::asSkCanvas
      if (!mSkiaCanvasProxy) {
          mSkiaCanvasProxy.reset(new SkiaCanvasProxy(this));
      }
+ 
+     // SkCanvas instances default to identity transform, but should inherit
+     // the state of this Canvas; if this code was in the SkiaCanvasProxy
+     // constructor, we couldn't cache mSkiaCanvasProxy.
+     SkMatrix parentTransform;
+     getMatrix(&parentTransform);
+     mSkiaCanvasProxy.get()->setMatrix(parentTransform);
+ 
      return mSkiaCanvasProxy.get();
  }
  
@@@ -135,8 -143,6 +143,8 @@@ int DisplayListCanvas::saveLayer(float 
  }
  
  void DisplayListCanvas::translate(float dx, float dy) {
 +    if (dx == 0.0f && dy == 0.0f) return;
 +
      mHasDeferredTranslate = true;
      mTranslateX += dx;
      mTranslateY += dy;
@@@ -145,15 -151,11 +153,15 @@@
  }
  
  void DisplayListCanvas::rotate(float degrees) {
 +    if (degrees == 0.0f) return;
 +
      addStateOp(new (alloc()) RotateOp(degrees));
      mState.rotate(degrees);
  }
  
  void DisplayListCanvas::scale(float sx, float sy) {
 +    if (sx == 1.0f && sy == 1.0f) return;
 +
      addStateOp(new (alloc()) ScaleOp(sx, sy));
      mState.scale(sx, sy);
  }