summaryrefslogtreecommitdiffstats
path: root/android_webview
diff options
context:
space:
mode:
authorerikchen@chromium.org <erikchen@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2014-07-31 20:00:17 +0000
committererikchen@chromium.org <erikchen@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2014-07-31 20:00:17 +0000
commit72dfa077d95c8889cbb008fc14021d283bfeef6c (patch)
treeff519fdb0ee56707936be28402c289d31a4f0d07 /android_webview
parent8fed76e91b6c8406b30af0c0dbc01314cf2bd1db (diff)
downloadchromium_src-72dfa077d95c8889cbb008fc14021d283bfeef6c.zip
chromium_src-72dfa077d95c8889cbb008fc14021d283bfeef6c.tar.gz
chromium_src-72dfa077d95c8889cbb008fc14021d283bfeef6c.tar.bz2
Revert of Cache the current WebPreferences on RenderViewHostImpl. (https://codereview.chromium.org/373323003/)
Reason for revert: Causes DOA on 38-dev. https://code.google.com/p/chromium/issues/detail?id=398751 Original issue's description: > Cache the current WebPreferences on RenderViewHostImpl. > > This makes lookups of a WebPreferences field fast. > In order do this, add code to listen to all preferences updates in order to recompute the cache. > > BUG=390799 > > Committed: https://src.chromium.org/viewvc/chrome?view=rev&revision=284592 TBR=jam, michaelbai, chrishtr, avi NOTREECHECKS=true NOTRY=true BUG=390799 Review URL: https://codereview.chromium.org/429413003 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@286876 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'android_webview')
-rw-r--r--android_webview/native/aw_settings.cc3
1 files changed, 2 insertions, 1 deletions
diff --git a/android_webview/native/aw_settings.cc b/android_webview/native/aw_settings.cc
index 2a0a50b..e9ba10e 100644
--- a/android_webview/native/aw_settings.cc
+++ b/android_webview/native/aw_settings.cc
@@ -158,7 +158,8 @@ void AwSettings::UpdateWebkitPreferencesLocked(JNIEnv* env, jobject obj) {
content::RenderViewHost* render_view_host =
web_contents()->GetRenderViewHost();
if (!render_view_host) return;
- render_view_host->OnWebkitPreferencesChanged();
+ render_view_host->UpdateWebkitPreferences(
+ render_view_host->GetWebkitPreferences());
}
void AwSettings::UpdateInitialPageScaleLocked(JNIEnv* env, jobject obj) {