diff options
| author | mal@google.com <mal@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2008-08-02 22:36:08 +0000 |
|---|---|---|
| committer | mal@google.com <mal@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2008-08-02 22:36:08 +0000 |
| commit | 38ff9e215929224e46f12732a684c7d7e0c8ab86 (patch) | |
| tree | 9ed03dfd3cef72b9cd85d977040340dcf00a7bbf | |
| parent | 6299d15308952255f04bb74a0db84c01309f484e (diff) | |
| download | chromium_src-38ff9e215929224e46f12732a684c7d7e0c8ab86.zip chromium_src-38ff9e215929224e46f12732a684c7d7e0c8ab86.tar.gz chromium_src-38ff9e215929224e46f12732a684c7d7e0c8ab86.tar.bz2 | |
r65 was reverted in r71 because of a crash spike in the reliability tests.
It hasn't relanded, yet, so I thought I'd put it back before it slips through the cracks.
Original Description (r65, creis):
Makes the process model heuristic for generated searches only apply in --process-per-site, since it isn't relevant otherwise. (This matters now that process-per-site-instance is the default.)
BUG=1256259
TEST=Visit a non-Google page, then run a search from the location bar. The tab should switch renderer processes.
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@295 0039d316-1c4b-4281-b951-d872f2087c98
| -rw-r--r-- | chrome/browser/web_contents.cc | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/chrome/browser/web_contents.cc b/chrome/browser/web_contents.cc index 927fc54..9ed7927 100644 --- a/chrome/browser/web_contents.cc +++ b/chrome/browser/web_contents.cc @@ -861,7 +861,7 @@ SiteInstance* WebContents::GetSiteInstanceForEntry( if (entry.site_instance()) return entry.site_instance(); - // (UGLY) HEURISTIC: + // (UGLY) HEURISTIC, process-per-site only: // // If this navigation is generated, then it probably corresponds to a search // query. Given that search results typically lead to users navigating to @@ -871,7 +871,8 @@ SiteInstance* WebContents::GetSiteInstanceForEntry( // NOTE: This can be removed once we have a way to transition between // RenderViews in response to a link click. // - if (entry.GetTransitionType() == PageTransition::GENERATED) + if (CommandLine().HasSwitch(switches::kProcessPerSite) && + entry.GetTransitionType() == PageTransition::GENERATED) return curr_instance; const GURL& dest_url = entry.GetURL(); |