[Service Worker Registration] removed protocolIsInHTTPFamily and replaced with SchemeRegistry check

Source/platform/weborigin/SchemeRegistry.cpp

 /*
  * Copyright (C) 2010 Apple Inc. All Rights Reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
@@ skipping 142 matching lines @@
 
     if (CORSEnabledSchemes.isEmpty()) {
         CORSEnabledSchemes.add("http");
         CORSEnabledSchemes.add("https");
         CORSEnabledSchemes.add("data");
     }
 
     return CORSEnabledSchemes;
 }
 
+static URLSchemesSet& serviceWorkerSchemes()
+{
+    assertLockHeld();
+    DEFINE_STATIC_LOCAL_NOASSERT(URLSchemesSet, serviceWorkerSchemes, ());
+
+    if (serviceWorkerSchemes.isEmpty()) {
+        serviceWorkerSchemes.add("http");

[dcheng, 2015/06/24 20:20:15]

Why is http in this list?

[palmer, 2015/06/24 20:26:02]

It must not be.

[michaeln, 2015/06/25 23:03:19]

Isn't http://localhost/ secure and fine-n-good to use serviceworkers?

+        serviceWorkerSchemes.add("https");
+    }
+
+    return serviceWorkerSchemes;
+}
+
 static URLSchemesMap<SchemeRegistry::PolicyAreas>& ContentSecurityPolicyBypassingSchemes()
 {
     assertLockHeld();
     DEFINE_STATIC_LOCAL_NOASSERT(URLSchemesMap<SchemeRegistry::PolicyAreas>, schemes, ());
     return schemes;
 }
 
 bool SchemeRegistry::shouldTreatURLSchemeAsLocal(const String& scheme)
 {
     if (scheme.isEmpty())
@@ skipping 143 matching lines @@
         builder.append(scheme);
     }
     return builder.toString();
 }
 
 bool SchemeRegistry::shouldTreatURLSchemeAsLegacy(const String& scheme)
 {
     return equalIgnoringCase("ftp", scheme) || equalIgnoringCase("gopher", scheme);
 }
 
+void SchemeRegistry::registerURLSchemeAsAllowingServiceWorkers(const String& scheme)
+{
+    MutexLocker locker(mutex());
+    serviceWorkerSchemes().add(scheme);
+}
+
+bool SchemeRegistry::shouldTreatURLSchemeAsAllowingServiceWorkers(const String& scheme)
+{
+    if (scheme.isEmpty())
+        return false;
+    MutexLocker locker(mutex());
+    return serviceWorkerSchemes().contains(scheme);
+}
+
 void SchemeRegistry::registerURLSchemeAsBypassingContentSecurityPolicy(const String& scheme, PolicyAreas policyAreas)
 {
     MutexLocker locker(mutex());
     ContentSecurityPolicyBypassingSchemes().add(scheme, policyAreas);
 }
 
 void SchemeRegistry::removeURLSchemeRegisteredAsBypassingContentSecurityPolicy(const String& scheme)
 {
     MutexLocker locker(mutex());
     ContentSecurityPolicyBypassingSchemes().remove(scheme);
 }
 
 bool SchemeRegistry::schemeShouldBypassContentSecurityPolicy(const String& scheme, PolicyAreas policyAreas)
 {
     ASSERT(policyAreas != PolicyAreaNone);
     if (scheme.isEmpty() || policyAreas == PolicyAreaNone)
         return false;
 
     // get() returns 0 (PolicyAreaNone) if there is no entry in the map.
     // Thus by default, schemes do not bypass CSP.
     MutexLocker locker(mutex());
     return (ContentSecurityPolicyBypassingSchemes().get(scheme) & policyAreas) == policyAreas;
 }
 
 } // namespace blink