mirrors/electron
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions 1

blink::WebReferrerPolicy -> network::mojom::ReferrerPolicy

Browse source 
1212345
This commit is contained in:
Jeremy Apthorp 2019-01-09 12:13:49 -08:00
parent 96ca070c3a
commit 0d9de7deaf
3 changed files with 28 additions and 26 deletions
Download patch file Download diff file Expand all files Collapse all files

5
atom/browser/api/atom_api_web_contents.cc
View file

@ -1188,8 +1188,9 @@ void WebContents::LoadURL(const GURL& url, const mate::Dictionary& options) {
if (!options.Get("httpReferrer", &params.referrer)) { if (!options.Get("httpReferrer", &params.referrer)) {
GURL http_referrer; GURL http_referrer;
if (options.Get("httpReferrer", &http_referrer)) if (options.Get("httpReferrer", &http_referrer))
params.referrer = content::Referrer(http_referrer.GetAsReferrer(), params.referrer =
blink::kWebReferrerPolicyDefault); content::Referrer(http_referrer.GetAsReferrer(),
network::mojom::ReferrerPolicy::kDefault);
} }
std::string user_agent; std::string user_agent;

43
atom/common/native_mate_converters/blink_converter.cc
View file

@ -473,25 +473,26 @@ v8::Local<v8::Value> Converter<blink::WebCache::ResourceTypeStats>::ToV8(
} }
// static // static
v8::Local<v8::Value> Converter<blink::WebReferrerPolicy>::ToV8( v8::Local<v8::Value> Converter<network::mojom::ReferrerPolicy>::ToV8(
v8::Isolate* isolate, v8::Isolate* isolate,
const blink::WebReferrerPolicy& in) { const network::mojom::ReferrerPolicy& in) {
switch (in) { switch (in) {
case blink::kWebReferrerPolicyDefault: case network::mojom::ReferrerPolicy::kDefault:
return mate::StringToV8(isolate, "default"); return mate::StringToV8(isolate, "default");
case blink::kWebReferrerPolicyAlways: case network::mojom::ReferrerPolicy::kAlways:
return mate::StringToV8(isolate, "unsafe-url"); return mate::StringToV8(isolate, "unsafe-url");
case blink::kWebReferrerPolicyNoReferrerWhenDowngrade: case network::mojom::ReferrerPolicy::kNoReferrerWhenDowngrade:
return mate::StringToV8(isolate, "no-referrer-when-downgrade"); return mate::StringToV8(isolate, "no-referrer-when-downgrade");
case blink::kWebReferrerPolicyNever: case network::mojom::ReferrerPolicy::kNever:
return mate::StringToV8(isolate, "no-referrer"); return mate::StringToV8(isolate, "no-referrer");
case blink::kWebReferrerPolicyOrigin: case network::mojom::ReferrerPolicy::kOrigin:
return mate::StringToV8(isolate, "origin"); return mate::StringToV8(isolate, "origin");
case blink::kWebReferrerPolicyNoReferrerWhenDowngradeOriginWhenCrossOrigin: case network::mojom::ReferrerPolicy::
kNoReferrerWhenDowngradeOriginWhenCrossOrigin:
return mate::StringToV8(isolate, "strict-origin-when-cross-origin"); return mate::StringToV8(isolate, "strict-origin-when-cross-origin");
case blink::kWebReferrerPolicySameOrigin: case network::mojom::ReferrerPolicy::kSameOrigin:
return mate::StringToV8(isolate, "same-origin"); return mate::StringToV8(isolate, "same-origin");
case blink::kWebReferrerPolicyStrictOrigin: case network::mojom::ReferrerPolicy::kStrictOrigin:
return mate::StringToV8(isolate, "strict-origin"); return mate::StringToV8(isolate, "strict-origin");
default: default:
return mate::StringToV8(isolate, "no-referrer"); return mate::StringToV8(isolate, "no-referrer");
@ -499,28 +500,28 @@ v8::Local<v8::Value> Converter<blink::WebReferrerPolicy>::ToV8(
} }
// static // static
bool Converter<blink::WebReferrerPolicy>::FromV8( bool Converter<network::mojom::ReferrerPolicy>::FromV8(
v8::Isolate* isolate, v8::Isolate* isolate,
v8::Handle<v8::Value> val, v8::Handle<v8::Value> val,
blink::WebReferrerPolicy* out) { network::mojom::ReferrerPolicy* out) {
std::string policy = base::ToLowerASCII(gin::V8ToString(isolate, val)); std::string policy = base::ToLowerASCII(gin::V8ToString(isolate, val));
if (policy == "default") if (policy == "default")
*out = blink::kWebReferrerPolicyDefault; *out = network::mojom::ReferrerPolicy::kDefault;
else if (policy == "unsafe-url") else if (policy == "unsafe-url")
*out = blink::kWebReferrerPolicyAlways; *out = network::mojom::ReferrerPolicy::kAlways;
else if (policy == "no-referrer-when-downgrade") else if (policy == "no-referrer-when-downgrade")
*out = blink::kWebReferrerPolicyNoReferrerWhenDowngrade; *out = network::mojom::ReferrerPolicy::kNoReferrerWhenDowngrade;
else if (policy == "no-referrer") else if (policy == "no-referrer")
*out = blink::kWebReferrerPolicyNever; *out = network::mojom::ReferrerPolicy::kNever;
else if (policy == "origin") else if (policy == "origin")
*out = blink::kWebReferrerPolicyOrigin; *out = network::mojom::ReferrerPolicy::kOrigin;
else if (policy == "strict-origin-when-cross-origin") else if (policy == "strict-origin-when-cross-origin")
*out = *out = network::mojom::ReferrerPolicy::
blink::kWebReferrerPolicyNoReferrerWhenDowngradeOriginWhenCrossOrigin; kNoReferrerWhenDowngradeOriginWhenCrossOrigin;
else if (policy == "same-origin") else if (policy == "same-origin")
*out = blink::kWebReferrerPolicySameOrigin; *out = network::mojom::ReferrerPolicy::kSameOrigin;
else if (policy == "strict-origin") else if (policy == "strict-origin")
*out = blink::kWebReferrerPolicyStrictOrigin; *out = network::mojom::ReferrerPolicy::kStrictOrigin;
else else
return false; return false;
return true; return true;

6
atom/common/native_mate_converters/blink_converter.h
View file

@ -123,12 +123,12 @@ struct Converter<blink::WebCache::ResourceTypeStats> {
}; };
template <> template <>
struct Converter<blink::WebReferrerPolicy> { struct Converter<network::mojom::ReferrerPolicy> {
static v8::Local<v8::Value> ToV8(v8::Isolate* isolate, static v8::Local<v8::Value> ToV8(v8::Isolate* isolate,
const blink::WebReferrerPolicy& in); const network::mojom::ReferrerPolicy& in);
static bool FromV8(v8::Isolate* isolate, static bool FromV8(v8::Isolate* isolate,
v8::Local<v8::Value> val, v8::Local<v8::Value> val,
blink::WebReferrerPolicy* out); network::mojom::ReferrerPolicy* out);
}; };
v8::Local<v8::Value> EditFlagsToV8(v8::Isolate* isolate, int editFlags); v8::Local<v8::Value> EditFlagsToV8(v8::Isolate* isolate, int editFlags);