summaryrefslogtreecommitdiffstats
path: root/components/sessions
diff options
context:
space:
mode:
authorjochen <jochen@chromium.org>2015-02-24 01:44:34 -0800
committerCommit bot <commit-bot@chromium.org>2015-02-24 09:45:12 +0000
commit6bf74016ffb251b107218a1ace3640b205dede6b (patch)
tree22ba7457aaa066cf73c59e250fb86ef8078ae8f3 /components/sessions
parent6ac9708f432c20a27b1a22aea81ee8ce05409876 (diff)
downloadchromium_src-6bf74016ffb251b107218a1ace3640b205dede6b.zip
chromium_src-6bf74016ffb251b107218a1ace3640b205dede6b.tar.gz
chromium_src-6bf74016ffb251b107218a1ace3640b205dede6b.tar.bz2
Revert of When sanitizing serialized navigation entries also take iframes into account (patchset #1 id:1 of https://codereview.chromium.org/948013002/)
Reason for revert: regresses startup performance too much Original issue's description: > When sanitizing serialized navigation entries also take iframes into account > > The state of the iframes is encoded in the page state, so we need to > decode the page state and recursively check it. > > BUG=422871 > R=marja@chromium.org > > Committed: https://crrev.com/7b6465936e610ec9b452446ca4c4718d07f4095c > Cr-Commit-Position: refs/heads/master@{#317595} TBR=marja@chromium.org NOPRESUBMIT=true NOTREECHECKS=true NOTRY=true BUG=422871 Review URL: https://codereview.chromium.org/952783003 Cr-Commit-Position: refs/heads/master@{#317774}
Diffstat (limited to 'components/sessions')
-rw-r--r--components/sessions/content/content_serialized_navigation_driver.cc6
1 files changed, 1 insertions, 5 deletions
diff --git a/components/sessions/content/content_serialized_navigation_driver.cc b/components/sessions/content/content_serialized_navigation_driver.cc
index 236eb28..0c682f4 100644
--- a/components/sessions/content/content_serialized_navigation_driver.cc
+++ b/components/sessions/content/content_serialized_navigation_driver.cc
@@ -100,14 +100,10 @@ void ContentSerializedNavigationDriver::Sanitize(
content::Referrer::SanitizeForRequest(navigation->virtual_url_,
old_referrer);
- bool page_state_is_valid = navigation->encoded_page_state_.empty() ||
- content::PageState::CreateFromEncodedData(
- navigation->encoded_page_state_).IsValid();
-
// No need to compare the policy, as it doesn't change during
// sanitization. If there has been a change, the referrer needs to be
// stripped from the page state as well.
- if (navigation->referrer_url_ != new_referrer.url || !page_state_is_valid) {
+ if (navigation->referrer_url_ != new_referrer.url) {
navigation->referrer_url_ = GURL();
navigation->referrer_policy_ = GetDefaultReferrerPolicy();
navigation->encoded_page_state_ =