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

Unified Diff: Source/platform/weborigin/SecurityPolicy.cpp

Issue 650023003: Make generateReferrerHeader() return a Referrer instead of a String (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Created 6 years, 2 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « Source/platform/weborigin/SecurityPolicy.h ('k') | Source/platform/weborigin/SecurityPolicyTest.cpp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: Source/platform/weborigin/SecurityPolicy.cpp
diff --git a/Source/platform/weborigin/SecurityPolicy.cpp b/Source/platform/weborigin/SecurityPolicy.cpp
index 45e2f819ca08fd808593bcd672f401538d1a1733..ae11052727a2db3ca91fe4f1ea5816441f18e2ce 100644
--- a/Source/platform/weborigin/SecurityPolicy.cpp
+++ b/Source/platform/weborigin/SecurityPolicy.cpp
@@ -65,32 +65,32 @@ bool SecurityPolicy::shouldHideReferrer(const KURL& url, const String& referrer)
return !URLIsSecureURL;
}
-String SecurityPolicy::generateReferrerHeader(ReferrerPolicy referrerPolicy, const KURL& url, const String& referrer)
+Referrer SecurityPolicy::generateReferrer(ReferrerPolicy referrerPolicy, const KURL& url, const String& referrer)
{
if (referrer.isEmpty())
- return String();
+ return Referrer(String(), referrerPolicy);
if (!(protocolIs(referrer, "https") || protocolIs(referrer, "http")))
- return String();
+ return Referrer(String(), referrerPolicy);
switch (referrerPolicy) {
case ReferrerPolicyNever:
- return String();
+ return Referrer(String(), referrerPolicy);
case ReferrerPolicyAlways:
- return referrer;
+ return Referrer(referrer, referrerPolicy);
case ReferrerPolicyOrigin: {
String origin = SecurityOrigin::createFromString(referrer)->toString();
if (origin == "null")
- return String();
+ return Referrer(String(), referrerPolicy);
// A security origin is not a canonical URL as it lacks a path. Add /
// to turn it into a canonical URL we can use as referrer.
- return origin + "/";
+ return Referrer(origin + "/", referrerPolicy);
}
case ReferrerPolicyDefault:
break;
}
- return shouldHideReferrer(url, referrer) ? String() : referrer;
+ return Referrer(shouldHideReferrer(url, referrer) ? String() : referrer, referrerPolicy);
}
bool SecurityPolicy::isAccessWhiteListed(const SecurityOrigin* activeOrigin, const SecurityOrigin* targetOrigin)
« no previous file with comments | « Source/platform/weborigin/SecurityPolicy.h ('k') | Source/platform/weborigin/SecurityPolicyTest.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698