commit f1142b051b973707055b5aafb93c22e7e2dfd7fd
author Ben Murdoch <benm@google.com> Wed Aug 17 02:28:52 2011 -0700
committer Android (Google) Code Review <android-gerrit@google.com> Wed Aug 17 02:28:52 2011 -0700
tree 3b52e1cf452f1c5fc9b99bf1e24842d1ed5cc19e
parent e518be3085c7457f3451a64fbea3f9499ae39bf5
parent 4d830071fa0e447a5b7fc694886204bc820897a8

Merge "No need to pass an AssetManager to native when creating a WebView"

core/java/android/webkit/WebView.java

diff --git a/core/java/android/webkit/WebView.java b/core/java/android/webkit/WebView.java
index 2bb9da1..6374b47 100644
--- a/core/java/android/webkit/WebView.java
+++ b/core/java/android/webkit/WebView.java
@@ -27,7 +27,6 @@
 import android.content.IntentFilter;
 import android.content.pm.PackageInfo;
 import android.content.pm.PackageManager;
-import android.content.res.AssetManager;
 import android.content.res.Configuration;
 import android.database.DataSetObserver;
 import android.graphics.Bitmap;
@@ -8104,8 +8103,7 @@
                     // nativeCreate sets mNativeClass to a non-zero value
                     String drawableDir = BrowserFrame.getRawResFilename(
                             BrowserFrame.DRAWABLEDIR, mContext);
-                    AssetManager am = mContext.getAssets();
-                    nativeCreate(msg.arg1, drawableDir, am);
+                    nativeCreate(msg.arg1, drawableDir);
                     if (mDelaySetPicture != null) {
                         setNewPicture(mDelaySetPicture, true);
                         mDelaySetPicture = null;
@@ -9140,7 +9138,7 @@
     private native Rect nativeCacheHitNodeBounds();
     private native int nativeCacheHitNodePointer();
     /* package */ native void nativeClearCursor();
-    private native void     nativeCreate(int ptr, String drawableDir, AssetManager am);
+    private native void     nativeCreate(int ptr, String drawableDir);
     private native int      nativeCursorFramePointer();
     private native Rect     nativeCursorNodeBounds();
     private native int nativeCursorNodePointer();