diff options
author | erikchen@chromium.org <erikchen@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-07-31 20:00:17 +0000 |
---|---|---|
committer | erikchen@chromium.org <erikchen@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-07-31 20:00:17 +0000 |
commit | 72dfa077d95c8889cbb008fc14021d283bfeef6c (patch) | |
tree | ff519fdb0ee56707936be28402c289d31a4f0d07 /content/browser/renderer_host/render_view_host_impl.h | |
parent | 8fed76e91b6c8406b30af0c0dbc01314cf2bd1db (diff) | |
download | chromium_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 'content/browser/renderer_host/render_view_host_impl.h')
-rw-r--r-- | content/browser/renderer_host/render_view_host_impl.h | 8 |
1 files changed, 1 insertions, 7 deletions
diff --git a/content/browser/renderer_host/render_view_host_impl.h b/content/browser/renderer_host/render_view_host_impl.h index 250204e..e2a9764 100644 --- a/content/browser/renderer_host/render_view_host_impl.h +++ b/content/browser/renderer_host/render_view_host_impl.h @@ -204,7 +204,6 @@ class CONTENT_EXPORT RenderViewHostImpl virtual WebPreferences GetWebkitPreferences() OVERRIDE; virtual void UpdateWebkitPreferences( const WebPreferences& prefs) OVERRIDE; - virtual void OnWebkitPreferencesChanged() OVERRIDE; virtual void GetAudioOutputControllers( const GetAudioOutputControllersCallback& callback) const OVERRIDE; virtual void SelectWordAroundCaret() OVERRIDE; @@ -242,7 +241,7 @@ class CONTENT_EXPORT RenderViewHostImpl } // Returns the content specific prefs for this RenderViewHost. - WebPreferences ComputeWebkitPrefs(const GURL& url); + WebPreferences GetWebkitPrefs(const GURL& url); // Sends the given navigation message. Use this rather than sending it // yourself since this does the internal bookkeeping described below. This @@ -608,11 +607,6 @@ class CONTENT_EXPORT RenderViewHostImpl // True if the current focused element is editable. bool is_focused_element_editable_; - // This is updated every time UpdateWebkitPreferences is called. That method - // is in turn called when any of the settings change that the WebPreferences - // values depend on. - scoped_ptr<WebPreferences> web_preferences_; - DISALLOW_COPY_AND_ASSIGN(RenderViewHostImpl); }; |