diff options
| -rw-r--r-- | android_webview/java/src/org/chromium/android_webview/AwSettings.java | 15 |
1 files changed, 10 insertions, 5 deletions
diff --git a/android_webview/java/src/org/chromium/android_webview/AwSettings.java b/android_webview/java/src/org/chromium/android_webview/AwSettings.java index 3461517..587ca48 100644 --- a/android_webview/java/src/org/chromium/android_webview/AwSettings.java +++ b/android_webview/java/src/org/chromium/android_webview/AwSettings.java @@ -280,13 +280,19 @@ public class AwSettings { if (nativeWebContents != 0) { mEventHandler.bindUiThread(); mNativeAwSettings = nativeInit(nativeWebContents); - nativeUpdateEverythingLocked(mNativeAwSettings); - onGestureZoomSupportChanged( - supportsDoubleTapZoomLocked(), supportsMultiTouchZoomLocked()); + updateEverythingLocked(); } } } + private void updateEverythingLocked() { + assert Thread.holdsLock(mAwSettingsLock); + assert mNativeAwSettings != 0; + nativeUpdateEverythingLocked(mNativeAwSettings); + onGestureZoomSupportChanged( + supportsDoubleTapZoomLocked(), supportsMultiTouchZoomLocked()); + } + /** * See {@link android.webkit.WebSettings#setBlockNetworkLoads}. */ @@ -1574,8 +1580,7 @@ public class AwSettings { @CalledByNative private void updateEverything() { synchronized (mAwSettingsLock) { - assert mNativeAwSettings != 0; - nativeUpdateEverythingLocked(mNativeAwSettings); + updateEverythingLocked(); } } |