From 72dfa077d95c8889cbb008fc14021d283bfeef6c Mon Sep 17 00:00:00 2001 From: "erikchen@chromium.org" Date: Thu, 31 Jul 2014 20:00:17 +0000 Subject: 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 --- content/browser/browser_plugin/browser_plugin_guest.cc | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) (limited to 'content/browser/browser_plugin/browser_plugin_guest.cc') diff --git a/content/browser/browser_plugin/browser_plugin_guest.cc b/content/browser/browser_plugin/browser_plugin_guest.cc index 1da2fdd..ef729e4 100644 --- a/content/browser/browser_plugin/browser_plugin_guest.cc +++ b/content/browser/browser_plugin/browser_plugin_guest.cc @@ -223,10 +223,7 @@ void BrowserPluginGuest::Initialize( new BrowserPluginMsg_GuestContentWindowReady(instance_id_, guest_routing_id)); - // TODO(chrishtr): this code is wrong. The navigate_on_drag_drop field will - // be reset again the next time preferences are updated. - WebPreferences prefs = - GetWebContents()->GetRenderViewHost()->GetWebkitPreferences(); + WebPreferences prefs = GetWebContents()->GetWebkitPrefs(); prefs.navigate_on_drag_drop = false; GetWebContents()->GetRenderViewHost()->UpdateWebkitPreferences(prefs); -- cgit v1.1