ui/android: Fix Resource meta-data sharing with ResourceManager.

ui/android/java/src/org/chromium/ui/resources/ResourceManager.java

 // Copyright 2014 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 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;
 import org.chromium.base.annotations.JNINamespace;
 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;
 import org.chromium.ui.resources.sprites.CrushedSpriteResourceLoader;
 import org.chromium.ui.resources.statics.StaticResourceLoader;
 import org.chromium.ui.resources.system.SystemResourceLoader;
 
 /**
  * The Java component of a manager for all static resources to be loaded and used by CC layers.
  * This class does not hold any resource state, but passes it directly to native as they are loaded.
@@ skipping 123 matching lines @@
                 nativeOnCrushedSpriteResourceReady(mNativeResourceManagerPtr, resId,
                         crushedResource.getBitmap(), crushedResource.getFrameRectangles(),
                         crushedResource.getUnscaledSpriteWidth(),
                         crushedResource.getUnscaledSpriteHeight(),
                         crushedResource.getScaledSpriteWidth(),
                         crushedResource.getScaledSpriteHeight());
             }
             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
     public void onResourceUnregistered(int resType, int resId) {
         // Only remove dynamic bitmaps that were unregistered.
         if (resType != AndroidResourceType.DYNAMIC_BITMAP) return;
 
         nativeRemoveResource(mNativeResourceManagerPtr, resType, resId);
     }
 
@@ skipping 49 matching lines @@
     @CalledByNative
     private long getNativePtr() {
         return mNativeResourceManagerPtr;
     }
 
     private void registerResourceLoader(ResourceLoader loader) {
         mResourceLoaders.put(loader.getResourceType(), loader);
     }
 
     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);
     private native void nativeOnCrushedSpriteResourceReloaded(long nativeResourceManagerImpl,
             int bitmapResId, Bitmap bitmap);
     private native void nativeRemoveResource(long nativeResourceManagerImpl, int resType,
             int resId);
     private native void nativeClearTintedResourceCache(long nativeResourceManagerImpl);
-
 }