Merge "Revert "Cache display lists for Drawables""

2014-01-31 21:07:51 +00:00
parent fe0ea8c21f 16f1d81d47
commit c8577b384a
7 changed files with 22 additions and 97 deletions
--- a/api/current.txt
+++ b/api/current.txt
@@ -10349,6 +10349,7 @@ package android.graphics.drawable {
    ctor public BitmapDrawable(android.content.res.Resources, java.lang.String);
    ctor public deprecated BitmapDrawable(java.io.InputStream);
    ctor public BitmapDrawable(android.content.res.Resources, java.io.InputStream);
+    method public void draw(android.graphics.Canvas);
    method public final android.graphics.Bitmap getBitmap();
    method public final android.graphics.drawable.Drawable.ConstantState getConstantState();
    method public int getGravity();
@@ -10374,6 +10375,7 @@ package android.graphics.drawable {

  public class ClipDrawable extends android.graphics.drawable.Drawable implements android.graphics.drawable.Drawable.Callback {
    ctor public ClipDrawable(android.graphics.drawable.Drawable, int, int);
+    method public void draw(android.graphics.Canvas);
    method public int getOpacity();
    method public void invalidateDrawable(android.graphics.drawable.Drawable);
    method public void scheduleDrawable(android.graphics.drawable.Drawable, java.lang.Runnable, long);
@@ -10387,6 +10389,7 @@ package android.graphics.drawable {
  public class ColorDrawable extends android.graphics.drawable.Drawable {
    ctor public ColorDrawable();
    ctor public ColorDrawable(int);
+    method public void draw(android.graphics.Canvas);
    method public int getColor();
    method public int getOpacity();
    method public void setAlpha(int);
@@ -10405,7 +10408,7 @@ package android.graphics.drawable {
    method public static android.graphics.drawable.Drawable createFromStream(java.io.InputStream, java.lang.String);
    method public static android.graphics.drawable.Drawable createFromXml(android.content.res.Resources, org.xmlpull.v1.XmlPullParser) throws java.io.IOException, org.xmlpull.v1.XmlPullParserException;
    method public static android.graphics.drawable.Drawable createFromXmlInner(android.content.res.Resources, org.xmlpull.v1.XmlPullParser, android.util.AttributeSet) throws java.io.IOException, org.xmlpull.v1.XmlPullParserException;
-    method public void draw(android.graphics.Canvas);
+    method public abstract void draw(android.graphics.Canvas);
    method public int getAlpha();
    method public final android.graphics.Rect getBounds();
    method public android.graphics.drawable.Drawable.Callback getCallback();
@@ -10429,7 +10432,6 @@ package android.graphics.drawable {
    method public void jumpToCurrentState();
    method public android.graphics.drawable.Drawable mutate();
    method protected void onBoundsChange(android.graphics.Rect);
-    method protected void onDraw(android.graphics.Canvas);
    method protected boolean onLevelChange(int);
    method protected boolean onStateChange(int[]);
    method public static int resolveOpacity(int, int);
@@ -10465,6 +10467,7 @@ package android.graphics.drawable {

  public class DrawableContainer extends android.graphics.drawable.Drawable implements android.graphics.drawable.Drawable.Callback {
    ctor public DrawableContainer();
+    method public void draw(android.graphics.Canvas);
    method public int getOpacity();
    method public void invalidateDrawable(android.graphics.drawable.Drawable);
    method public void scheduleDrawable(android.graphics.drawable.Drawable, java.lang.Runnable, long);
@@ -10505,6 +10508,7 @@ package android.graphics.drawable {
  public class GradientDrawable extends android.graphics.drawable.Drawable {
    ctor public GradientDrawable();
    ctor public GradientDrawable(android.graphics.drawable.GradientDrawable.Orientation, int[]);
+    method public void draw(android.graphics.Canvas);
    method public int getOpacity();
    method public android.graphics.drawable.GradientDrawable.Orientation getOrientation();
    method public boolean onStateChange(int[]);
@@ -10551,6 +10555,7 @@ package android.graphics.drawable {
  public class InsetDrawable extends android.graphics.drawable.Drawable implements android.graphics.drawable.Drawable.Callback {
    ctor public InsetDrawable(android.graphics.drawable.Drawable, int);
    ctor public InsetDrawable(android.graphics.drawable.Drawable, int, int, int, int);
+    method public void draw(android.graphics.Canvas);
    method public android.graphics.drawable.Drawable getDrawable();
    method public int getOpacity();
    method public void invalidateDrawable(android.graphics.drawable.Drawable);
@@ -10562,6 +10567,7 @@ package android.graphics.drawable {

  public class LayerDrawable extends android.graphics.drawable.Drawable implements android.graphics.drawable.Drawable.Callback {
    ctor public LayerDrawable(android.graphics.drawable.Drawable[]);
+    method public void draw(android.graphics.Canvas);
    method public android.graphics.drawable.Drawable findDrawableByLayerId(int);
    method public android.graphics.drawable.Drawable getDrawable(int);
    method public int getId(int);
@@ -10592,6 +10598,7 @@ package android.graphics.drawable {
    ctor public NinePatchDrawable(android.content.res.Resources, android.graphics.Bitmap, byte[], android.graphics.Rect, java.lang.String);
    ctor public deprecated NinePatchDrawable(android.graphics.NinePatch);
    ctor public NinePatchDrawable(android.content.res.Resources, android.graphics.NinePatch);
+    method public void draw(android.graphics.Canvas);
    method public int getOpacity();
    method public android.graphics.Paint getPaint();
    method public void setAlpha(int);
@@ -10610,6 +10617,7 @@ package android.graphics.drawable {

  public class PictureDrawable extends android.graphics.drawable.Drawable {
    ctor public PictureDrawable(android.graphics.Picture);
+    method public void draw(android.graphics.Canvas);
    method public int getOpacity();
    method public android.graphics.Picture getPicture();
    method public void setAlpha(int);
@@ -10623,6 +10631,7 @@ package android.graphics.drawable {

  public class RotateDrawable extends android.graphics.drawable.Drawable implements android.graphics.drawable.Drawable.Callback {
    ctor public RotateDrawable();
+    method public void draw(android.graphics.Canvas);
    method public android.graphics.drawable.Drawable getDrawable();
    method public int getOpacity();
    method public void invalidateDrawable(android.graphics.drawable.Drawable);
@@ -10634,6 +10643,7 @@ package android.graphics.drawable {

  public class ScaleDrawable extends android.graphics.drawable.Drawable implements android.graphics.drawable.Drawable.Callback {
    ctor public ScaleDrawable(android.graphics.drawable.Drawable, int, float, float);
+    method public void draw(android.graphics.Canvas);
    method public android.graphics.drawable.Drawable getDrawable();
    method public int getOpacity();
    method public void invalidateDrawable(android.graphics.drawable.Drawable);
@@ -10646,6 +10656,7 @@ package android.graphics.drawable {
  public class ShapeDrawable extends android.graphics.drawable.Drawable {
    ctor public ShapeDrawable();
    ctor public ShapeDrawable(android.graphics.drawable.shapes.Shape);
+    method public void draw(android.graphics.Canvas);
    method public int getOpacity();
    method public android.graphics.Paint getPaint();
    method public android.graphics.drawable.ShapeDrawable.ShaderFactory getShaderFactory();
--- a/graphics/java/android/graphics/drawable/BitmapDrawable.java
+++ b/graphics/java/android/graphics/drawable/BitmapDrawable.java
@@ -456,7 +456,7 @@ public class BitmapDrawable extends Drawable {
    }

    @Override
-    protected void onDraw(Canvas canvas) {
+    public void draw(Canvas canvas) {
        Bitmap bitmap = mBitmap;
        if (bitmap != null) {
            final BitmapState state = mBitmapState;
--- a/graphics/java/android/graphics/drawable/Drawable.java
+++ b/graphics/java/android/graphics/drawable/Drawable.java
@@ -39,9 +39,6 @@ import android.util.DisplayMetrics;
 import android.util.StateSet;
 import android.util.TypedValue;
 import android.util.Xml;
-import android.view.DisplayList;
-import android.view.HardwareCanvas;
-import android.view.HardwareRenderer;
 import android.view.View;

 import java.io.IOException;
@@ -142,96 +139,16 @@ public abstract class Drawable {
    private Rect mBounds = ZERO_BOUNDS_RECT;  // lazily becomes a new Rect()
    private WeakReference<Callback> mCallback = null;
    private boolean mVisible = true;
-    private DisplayList mDisplayList;

    private int mLayoutDirection;

    /**
     * Draw in its bounds (set via setBounds) respecting optional effects such
     * as alpha (set via setAlpha) and color filter (set via setColorFilter).
-     * <p>
-     * Overriding this method will prevent caching optimizations. To enable
-     * optimizations, override {@link #onDraw} instead.
     *
     * @param canvas The canvas to draw into
     */
-    public void draw(Canvas canvas) {
-        if (canvas != null && canvas.isHardwareAccelerated() && false) { // temporarily disabled
-            final HardwareCanvas hardwareCanvas = (HardwareCanvas) canvas;
-            final DisplayList displayList = getDisplayList(hardwareCanvas);
-            if (displayList != null) {
-                final int restoreCount = hardwareCanvas.save(Canvas.MATRIX_SAVE_FLAG);
-                hardwareCanvas.translate(mBounds.left, mBounds.top);
-                hardwareCanvas.drawDisplayList(displayList);
-                hardwareCanvas.restoreToCount(restoreCount);
-                return;
-            }
-        }
-
-        onDraw(canvas);
-    }
-
-    /**
-     * Draw in its bounds (set via setBounds) respecting optional effects such
-     * as alpha (set via setAlpha) and color filter (set via setColorFilter).
-     * <p>
-     * Overriding this method, rather than {@link #draw}, enables caching
-     * optimizations that avoid re-drawing when unnecessary.
-     *
-     * @param canvas The canvas to draw into
-     */
-    protected void onDraw(Canvas canvas) {
-        throw new UnsupportedOperationException(
-                "Drawable subclasses must implement either draw or onDraw");
-    }
-
-    /**
-     * Gets a display list that can be used to draw this drawable again without
-     * invoking its draw method.
-     *
-     * @param hardwareCanvas The hardware canvas.
-     * @return A DisplayList ready to replay, or null if caching is not enabled.
-     * @hide
-     */
-    private DisplayList getDisplayList(HardwareCanvas hardwareCanvas) {
-        DisplayList displayList = mDisplayList;
-        if (displayList != null && displayList.isValid()) {
-            // Note: This code assumes that the display list previously generated
-            // is compatible with the given hardware canvas.  That might not be true
-            // if we start using multiple different types of hardware canvas
-            // in the system someday.
-            return displayList;
-        }
-
-        displayList = DisplayList.create(getClass().getName());
-        mDisplayList = displayList;
-
-        final Rect bounds = mBounds;
-        final int width = bounds.width();
-        final int height = bounds.height();
-        final HardwareCanvas canvas = displayList.start(width, height);
-        canvas.onPreDraw(null);
-
-        // Draw the display list with origin (0,0) so that if the position
-        // changes then we can translate without recreating the display list.
-        final int restoreCount = canvas.save();
-        try {
-            canvas.translate(-bounds.left, -bounds.top);
-            onDraw(canvas);
-        } finally {
-            canvas.restoreToCount(restoreCount);
-            canvas.onPostDraw();
-            displayList.end();
-        }
-
-        displayList.setLeftTopRightBottom(0, 0, width, height);
-        displayList.setClipToBounds(false);
-        return displayList;
-    }
-
-    private void invalidateDisplayList() {
-        mDisplayList = null;
-    }
+    public abstract void draw(Canvas canvas);

    /**
     * Specify a bounding rectangle for the Drawable. This is where the drawable
@@ -246,11 +163,10 @@ public abstract class Drawable {

        if (oldBounds.left != left || oldBounds.top != top ||
                oldBounds.right != right || oldBounds.bottom != bottom) {
-            if (oldBounds.right - oldBounds.left != right - left
-                    || oldBounds.bottom - oldBounds.top != bottom - top) {
-                invalidateDisplayList();
+            if (!oldBounds.isEmpty()) {
+                // first invalidate the previous bounds
+                invalidateSelf();
            }
-
            mBounds.set(left, top, right, bottom);
            onBoundsChange(mBounds);
        }
@@ -438,8 +354,6 @@ public abstract class Drawable {
     * @see #setCallback(android.graphics.drawable.Drawable.Callback) 
     */
    public void invalidateSelf() {
-        invalidateDisplayList();
-
        final Callback callback = getCallback();
        if (callback != null) {
            callback.invalidateDrawable(this);
--- a/graphics/java/android/graphics/drawable/GradientDrawable.java
+++ b/graphics/java/android/graphics/drawable/GradientDrawable.java
@@ -472,7 +472,7 @@ public class GradientDrawable extends Drawable {
    }

    @Override
-    protected void onDraw(Canvas canvas) {
+    public void draw(Canvas canvas) {
        if (!ensureValidRect()) {
            // nothing to draw
            return;
--- a/graphics/java/android/graphics/drawable/NinePatchDrawable.java
+++ b/graphics/java/android/graphics/drawable/NinePatchDrawable.java
@@ -223,7 +223,7 @@ public class NinePatchDrawable extends Drawable {
    }

    @Override
-    protected void onDraw(Canvas canvas) {
+    public void draw(Canvas canvas) {
        final Rect bounds = getBounds();
        final boolean needsMirroring = needsMirroring();
        if (needsMirroring) {
--- a/graphics/java/android/graphics/drawable/PictureDrawable.java
+++ b/graphics/java/android/graphics/drawable/PictureDrawable.java
@@ -60,7 +60,7 @@ public class PictureDrawable extends Drawable {
    }
    
    @Override
-    protected void onDraw(Canvas canvas) {
+    public void draw(Canvas canvas) {
        if (mPicture != null) {
            Rect bounds = getBounds();
            canvas.save();
--- a/graphics/java/android/graphics/drawable/ShapeDrawable.java
+++ b/graphics/java/android/graphics/drawable/ShapeDrawable.java
@@ -210,7 +210,7 @@ public class ShapeDrawable extends Drawable {
    }

    @Override
-    protected void onDraw(Canvas canvas) {
+    public void draw(Canvas canvas) {
        Rect r = getBounds();
        Paint paint = mShapeState.mPaint;