summaryrefslogtreecommitdiffstats
path: root/content
diff options
context:
space:
mode:
authorpfeldman@chromium.org <pfeldman@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-11-06 22:31:47 +0000
committerpfeldman@chromium.org <pfeldman@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-11-06 22:31:47 +0000
commit1c210f69e18070b479821fd2f023f6e9b55ef29d (patch)
tree69fd0c6dfd5cda47fd3564211686b48991896baa /content
parentde37493890fd13c37a6ae95b67b96f906f8a58e8 (diff)
downloadchromium_src-1c210f69e18070b479821fd2f023f6e9b55ef29d.zip
chromium_src-1c210f69e18070b479821fd2f023f6e9b55ef29d.tar.gz
chromium_src-1c210f69e18070b479821fd2f023f6e9b55ef29d.tar.bz2
Reloading a view-source: page from the devtools loads the original (non-view-source) page
BUG=112701 Review URL: https://chromiumcodereview.appspot.com/11365031 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@166287 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'content')
-rw-r--r--content/renderer/render_view_impl.cc6
1 files changed, 4 insertions, 2 deletions
diff --git a/content/renderer/render_view_impl.cc b/content/renderer/render_view_impl.cc
index 3e59258..729ad00 100644
--- a/content/renderer/render_view_impl.cc
+++ b/content/renderer/render_view_impl.cc
@@ -2777,7 +2777,8 @@ WebNavigationPolicy RenderViewImpl::decidePolicyForNavigation(
// must be handled by the browser process so that the correct bindings and
// data sources can be registered.
// Similarly, navigations to view-source URLs or within ViewSource mode
- // must be handled by the browser process.
+ // must be handled by the browser process (except for reloads - those are
+ // safe to leave within the renderer).
// Lastly, access to file:// URLs from non-file:// URL pages must be
// handled by the browser so that ordinary renderer processes don't get
// blessed with file permissions.
@@ -2787,7 +2788,8 @@ WebNavigationPolicy RenderViewImpl::decidePolicyForNavigation(
GetContentClient()->HasWebUIScheme(url) ||
(cumulative_bindings & BINDINGS_POLICY_WEB_UI) ||
url.SchemeIs(chrome::kViewSourceScheme) ||
- frame->isViewSourceModeEnabled();
+ (frame->isViewSourceModeEnabled() &&
+ type != WebKit::WebNavigationTypeReload);
if (!should_fork && url.SchemeIs(chrome::kFileScheme)) {
// Fork non-file to file opens. Check the opener URL if this is the