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

Unified Diff: third_party/WebKit/Source/platform/weborigin/SchemeRegistry.cpp

Issue 2475673003: Clean registering mixed content restricting schemes (Closed)
Patch Set: Clean registering mixed content restricting schemes Created 4 years, 1 month 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
Index: third_party/WebKit/Source/platform/weborigin/SchemeRegistry.cpp
diff --git a/third_party/WebKit/Source/platform/weborigin/SchemeRegistry.cpp b/third_party/WebKit/Source/platform/weborigin/SchemeRegistry.cpp
index 202b35019696c530528b1f38f515eedaac1fb819..ab648fe5e365012856642d61abce8350a35eecf8 100644
--- a/third_party/WebKit/Source/platform/weborigin/SchemeRegistry.cpp
+++ b/third_party/WebKit/Source/platform/weborigin/SchemeRegistry.cpp
@@ -60,14 +60,6 @@ static URLSchemesSet& displayIsolatedURLSchemes() {
return displayIsolatedSchemes;
}
-static URLSchemesSet& mixedContentRestrictingSchemes() {
- DEFINE_STATIC_LOCAL_WITH_LOCK(URLSchemesSet, mixedContentRestrictingSchemes,
- ({
- "https",
- }));
- return mixedContentRestrictingSchemes;
-}
-
static URLSchemesSet& secureSchemes() {
DEFINE_STATIC_LOCAL_WITH_LOCK(URLSchemesSet, secureSchemes,
({
@@ -223,20 +215,10 @@ bool SchemeRegistry::shouldTreatURLSchemeAsDisplayIsolated(
return displayIsolatedURLSchemes().contains(scheme);
}
-void SchemeRegistry::registerURLSchemeAsRestrictingMixedContent(
- const String& scheme) {
- DCHECK_EQ(scheme, scheme.lower());
- MutexLocker locker(mutex());
- mixedContentRestrictingSchemes().add(scheme);
-}
-
bool SchemeRegistry::shouldTreatURLSchemeAsRestrictingMixedContent(
const String& scheme) {
DCHECK_EQ(scheme, scheme.lower());
- if (scheme.isEmpty())
- return false;
- MutexLocker locker(mutex());
- return mixedContentRestrictingSchemes().contains(scheme);
+ return scheme == "https";
}
void SchemeRegistry::registerURLSchemeAsSecure(const String& scheme) {
« no previous file with comments | « third_party/WebKit/Source/platform/weborigin/SchemeRegistry.h ('k') | third_party/WebKit/Source/web/WebSecurityPolicy.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698