diff options
author | Narayan Kamath <narayan@google.com> | 2014-01-27 14:24:16 +0000 |
---|---|---|
committer | Narayan Kamath <narayan@google.com> | 2014-01-28 17:56:12 +0000 |
commit | 84151432e7ead6666eb8cf6377bff577b2027694 (patch) | |
tree | 63b2a9669b101caa1e2776439d5e7a0d37b27ee7 /tools/layoutlib/bridge/src/android/graphics/NinePatch_Delegate.java | |
parent | 5753b45516607988d5e84fee448d020911dde5d1 (diff) | |
download | frameworks_base-84151432e7ead6666eb8cf6377bff577b2027694.zip frameworks_base-84151432e7ead6666eb8cf6377bff577b2027694.tar.gz frameworks_base-84151432e7ead6666eb8cf6377bff577b2027694.tar.bz2 |
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 88a8364c386c694f7ad56662ef89713dbf7c9d63)
Change-Id: Ic2f55dd6235751169c5014f9d2ccf3f544259a87
Diffstat (limited to 'tools/layoutlib/bridge/src/android/graphics/NinePatch_Delegate.java')
-rw-r--r-- | tools/layoutlib/bridge/src/android/graphics/NinePatch_Delegate.java | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/tools/layoutlib/bridge/src/android/graphics/NinePatch_Delegate.java b/tools/layoutlib/bridge/src/android/graphics/NinePatch_Delegate.java index fa68796..a5c52e5 100644 --- a/tools/layoutlib/bridge/src/android/graphics/NinePatch_Delegate.java +++ b/tools/layoutlib/bridge/src/android/graphics/NinePatch_Delegate.java @@ -158,7 +158,7 @@ public final class NinePatch_Delegate { } @LayoutlibDelegate - /*package*/ static int validateNinePatchChunk(int bitmap, byte[] chunk) { + /*package*/ static long validateNinePatchChunk(long bitmap, byte[] chunk) { // the default JNI implementation only checks that the byte[] has the same // size as the C struct it represent. Since we cannot do the same check (serialization // will return different size depending on content), we do nothing. @@ -167,13 +167,13 @@ public final class NinePatch_Delegate { return sManager.addNewDelegate(newDelegate); } - /*package*/ static void nativeFinalize(int chunk) { + /*package*/ static void nativeFinalize(long chunk) { sManager.removeJavaReferenceFor(chunk); } @LayoutlibDelegate - /*package*/ static void nativeDraw(int canvas_instance, RectF loc, int bitmap_instance, - int chunk, int paint_instance_or_null, int destDensity, int srcDensity) { + /*package*/ static void nativeDraw(long canvas_instance, RectF loc, long bitmap_instance, + long chunk, long paint_instance_or_null, int destDensity, int srcDensity) { draw(canvas_instance, (int) loc.left, (int) loc.top, (int) loc.width(), (int) loc.height(), bitmap_instance, chunk, paint_instance_or_null, @@ -181,8 +181,8 @@ public final class NinePatch_Delegate { } @LayoutlibDelegate - /*package*/ static void nativeDraw(int canvas_instance, Rect loc, int bitmap_instance, - int chunk, int paint_instance_or_null, int destDensity, int srcDensity) { + /*package*/ static void nativeDraw(long canvas_instance, Rect loc, long bitmap_instance, + long chunk, long paint_instance_or_null, int destDensity, int srcDensity) { draw(canvas_instance, loc.left, loc.top, loc.width(), loc.height(), bitmap_instance, chunk, paint_instance_or_null, @@ -190,15 +190,15 @@ public final class NinePatch_Delegate { } @LayoutlibDelegate - /*package*/ static int nativeGetTransparentRegion(int bitmap, int chunk, Rect location) { + /*package*/ static long nativeGetTransparentRegion(long bitmap, long chunk, Rect location) { return 0; } // ---- Private Helper methods ---- - private static void draw(int canvas_instance, + private static void draw(long canvas_instance, final int left, final int top, final int right, final int bottom, - int bitmap_instance, int chunk, int paint_instance_or_null, + long bitmap_instance, long chunk, long paint_instance_or_null, final int destDensity, final int srcDensity) { // get the delegate from the native int. final Bitmap_Delegate bitmap_delegate = Bitmap_Delegate.getDelegate(bitmap_instance); |