am de3ff4b4: am 42773328: Merge "Refactor Canvas.drawPicture() to delegate to Picture" into klp-dev

* commit 'de3ff4b4859a92a19d84b33f5a93a0b3454698e6':
  Refactor Canvas.drawPicture() to delegate to Picture
This commit is contained in:
Jonathan Dixon
2013-08-09 06:06:55 -07:00
committed by Android Git Automerger
3 changed files with 3 additions and 28 deletions

View File

@@ -1646,7 +1646,9 @@ public class Canvas {
*/
public void drawPicture(Picture picture) {
picture.endRecording();
native_drawPicture(mNativeCanvas, picture.ni());
int restoreCount = save();
picture.draw(this);
restoreToCount(restoreCount);
}
/**
@@ -1831,7 +1833,5 @@ public class Canvas {
float hOffset,
float vOffset,
int flags, int paint);
private static native void native_drawPicture(int nativeCanvas,
int nativePicture);
private static native void finalizer(int nativeCanvas);
}