diff options
| author | joth@chromium.org <joth@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-12-28 00:11:36 +0000 |
|---|---|---|
| committer | joth@chromium.org <joth@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-12-28 00:11:36 +0000 |
| commit | 08fb0b5f0f8536bd27a76f9d292f642bb8bd270b (patch) | |
| tree | 5406bc075fe223ffe1b5d96caf2fcc15650c15c7 /android_webview | |
| parent | 593bc56c176e3c87274bebb063a566cefa77d176 (diff) | |
| download | chromium_src-08fb0b5f0f8536bd27a76f9d292f642bb8bd270b.zip chromium_src-08fb0b5f0f8536bd27a76f9d292f642bb8bd270b.tar.gz chromium_src-08fb0b5f0f8536bd27a76f9d292f642bb8bd270b.tar.bz2 | |
Fix AwBrowserProcess.loadLibrary to only load
AwBrowserProcess.loadLibrary should only load the library, initialization
needs to be deferred until the start() method is called, as only that
method deals with ensuring initialization happens on the main thread.
BUG=
Review URL: https://codereview.chromium.org/11665023
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@174712 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'android_webview')
| -rw-r--r-- | android_webview/java/src/org/chromium/android_webview/AwBrowserProcess.java | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/android_webview/java/src/org/chromium/android_webview/AwBrowserProcess.java b/android_webview/java/src/org/chromium/android_webview/AwBrowserProcess.java index aa70dd2..682706a 100644 --- a/android_webview/java/src/org/chromium/android_webview/AwBrowserProcess.java +++ b/android_webview/java/src/org/chromium/android_webview/AwBrowserProcess.java @@ -31,7 +31,7 @@ public abstract class AwBrowserProcess { public static void loadLibrary() { PathUtils.setPrivateDataDirectorySuffix(PRIVATE_DATA_DIRECTORY_SUFFIX); LibraryLoader.setLibraryToLoad(NATIVE_LIBRARY); - LibraryLoader.ensureInitialized(); + LibraryLoader.loadNow(); } /** @@ -46,6 +46,7 @@ public abstract class AwBrowserProcess { ThreadUtils.runOnUiThreadBlocking(new Runnable() { @Override public void run() { + LibraryLoader.ensureInitialized(); AndroidBrowserProcess.initContentViewProcess(context, AndroidBrowserProcess.MAX_RENDERERS_SINGLE_PROCESS); } |