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/web_contents/web_contents_impl.cc | |
| 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/web_contents/web_contents_impl.cc')
| -rw-r--r-- | content/browser/web_contents/web_contents_impl.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/content/browser/web_contents/web_contents_impl.cc b/content/browser/web_contents/web_contents_impl.cc index a0bf9b3..9c40100 100644 --- a/content/browser/web_contents/web_contents_impl.cc +++ b/content/browser/web_contents/web_contents_impl.cc @@ -3846,7 +3846,7 @@ bool WebContentsImpl::AddMessageToConsole(int32 level, source_id); } -WebPreferences WebContentsImpl::ComputeWebkitPrefs() { +WebPreferences WebContentsImpl::GetWebkitPrefs() { // We want to base the page config off of the actual URL, rather than the // virtual URL. // TODO(nasko): Investigate how to remove the GetActiveEntry usage here, @@ -3854,7 +3854,7 @@ WebPreferences WebContentsImpl::ComputeWebkitPrefs() { GURL url = controller_.GetActiveEntry() ? controller_.GetActiveEntry()->GetURL() : GURL::EmptyGURL(); - return GetRenderManager()->current_host()->ComputeWebkitPrefs(url); + return GetRenderManager()->current_host()->GetWebkitPrefs(url); } int WebContentsImpl::CreateSwappedOutRenderView( |