am 7db6ebe0: Merge "Frameworks/base: Don\'t allocate another identity matrix"

* commit '7db6ebe03719dfc6b9fb680b038fd9ef0302e4ca':
  Frameworks/base: Don't allocate another identity matrix
This commit is contained in:
Andreas Gampe
2015-03-24 16:14:33 +00:00
committed by Android Git Automerger

View File

@ -791,7 +791,6 @@ public class VectorDrawable extends Drawable {
// is no need for deep copying. // is no need for deep copying.
private final Path mPath; private final Path mPath;
private final Path mRenderPath; private final Path mRenderPath;
private static final Matrix IDENTITY_MATRIX = new Matrix();
private final Matrix mFinalPathMatrix = new Matrix(); private final Matrix mFinalPathMatrix = new Matrix();
private Paint mStrokePaint; private Paint mStrokePaint;
@ -932,7 +931,7 @@ public class VectorDrawable extends Drawable {
public void draw(Canvas canvas, int w, int h, ColorFilter filter) { public void draw(Canvas canvas, int w, int h, ColorFilter filter) {
// Travese the tree in pre-order to draw. // Travese the tree in pre-order to draw.
drawGroupTree(mRootGroup, IDENTITY_MATRIX, canvas, w, h, filter); drawGroupTree(mRootGroup, Matrix.IDENTITY_MATRIX, canvas, w, h, filter);
} }
private void drawPath(VGroup vGroup, VPath vPath, Canvas canvas, int w, int h, private void drawPath(VGroup vGroup, VPath vPath, Canvas canvas, int w, int h,