Index: ui/android/java/src/org/chromium/ui/resources/ResourceManager.java |
diff --git a/ui/android/java/src/org/chromium/ui/resources/ResourceManager.java b/ui/android/java/src/org/chromium/ui/resources/ResourceManager.java |
index 0063df238bfba00a270a4019cd13bac8aef9f173..c0905e1a61716a4ad672a280a42e4721c40d2314 100644 |
--- a/ui/android/java/src/org/chromium/ui/resources/ResourceManager.java |
+++ b/ui/android/java/src/org/chromium/ui/resources/ResourceManager.java |
@@ -7,7 +7,6 @@ package org.chromium.ui.resources; |
import android.content.Context; |
import android.content.res.Resources; |
import android.graphics.Bitmap; |
-import android.graphics.Rect; |
import android.util.SparseArray; |
import org.chromium.base.annotations.CalledByNative; |
@@ -16,6 +15,7 @@ import org.chromium.base.annotations.MainDex; |
import org.chromium.ui.base.WindowAndroid; |
import org.chromium.ui.display.DisplayAndroid; |
import org.chromium.ui.resources.ResourceLoader.ResourceLoaderCallback; |
+import org.chromium.ui.resources.dynamics.BitmapDynamicResource; |
import org.chromium.ui.resources.dynamics.DynamicResource; |
import org.chromium.ui.resources.dynamics.DynamicResourceLoader; |
import org.chromium.ui.resources.sprites.CrushedSpriteResource; |
@@ -159,12 +159,8 @@ public class ResourceManager implements ResourceLoaderCallback { |
return; |
} |
- Rect padding = resource.getPadding(); |
- Rect aperture = resource.getAperture(); |
- |
nativeOnResourceReady(mNativeResourceManagerPtr, resType, resId, resource.getBitmap(), |
- padding.left, padding.top, padding.right, padding.bottom, |
- aperture.left, aperture.top, aperture.right, aperture.bottom); |
+ resource.createNativeResource()); |
} |
@Override |
@@ -234,9 +230,7 @@ public class ResourceManager implements ResourceLoaderCallback { |
} |
private native void nativeOnResourceReady(long nativeResourceManagerImpl, int resType, |
- int resId, Bitmap bitmap, int paddingLeft, int paddingTop, int paddingRight, |
- int paddingBottom, int apertureLeft, int apertureTop, int apertureRight, |
- int apertureBottom); |
+ int resId, Bitmap bitmap, long nativeResource); |
private native void nativeOnCrushedSpriteResourceReady(long nativeResourceManagerImpl, |
int bitmapResId, Bitmap bitmap, int[][] frameRects, int unscaledSpriteWidth, |
int unscaledSpriteHeight, float scaledSpriteWidth, float scaledSpriteHeight); |
@@ -245,5 +239,4 @@ public class ResourceManager implements ResourceLoaderCallback { |
private native void nativeRemoveResource(long nativeResourceManagerImpl, int resType, |
int resId); |
private native void nativeClearTintedResourceCache(long nativeResourceManagerImpl); |
- |
} |