Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 84151432 authored by Narayan Kamath's avatar Narayan Kamath
Browse files

Track 64bit changes to android/graphics. 

All pointers are now 64bits wide, so should be
represented as java longs and not ints.

Also changed DelegateManager and SparseWeakArray to
reflect the new world order.

(cherry picked from commit 88a8364c)

Change-Id: Ic2f55dd6235751169c5014f9d2ccf3f544259a87
parent 5753b455

tools/layoutlib/bridge/src/android/graphics/AvoidXfermode_Delegate.java

+1 −1
Original line number Diff line number Diff line
@@ -61,7 +61,7 @@ public class AvoidXfermode_Delegate extends Xfermode_Delegate { 
    // ---- native methods ----



    @LayoutlibDelegate

    /*package*/ static int nativeCreate(int opColor, int tolerance, int nativeMode) {

    /*package*/ static long nativeCreate(int opColor, int tolerance, int nativeMode) {

        AvoidXfermode_Delegate newDelegate = new AvoidXfermode_Delegate();

        return sManager.addNewDelegate(newDelegate);

    }

tools/layoutlib/bridge/src/android/graphics/BitmapShader_Delegate.java

+2 −2
Original line number Diff line number Diff line
@@ -65,7 +65,7 @@ public class BitmapShader_Delegate extends Shader_Delegate { 
    // ---- native methods ----



    @LayoutlibDelegate

    /*package*/ static int nativeCreate(int native_bitmap, int shaderTileModeX,

    /*package*/ static long nativeCreate(long native_bitmap, int shaderTileModeX,

            int shaderTileModeY) {

        Bitmap_Delegate bitmap = Bitmap_Delegate.getDelegate(native_bitmap);

        if (bitmap == null) {
@@ -80,7 +80,7 @@ public class BitmapShader_Delegate extends Shader_Delegate { 
    }



    @LayoutlibDelegate

    /*package*/ static int nativePostCreate(int native_shader, int native_bitmap,

    /*package*/ static long nativePostCreate(long native_shader, long native_bitmap,

            int shaderTileModeX, int shaderTileModeY) {

        // pass, not needed.

        return 0;

tools/layoutlib/bridge/src/android/graphics/Bitmap_Delegate.java

+26 −26
Original line number Diff line number Diff line
@@ -83,7 +83,7 @@ public final class Bitmap_Delegate { 
    /**

     * Returns the native delegate associated to a given an int referencing a {@link Bitmap} object.

     */

    public static Bitmap_Delegate getDelegate(int native_bitmap) {

    public static Bitmap_Delegate getDelegate(long native_bitmap) {

        return sManager.getDelegate(native_bitmap);

    }
@@ -274,7 +274,7 @@ public final class Bitmap_Delegate { 
    }



    @LayoutlibDelegate

    /*package*/ static Bitmap nativeCopy(int srcBitmap, int nativeConfig, boolean isMutable) {

    /*package*/ static Bitmap nativeCopy(long srcBitmap, int nativeConfig, boolean isMutable) {

        Bitmap_Delegate srcBmpDelegate = sManager.getDelegate(srcBitmap);

        if (srcBmpDelegate == null) {

            return null;
@@ -303,18 +303,18 @@ public final class Bitmap_Delegate { 
    }



    @LayoutlibDelegate

    /*package*/ static void nativeDestructor(int nativeBitmap) {

    /*package*/ static void nativeDestructor(long nativeBitmap) {

        sManager.removeJavaReferenceFor(nativeBitmap);

    }



    @LayoutlibDelegate

    /*package*/ static boolean nativeRecycle(int nativeBitmap) {

    /*package*/ static boolean nativeRecycle(long nativeBitmap) {

        sManager.removeJavaReferenceFor(nativeBitmap);

        return true;

    }



    @LayoutlibDelegate

    /*package*/ static boolean nativeCompress(int nativeBitmap, int format, int quality,

    /*package*/ static boolean nativeCompress(long nativeBitmap, int format, int quality,

            OutputStream stream, byte[] tempStorage) {

        Bridge.getLog().error(LayoutLog.TAG_UNSUPPORTED,

                "Bitmap.compress() is not supported", null /*data*/);
@@ -322,7 +322,7 @@ public final class Bitmap_Delegate { 
    }



    @LayoutlibDelegate

    /*package*/ static void nativeErase(int nativeBitmap, int color) {

    /*package*/ static void nativeErase(long nativeBitmap, int color) {

        // get the delegate from the native int.

        Bitmap_Delegate delegate = sManager.getDelegate(nativeBitmap);

        if (delegate == null) {
@@ -342,7 +342,7 @@ public final class Bitmap_Delegate { 
    }



    @LayoutlibDelegate

    /*package*/ static int nativeWidth(int nativeBitmap) {

    /*package*/ static int nativeWidth(long nativeBitmap) {

        // get the delegate from the native int.

        Bitmap_Delegate delegate = sManager.getDelegate(nativeBitmap);

        if (delegate == null) {
@@ -353,7 +353,7 @@ public final class Bitmap_Delegate { 
    }



    @LayoutlibDelegate

    /*package*/ static int nativeHeight(int nativeBitmap) {

    /*package*/ static int nativeHeight(long nativeBitmap) {

        // get the delegate from the native int.

        Bitmap_Delegate delegate = sManager.getDelegate(nativeBitmap);

        if (delegate == null) {
@@ -364,7 +364,7 @@ public final class Bitmap_Delegate { 
    }



    @LayoutlibDelegate

    /*package*/ static int nativeRowBytes(int nativeBitmap) {

    /*package*/ static int nativeRowBytes(long nativeBitmap) {

        // get the delegate from the native int.

        Bitmap_Delegate delegate = sManager.getDelegate(nativeBitmap);

        if (delegate == null) {
@@ -375,7 +375,7 @@ public final class Bitmap_Delegate { 
    }



    @LayoutlibDelegate

    /*package*/ static int nativeConfig(int nativeBitmap) {

    /*package*/ static int nativeConfig(long nativeBitmap) {

        // get the delegate from the native int.

        Bitmap_Delegate delegate = sManager.getDelegate(nativeBitmap);

        if (delegate == null) {
@@ -386,7 +386,7 @@ public final class Bitmap_Delegate { 
    }



    @LayoutlibDelegate

    /*package*/ static boolean nativeHasAlpha(int nativeBitmap) {

    /*package*/ static boolean nativeHasAlpha(long nativeBitmap) {

        // get the delegate from the native int.

        Bitmap_Delegate delegate = sManager.getDelegate(nativeBitmap);

        if (delegate == null) {
@@ -397,7 +397,7 @@ public final class Bitmap_Delegate { 
    }



    @LayoutlibDelegate

    /*package*/ static boolean nativeHasMipMap(int nativeBitmap) {

    /*package*/ static boolean nativeHasMipMap(long nativeBitmap) {

        // get the delegate from the native int.

        Bitmap_Delegate delegate = sManager.getDelegate(nativeBitmap);

        if (delegate == null) {
@@ -408,7 +408,7 @@ public final class Bitmap_Delegate { 
    }



    @LayoutlibDelegate

    /*package*/ static int nativeGetPixel(int nativeBitmap, int x, int y) {

    /*package*/ static int nativeGetPixel(long nativeBitmap, int x, int y) {

        // get the delegate from the native int.

        Bitmap_Delegate delegate = sManager.getDelegate(nativeBitmap);

        if (delegate == null) {
@@ -419,7 +419,7 @@ public final class Bitmap_Delegate { 
    }



    @LayoutlibDelegate

    /*package*/ static void nativeGetPixels(int nativeBitmap, int[] pixels, int offset,

    /*package*/ static void nativeGetPixels(long nativeBitmap, int[] pixels, int offset,

            int stride, int x, int y, int width, int height) {

        Bitmap_Delegate delegate = sManager.getDelegate(nativeBitmap);

        if (delegate == null) {
@@ -431,7 +431,7 @@ public final class Bitmap_Delegate { 




    @LayoutlibDelegate

    /*package*/ static void nativeSetPixel(int nativeBitmap, int x, int y, int color) {

    /*package*/ static void nativeSetPixel(long nativeBitmap, int x, int y, int color) {

        Bitmap_Delegate delegate = sManager.getDelegate(nativeBitmap);

        if (delegate == null) {

            return;
@@ -441,7 +441,7 @@ public final class Bitmap_Delegate { 
    }



    @LayoutlibDelegate

    /*package*/ static void nativeSetPixels(int nativeBitmap, int[] colors, int offset,

    /*package*/ static void nativeSetPixels(long nativeBitmap, int[] colors, int offset,

            int stride, int x, int y, int width, int height) {

        Bitmap_Delegate delegate = sManager.getDelegate(nativeBitmap);

        if (delegate == null) {
@@ -452,21 +452,21 @@ public final class Bitmap_Delegate { 
    }



    @LayoutlibDelegate

    /*package*/ static void nativeCopyPixelsToBuffer(int nativeBitmap, Buffer dst) {

    /*package*/ static void nativeCopyPixelsToBuffer(long nativeBitmap, Buffer dst) {

        // FIXME implement native delegate

        Bridge.getLog().fidelityWarning(LayoutLog.TAG_UNSUPPORTED,

                "Bitmap.copyPixelsToBuffer is not supported.", null, null /*data*/);

    }



    @LayoutlibDelegate

    /*package*/ static void nativeCopyPixelsFromBuffer(int nb, Buffer src) {

    /*package*/ static void nativeCopyPixelsFromBuffer(long nb, Buffer src) {

        // FIXME implement native delegate

        Bridge.getLog().fidelityWarning(LayoutLog.TAG_UNSUPPORTED,

                "Bitmap.copyPixelsFromBuffer is not supported.", null, null /*data*/);

    }



    @LayoutlibDelegate

    /*package*/ static int nativeGenerationId(int nativeBitmap) {

    /*package*/ static int nativeGenerationId(long nativeBitmap) {

        Bitmap_Delegate delegate = sManager.getDelegate(nativeBitmap);

        if (delegate == null) {

            return 0;
@@ -486,7 +486,7 @@ public final class Bitmap_Delegate { 
    }



    @LayoutlibDelegate

    /*package*/ static boolean nativeWriteToParcel(int nativeBitmap, boolean isMutable,

    /*package*/ static boolean nativeWriteToParcel(long nativeBitmap, boolean isMutable,

            int density, Parcel p) {

        // This is only called when sending a bitmap through aidl, so really this should not

        // be called.
@@ -497,7 +497,7 @@ public final class Bitmap_Delegate { 
    }



    @LayoutlibDelegate

    /*package*/ static Bitmap nativeExtractAlpha(int nativeBitmap, int nativePaint,

    /*package*/ static Bitmap nativeExtractAlpha(long nativeBitmap, long nativePaint,

            int[] offsetXY) {

        Bitmap_Delegate bitmap = sManager.getDelegate(nativeBitmap);

        if (bitmap == null) {
@@ -525,12 +525,12 @@ public final class Bitmap_Delegate { 
    }



    @LayoutlibDelegate

    /*package*/ static void nativePrepareToDraw(int nativeBitmap) {

    /*package*/ static void nativePrepareToDraw(long nativeBitmap) {

        // nothing to be done here.

    }



    @LayoutlibDelegate

    /*package*/ static void nativeSetHasAlpha(int nativeBitmap, boolean hasAlpha) {

    /*package*/ static void nativeSetHasAlpha(long nativeBitmap, boolean hasAlpha) {

        // get the delegate from the native int.

        Bitmap_Delegate delegate = sManager.getDelegate(nativeBitmap);

        if (delegate == null) {
@@ -541,7 +541,7 @@ public final class Bitmap_Delegate { 
    }



    @LayoutlibDelegate

    /*package*/ static void nativeSetHasMipMap(int nativeBitmap, boolean hasMipMap) {

    /*package*/ static void nativeSetHasMipMap(long nativeBitmap, boolean hasMipMap) {

        // get the delegate from the native int.

        Bitmap_Delegate delegate = sManager.getDelegate(nativeBitmap);

        if (delegate == null) {
@@ -552,7 +552,7 @@ public final class Bitmap_Delegate { 
    }



    @LayoutlibDelegate

    /*package*/ static boolean nativeSameAs(int nb0, int nb1) {

    /*package*/ static boolean nativeSameAs(long nb0, long nb1) {

        Bitmap_Delegate delegate1 = sManager.getDelegate(nb0);

        if (delegate1 == null) {

            return false;
@@ -605,7 +605,7 @@ public final class Bitmap_Delegate { 
    private static Bitmap createBitmap(Bitmap_Delegate delegate,

            Set<BitmapCreateFlags> createFlags, int density) {

        // get its native_int

        int nativeInt = sManager.addNewDelegate(delegate);

        long nativeInt = sManager.addNewDelegate(delegate);



        int width = delegate.mImage.getWidth();

        int height = delegate.mImage.getHeight();

tools/layoutlib/bridge/src/android/graphics/BlurMaskFilter_Delegate.java

+1 −1
Original line number Diff line number Diff line
@@ -55,7 +55,7 @@ public class BlurMaskFilter_Delegate extends MaskFilter_Delegate { 
    // ---- native methods ----



    @LayoutlibDelegate

    /*package*/ static int nativeConstructor(float radius, int style) {

    /*package*/ static long nativeConstructor(float radius, int style) {

        BlurMaskFilter_Delegate newDelegate = new BlurMaskFilter_Delegate();

        return sManager.addNewDelegate(newDelegate);

    }