Skip to content

GitLab

T
tangled
Commit d09cdc60 authored by Takeshi Yoshino's avatar Takeshi Yoshino Committed by Commit Bot
Browse files
Options

Replace DeprecatedLower() with LowerASCII() in SchemeRegistry.cpp 

Bug: 627682
Change-Id: I752828ced7052c99c03a8004b3e8cd75c50b9550
Reviewed-on: https://chromium-review.googlesource.com/824142
Commit-Queue: Takeshi Yoshino <tyoshino@chromium.org>
Reviewed-by: default avatarMike West <mkwst@chromium.org>
Cr-Commit-Position: refs/heads/master@{#524034}
parent e6141a8e
Hide whitespace changes
Inline Side-by-side
Showing with 31 additions and 31 deletions
third_party/WebKit/Source/platform/weborigin/SchemeRegistry.cpp
View file @ d09cdc60
......@@ -116,32 +116,32 @@ void SchemeRegistry::Initialize() {
}
void SchemeRegistry::RegisterURLSchemeAsLocal(const String& scheme) {
DCHECK_EQ(scheme, scheme.DeprecatedLower());
DCHECK_EQ(scheme, scheme.LowerASCII());
GetMutableURLSchemesRegistry().local_schemes.insert(scheme);
}
bool SchemeRegistry::ShouldTreatURLSchemeAsLocal(const String& scheme) {
DCHECK_EQ(scheme, scheme.DeprecatedLower());
DCHECK_EQ(scheme, scheme.LowerASCII());
if (scheme.IsEmpty())
return false;
return GetURLSchemesRegistry().local_schemes.Contains(scheme);
}
bool SchemeRegistry::ShouldTreatURLSchemeAsNoAccess(const String& scheme) {
DCHECK_EQ(scheme, scheme.DeprecatedLower());
DCHECK_EQ(scheme, scheme.LowerASCII());
if (scheme.IsEmpty())
return false;
return GetURLSchemesRegistry().schemes_with_unique_origins.Contains(scheme);
}
void SchemeRegistry::RegisterURLSchemeAsDisplayIsolated(const String& scheme) {
DCHECK_EQ(scheme, scheme.DeprecatedLower());
DCHECK_EQ(scheme, scheme.LowerASCII());
GetMutableURLSchemesRegistry().display_isolated_url_schemes.insert(scheme);
}
bool SchemeRegistry::ShouldTreatURLSchemeAsDisplayIsolated(
const String& scheme) {
DCHECK_EQ(scheme, scheme.DeprecatedLower());
DCHECK_EQ(scheme, scheme.LowerASCII());
if (scheme.IsEmpty())
return false;
return GetURLSchemesRegistry().display_isolated_url_schemes.Contains(scheme);
......@@ -149,24 +149,24 @@ bool SchemeRegistry::ShouldTreatURLSchemeAsDisplayIsolated(
bool SchemeRegistry::ShouldTreatURLSchemeAsRestrictingMixedContent(
const String& scheme) {
DCHECK_EQ(scheme, scheme.DeprecatedLower());
DCHECK_EQ(scheme, scheme.LowerASCII());
return scheme == "https";
}
void SchemeRegistry::RegisterURLSchemeAsSecure(const String& scheme) {
DCHECK_EQ(scheme, scheme.DeprecatedLower());
DCHECK_EQ(scheme, scheme.LowerASCII());
GetMutableURLSchemesRegistry().secure_schemes.insert(scheme);
}
bool SchemeRegistry::ShouldTreatURLSchemeAsSecure(const String& scheme) {
DCHECK_EQ(scheme, scheme.DeprecatedLower());
DCHECK_EQ(scheme, scheme.LowerASCII());
if (scheme.IsEmpty())
return false;
return GetURLSchemesRegistry().secure_schemes.Contains(scheme);
}
bool SchemeRegistry::ShouldLoadURLSchemeAsEmptyDocument(const String& scheme) {
DCHECK_EQ(scheme, scheme.DeprecatedLower());
DCHECK_EQ(scheme, scheme.LowerASCII());
if (scheme.IsEmpty())
return false;
return GetURLSchemesRegistry().empty_document_schemes.Contains(scheme);
......@@ -175,7 +175,7 @@ bool SchemeRegistry::ShouldLoadURLSchemeAsEmptyDocument(const String& scheme) {
void SchemeRegistry::SetDomainRelaxationForbiddenForURLScheme(
bool forbidden,
const String& scheme) {
DCHECK_EQ(scheme, scheme.DeprecatedLower());
DCHECK_EQ(scheme, scheme.LowerASCII());
if (scheme.IsEmpty())
return;
......@@ -190,7 +190,7 @@ void SchemeRegistry::SetDomainRelaxationForbiddenForURLScheme(
bool SchemeRegistry::IsDomainRelaxationForbiddenForURLScheme(
const String& scheme) {
DCHECK_EQ(scheme, scheme.DeprecatedLower());
DCHECK_EQ(scheme, scheme.LowerASCII());
if (scheme.IsEmpty())
return false;
return GetURLSchemesRegistry()
......@@ -198,20 +198,20 @@ bool SchemeRegistry::IsDomainRelaxationForbiddenForURLScheme(
}
bool SchemeRegistry::CanDisplayOnlyIfCanRequest(const String& scheme) {
DCHECK_EQ(scheme, scheme.DeprecatedLower());
DCHECK_EQ(scheme, scheme.LowerASCII());
return scheme == "blob" || scheme == "filesystem";
}
void SchemeRegistry::RegisterURLSchemeAsNotAllowingJavascriptURLs(
const String& scheme) {
DCHECK_EQ(scheme, scheme.DeprecatedLower());
DCHECK_EQ(scheme, scheme.LowerASCII());
GetMutableURLSchemesRegistry().not_allowing_javascript_urls_schemes.insert(
scheme);
}
bool SchemeRegistry::ShouldTreatURLSchemeAsNotAllowingJavascriptURLs(
const String& scheme) {
DCHECK_EQ(scheme, scheme.DeprecatedLower());
DCHECK_EQ(scheme, scheme.LowerASCII());
if (scheme.IsEmpty())
return false;
return GetURLSchemesRegistry().not_allowing_javascript_urls_schemes.Contains(
......@@ -219,12 +219,12 @@ bool SchemeRegistry::ShouldTreatURLSchemeAsNotAllowingJavascriptURLs(
}
void SchemeRegistry::RegisterURLSchemeAsCORSEnabled(const String& scheme) {
DCHECK_EQ(scheme, scheme.DeprecatedLower());
DCHECK_EQ(scheme, scheme.LowerASCII());
GetMutableURLSchemesRegistry().cors_enabled_schemes.insert(scheme);
}
bool SchemeRegistry::ShouldTreatURLSchemeAsCORSEnabled(const String& scheme) {
DCHECK_EQ(scheme, scheme.DeprecatedLower());
DCHECK_EQ(scheme, scheme.LowerASCII());
if (scheme.IsEmpty())
return false;
return GetURLSchemesRegistry().cors_enabled_schemes.Contains(scheme);
......@@ -266,13 +266,13 @@ bool SchemeRegistry::ShouldTrackUsageMetricsForScheme(const String& scheme) {
void SchemeRegistry::RegisterURLSchemeAsAllowingServiceWorkers(
const String& scheme) {
DCHECK_EQ(scheme, scheme.DeprecatedLower());
DCHECK_EQ(scheme, scheme.LowerASCII());
GetMutableURLSchemesRegistry().service_worker_schemes.insert(scheme);
}
bool SchemeRegistry::ShouldTreatURLSchemeAsAllowingServiceWorkers(
const String& scheme) {
DCHECK_EQ(scheme, scheme.DeprecatedLower());
DCHECK_EQ(scheme, scheme.LowerASCII());
if (scheme.IsEmpty())
return false;
return GetURLSchemesRegistry().service_worker_schemes.Contains(scheme);
......@@ -280,13 +280,13 @@ bool SchemeRegistry::ShouldTreatURLSchemeAsAllowingServiceWorkers(
void SchemeRegistry::RegisterURLSchemeAsSupportingFetchAPI(
const String& scheme) {
DCHECK_EQ(scheme, scheme.DeprecatedLower());
DCHECK_EQ(scheme, scheme.LowerASCII());
GetMutableURLSchemesRegistry().fetch_api_schemes.insert(scheme);
}
bool SchemeRegistry::ShouldTreatURLSchemeAsSupportingFetchAPI(
const String& scheme) {
DCHECK_EQ(scheme, scheme.DeprecatedLower());
DCHECK_EQ(scheme, scheme.LowerASCII());
if (scheme.IsEmpty())
return false;
return GetURLSchemesRegistry().fetch_api_schemes.Contains(scheme);
......@@ -294,21 +294,21 @@ bool SchemeRegistry::ShouldTreatURLSchemeAsSupportingFetchAPI(
void SchemeRegistry::RegisterURLSchemeAsFirstPartyWhenTopLevel(
const String& scheme) {
DCHECK_EQ(scheme, scheme.DeprecatedLower());
DCHECK_EQ(scheme, scheme.LowerASCII());
GetMutableURLSchemesRegistry().first_party_when_top_level_schemes.insert(
scheme);
}
void SchemeRegistry::RemoveURLSchemeAsFirstPartyWhenTopLevel(
const String& scheme) {
DCHECK_EQ(scheme, scheme.DeprecatedLower());
DCHECK_EQ(scheme, scheme.LowerASCII());
GetMutableURLSchemesRegistry().first_party_when_top_level_schemes.erase(
scheme);
}
bool SchemeRegistry::ShouldTreatURLSchemeAsFirstPartyWhenTopLevel(
const String& scheme) {
DCHECK_EQ(scheme, scheme.DeprecatedLower());
DCHECK_EQ(scheme, scheme.LowerASCII());
if (scheme.IsEmpty())
return false;
return GetURLSchemesRegistry().first_party_when_top_level_schemes.Contains(
......@@ -317,7 +317,7 @@ bool SchemeRegistry::ShouldTreatURLSchemeAsFirstPartyWhenTopLevel(
void SchemeRegistry::RegisterURLSchemeAsAllowedForReferrer(
const String& scheme) {
DCHECK_EQ(scheme, scheme.DeprecatedLower());
DCHECK_EQ(scheme, scheme.LowerASCII());
GetMutableURLSchemesRegistry().allowed_in_referrer_schemes.insert(scheme);
}
......@@ -327,7 +327,7 @@ void SchemeRegistry::RemoveURLSchemeAsAllowedForReferrer(const String& scheme) {
bool SchemeRegistry::ShouldTreatURLSchemeAsAllowedForReferrer(
const String& scheme) {
DCHECK_EQ(scheme, scheme.DeprecatedLower());
DCHECK_EQ(scheme, scheme.LowerASCII());
if (scheme.IsEmpty())
return false;
return GetURLSchemesRegistry().allowed_in_referrer_schemes.Contains(scheme);
......@@ -336,14 +336,14 @@ bool SchemeRegistry::ShouldTreatURLSchemeAsAllowedForReferrer(
void SchemeRegistry::RegisterURLSchemeAsBypassingContentSecurityPolicy(
const String& scheme,
PolicyAreas policy_areas) {
DCHECK_EQ(scheme, scheme.DeprecatedLower());
DCHECK_EQ(scheme, scheme.LowerASCII());
GetMutableURLSchemesRegistry()
.content_security_policy_bypassing_schemes.insert(scheme, policy_areas);
}
void SchemeRegistry::RemoveURLSchemeRegisteredAsBypassingContentSecurityPolicy(
const String& scheme) {
DCHECK_EQ(scheme, scheme.DeprecatedLower());
DCHECK_EQ(scheme, scheme.LowerASCII());
GetMutableURLSchemesRegistry()
.content_security_policy_bypassing_schemes.erase(scheme);
}
......@@ -364,7 +364,7 @@ bool SchemeRegistry::SchemeShouldBypassContentSecurityPolicy(
void SchemeRegistry::RegisterURLSchemeBypassingSecureContextCheck(
const String& scheme) {
DCHECK_EQ(scheme, scheme.DeprecatedLower());
DCHECK_EQ(scheme, scheme.LowerASCII());
GetMutableURLSchemesRegistry().secure_context_bypassing_schemes.insert(
scheme);
}
......@@ -373,21 +373,21 @@ bool SchemeRegistry::SchemeShouldBypassSecureContextCheck(
const String& scheme) {
if (scheme.IsEmpty())
return false;
DCHECK_EQ(scheme, scheme.DeprecatedLower());
DCHECK_EQ(scheme, scheme.LowerASCII());
return GetURLSchemesRegistry().secure_context_bypassing_schemes.Contains(
scheme);
}
void SchemeRegistry::RegisterURLSchemeAsAllowingWasmEvalCSP(
const String& scheme) {
DCHECK_EQ(scheme, scheme.DeprecatedLower());
DCHECK_EQ(scheme, scheme.LowerASCII());
GetMutableURLSchemesRegistry().wasm_eval_csp_schemes.insert(scheme);
}
bool SchemeRegistry::SchemeSupportsWasmEvalCSP(const String& scheme) {
if (scheme.IsEmpty())
return false;
DCHECK_EQ(scheme, scheme.DeprecatedLower());
DCHECK_EQ(scheme, scheme.LowerASCII());
return GetURLSchemesRegistry().wasm_eval_csp_schemes.Contains(scheme);
}
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment