diff options
| author | Ben Murdoch <benm@google.com> | 2011-08-17 02:28:37 -0700 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2011-08-17 02:28:37 -0700 |
| commit | 2d9e4c5514130be5468050cdf7b1ad8c5a57ac39 (patch) | |
| tree | 2368bb5a21956acb815e5b5fafb91eaeb8f1ba5c /Source/WebKit/android/jni/WebCoreFrameBridge.cpp | |
| parent | 41b52b2ab048f02c6ec7732f1e1a3430d8272da9 (diff) | |
| parent | ce03c1c1203621e552d41a8b3831837636f364a9 (diff) | |
| download | external_webkit-2d9e4c5514130be5468050cdf7b1ad8c5a57ac39.zip external_webkit-2d9e4c5514130be5468050cdf7b1ad8c5a57ac39.tar.gz external_webkit-2d9e4c5514130be5468050cdf7b1ad8c5a57ac39.tar.bz2 | |
Merge "Lazily decode assets for form controls."
Diffstat (limited to 'Source/WebKit/android/jni/WebCoreFrameBridge.cpp')
| -rw-r--r-- | Source/WebKit/android/jni/WebCoreFrameBridge.cpp | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/Source/WebKit/android/jni/WebCoreFrameBridge.cpp b/Source/WebKit/android/jni/WebCoreFrameBridge.cpp index a7f3897..afc251b 100644 --- a/Source/WebKit/android/jni/WebCoreFrameBridge.cpp +++ b/Source/WebKit/android/jni/WebCoreFrameBridge.cpp @@ -1390,11 +1390,10 @@ static void CreateFrame(JNIEnv* env, jobject obj, jobject javaview, jobject jAss if (directory.isEmpty()) LOGE("Can't find the drawable directory"); else { - // Setup the asset manager. - AssetManager* am = assetManagerForJavaObject(env, jAssetManager); // Initialize our skinning classes - webFrame->setRenderSkins(new WebCore::RenderSkinAndroid(am, directory)); + webFrame->setRenderSkins(new WebCore::RenderSkinAndroid(directory)); } + for (int i = WebCore::PlatformBridge::FileUploadLabel; i <= WebCore::PlatformBridge::FileUploadNoFileChosenLabel; i++) initGlobalLocalizedName( |