Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(152)

Side by Side Diff: components/sessions/ios/ios_serialized_navigation_driver.cc

Issue 869613006: Move referrer policy to a different field when serializing. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: updates Created 5 years, 10 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
OLDNEW
1 // Copyright 2014 The Chromium Authors. All rights reserved. 1 // Copyright 2014 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "components/sessions/ios/ios_serialized_navigation_driver.h" 5 #include "components/sessions/ios/ios_serialized_navigation_driver.h"
6 6
7 #include "base/memory/singleton.h" 7 #include "base/memory/singleton.h"
8 #include "components/sessions/serialized_navigation_entry.h" 8 #include "components/sessions/serialized_navigation_entry.h"
9 #include "ios/web/public/referrer.h" 9 #include "ios/web/public/referrer.h"
10 10
11 namespace sessions { 11 namespace sessions {
12 12
13 namespace {
14 const int kObsoleteReferrerPolicyAlways = 0;
15 const int kObsoleteReferrerPolicyDefault = 1;
16 const int kObsoleteReferrerPolicyNever = 2;
17 const int kObsoleteReferrerPolicyOrigin = 3;
18 } // namespace
19
13 // static 20 // static
14 SerializedNavigationDriver* SerializedNavigationDriver::Get() { 21 SerializedNavigationDriver* SerializedNavigationDriver::Get() {
15 return IOSSerializedNavigationDriver::GetInstance(); 22 return IOSSerializedNavigationDriver::GetInstance();
16 } 23 }
17 24
18 // static 25 // static
19 IOSSerializedNavigationDriver* 26 IOSSerializedNavigationDriver*
20 IOSSerializedNavigationDriver::GetInstance() { 27 IOSSerializedNavigationDriver::GetInstance() {
21 return Singleton<IOSSerializedNavigationDriver, 28 return Singleton<IOSSerializedNavigationDriver,
22 LeakySingletonTraits<IOSSerializedNavigationDriver>>::get(); 29 LeakySingletonTraits<IOSSerializedNavigationDriver>>::get();
23 } 30 }
24 31
25 IOSSerializedNavigationDriver::IOSSerializedNavigationDriver() { 32 IOSSerializedNavigationDriver::IOSSerializedNavigationDriver() {
26 } 33 }
27 34
28 IOSSerializedNavigationDriver::~IOSSerializedNavigationDriver() { 35 IOSSerializedNavigationDriver::~IOSSerializedNavigationDriver() {
29 } 36 }
30 37
31 int IOSSerializedNavigationDriver::GetDefaultReferrerPolicy() const { 38 int IOSSerializedNavigationDriver::GetDefaultReferrerPolicy() const {
32 return web::ReferrerPolicyDefault; 39 return web::ReferrerPolicyDefault;
33 } 40 }
34 41
42 bool IOSSerializedNavigationDriver::MapReferrerPolicyToOldValues(
43 int referrer_policy,
44 int* mapped_referrer_policy) const {
45 switch (referrer_policy) {
46 case web::ReferrerPolicyAlways:
47 case web::ReferrerPolicyDefault:
48 // "always" and "default" are the same value in all versions.
49 *mapped_referrer_policy = referrer_policy;
50 return true;
51
52 case web::ReferrerPolicyOrigin:
53 // "origin" exists in the old encoding.
54 *mapped_referrer_policy = kObsoleteReferrerPolicyOrigin;
55 return true;
56
57 default:
58 // Everything else is mapped to never.
59 *mapped_referrer_policy = kObsoleteReferrerPolicyNever;
60 return false;
61 }
62 }
63
64 bool IOSSerializedNavigationDriver::MapReferrerPolicyToNewValues(
65 int referrer_policy,
66 int* mapped_referrer_policy) const {
67 switch (referrer_policy) {
68 case kObsoleteReferrerPolicyAlways:
69 case kObsoleteReferrerPolicyDefault:
70 // "always" and "default" are the same value in all versions.
71 *mapped_referrer_policy = referrer_policy;
72 return true;
73
74 default:
75 // Since we don't know what encoding was used, we map the rest to "never".
76 *mapped_referrer_policy = web::ReferrerPolicyNever;
77 return false;
78 }
79 }
80
35 std::string 81 std::string
36 IOSSerializedNavigationDriver::GetSanitizedPageStateForPickle( 82 IOSSerializedNavigationDriver::GetSanitizedPageStateForPickle(
37 const SerializedNavigationEntry* navigation) const { 83 const SerializedNavigationEntry* navigation) const {
38 return std::string(); 84 return std::string();
39 } 85 }
40 86
41 void IOSSerializedNavigationDriver::Sanitize( 87 void IOSSerializedNavigationDriver::Sanitize(
42 SerializedNavigationEntry* navigation) const { 88 SerializedNavigationEntry* navigation) const {
43 web::Referrer referrer( 89 web::Referrer referrer(
44 navigation->referrer_url_, 90 navigation->referrer_url_,
45 static_cast<web::ReferrerPolicy>(navigation->referrer_policy_)); 91 static_cast<web::ReferrerPolicy>(navigation->referrer_policy_));
46 92
47 if (!navigation->virtual_url_.SchemeIsHTTPOrHTTPS() || 93 if (!navigation->virtual_url_.SchemeIsHTTPOrHTTPS() ||
48 !referrer.url.SchemeIsHTTPOrHTTPS()) { 94 !referrer.url.SchemeIsHTTPOrHTTPS()) {
49 referrer.url = GURL(); 95 referrer.url = GURL();
50 } else { 96 } else {
97 if (referrer.policy < 0 || referrer.policy > web::ReferrerPolicyLast) {
98 NOTREACHED();
99 referrer.policy = web::ReferrerPolicyNever;
100 }
101 bool is_downgrade = referrer.url.SchemeIsSecure() &&
102 !navigation->virtual_url_.SchemeIsSecure();
51 switch (referrer.policy) { 103 switch (referrer.policy) {
52 case web::ReferrerPolicyDefault: 104 case web::ReferrerPolicyDefault:
53 if (referrer.url.SchemeIsSecure() && 105 if (is_downgrade)
54 !navigation->virtual_url_.SchemeIsSecure()) {
55 referrer.url = GURL(); 106 referrer.url = GURL();
56 }
57 break; 107 break;
108 case web::ReferrerPolicyNoReferrerWhenDowngrade:
109 if (is_downgrade)
110 referrer.url = GURL();
58 case web::ReferrerPolicyAlways: 111 case web::ReferrerPolicyAlways:
59 break; 112 break;
60 case web::ReferrerPolicyNever: 113 case web::ReferrerPolicyNever:
61 referrer.url = GURL(); 114 referrer.url = GURL();
62 break; 115 break;
63 case web::ReferrerPolicyOrigin: 116 case web::ReferrerPolicyOrigin:
64 referrer.url = referrer.url.GetOrigin(); 117 referrer.url = referrer.url.GetOrigin();
65 break; 118 break;
66 default: 119 case web::ReferrerPolicyOriginWhenCrossOrigin:
67 NOTREACHED(); 120 if (navigation->virtual_url_.GetOrigin() != referrer.url.GetOrigin())
121 referrer.url = referrer.url.GetOrigin();
68 break; 122 break;
69 } 123 }
70 } 124 }
71 125
72 // Reset the referrer if it has changed. 126 // Reset the referrer if it has changed.
73 if (navigation->referrer_url_ != referrer.url) { 127 if (navigation->referrer_url_ != referrer.url) {
74 navigation->referrer_url_ = GURL(); 128 navigation->referrer_url_ = GURL();
75 navigation->referrer_policy_ = GetDefaultReferrerPolicy(); 129 navigation->referrer_policy_ = GetDefaultReferrerPolicy();
76 } 130 }
77 } 131 }
78 132
79 } // namespace sessions 133 } // namespace sessions
OLDNEW
« no previous file with comments | « components/sessions/ios/ios_serialized_navigation_driver.h ('k') | components/sessions/serialized_navigation_entry.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698