Changeset 163121 in webkit

Timestamp:

Jan 30, 2014 3:02:39 PM (10 years ago)

Author:

jpfau@apple.com

Message:

Add a method for schemes to be registered as supporting cache partitioning
​https://bugs.webkit.org/show_bug.cgi?id=127739

Reviewed by Darin Adler.

Source/WebCore:

Currently, this assumes that schemes supporting cache partitioning
also support (scheme, host) doubles for the scheme. Furthermore,
the scheme is currently discarded when partitioning and is only
checked to ensure that partitioning is supported for that scheme: it
is assumed that all origins with the same host double should be binned
together, regardless of scheme.

• WebCore.exp.in:
• page/SecurityOrigin.cpp:

(WebCore::SecurityOrigin::cachePartition):

• platform/SchemeRegistry.cpp:

(WebCore::CachePartitioningSchemes):
(WebCore::SchemeRegistry::registerURLSchemeAsCachePartitioned):
(WebCore::SchemeRegistry::shouldPartitionCacheForURLScheme):

• platform/SchemeRegistry.h:

Source/WebKit2:

Pipe information about cache partitioned scheme through WebKit2.

• Shared/WebProcessCreationParameters.cpp:

(WebKit::WebProcessCreationParameters::encode):
(WebKit::WebProcessCreationParameters::decode):

• Shared/WebProcessCreationParameters.h:
• UIProcess/API/C/WKContext.cpp:

(WKContextRegisterURLSchemeAsCachePartitioned):

• UIProcess/API/C/WKContextPrivate.h:
• UIProcess/WebContext.cpp:

(WebKit::WebContext::createNewWebProcess):
(WebKit::WebContext::registerURLSchemeAsCachePartitioned):

• UIProcess/WebContext.h:
• WebProcess/WebProcess.cpp:

(WebKit::WebProcess::initializeWebProcess):
(WebKit::WebProcess::registerURLSchemeAsCachePartitioned):

• WebProcess/WebProcess.h:
• WebProcess/WebProcess.messages.in:

Location:

trunk/Source

Files:

• WebCore/ChangeLog (modified) (1 diff)
• WebCore/WebCore.exp.in (modified) (1 diff)
• WebCore/page/SecurityOrigin.cpp (modified) (1 diff)
• WebCore/page/SecurityOrigin.h (modified) (1 diff)
• WebCore/platform/SchemeRegistry.cpp (modified) (3 diffs)
• WebCore/platform/SchemeRegistry.h (modified) (1 diff)
• WebKit2/ChangeLog (modified) (1 diff)
• WebKit2/Shared/WebProcessCreationParameters.cpp (modified) (2 diffs)
• WebKit2/Shared/WebProcessCreationParameters.h (modified) (1 diff)
• WebKit2/UIProcess/API/C/WKContext.cpp (modified) (1 diff)
• WebKit2/UIProcess/API/C/WKContextPrivate.h (modified) (1 diff)
• WebKit2/UIProcess/WebContext.cpp (modified) (2 diffs)
• WebKit2/UIProcess/WebContext.h (modified) (2 diffs)
• WebKit2/WebProcess/WebProcess.cpp (modified) (2 diffs)
• WebKit2/WebProcess/WebProcess.h (modified) (1 diff)
• WebKit2/WebProcess/WebProcess.messages.in (modified) (1 diff)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2014-01-27  Jeffrey Pfau  <jpfau@apple.com>
+
+        Add a method for schemes to be registered as supporting cache partitioning
+        https://bugs.webkit.org/show_bug.cgi?id=127739
+
+        Reviewed by Darin Adler.
+
+        Currently, this assumes that schemes supporting cache partitioning
+        also support (scheme, host) doubles for the scheme. Furthermore,
+        the scheme is currently discarded when partitioning and is only
+        checked to ensure that partitioning is supported for that scheme: it
+        is assumed that all origins with the same host double should be binned
+        together, regardless of scheme.
+
+        * WebCore.exp.in:
+        * page/SecurityOrigin.cpp:
+        (WebCore::SecurityOrigin::cachePartition):
+        * platform/SchemeRegistry.cpp:
+        (WebCore::CachePartitioningSchemes):
+        (WebCore::SchemeRegistry::registerURLSchemeAsCachePartitioned):
+        (WebCore::SchemeRegistry::shouldPartitionCacheForURLScheme):
+        * platform/SchemeRegistry.h:
+
 2014-01-30  Jer Noble  <jer.noble@apple.com>
 

trunk/Source/WebCore/WebCore.exp.in

@@ -387 +387 @@
 __ZN7WebCore14SchemeRegistry34registerURLSchemeAsDisplayIsolatedERKN3WTF6StringE
 __ZN7WebCore14SchemeRegistry34shouldLoadURLSchemeAsEmptyDocumentERKN3WTF6StringE
+__ZN7WebCore14SchemeRegistry35registerURLSchemeAsCachePartitionedERKN3WTF6StringE
 __ZN7WebCore14SchemeRegistry40setDomainRelaxationForbiddenForURLSchemeEbRKN3WTF6StringE
 __ZN7WebCore14SchemeRegistry41allowsLocalStorageAccessInPrivateBrowsingERKN3WTF6StringE

trunk/Source/WebCore/page/SecurityOrigin.cpp

@@ -445 +445 @@
         return String();
 
-    if (m_protocol != "http" && m_protocol != "https")
-        return String();
-
-    return host();
+    if (isHTTPFamily())
+        return host();
+
+    if (SchemeRegistry::shouldPartitionCacheForURLScheme(m_protocol))
+        return host();
+
+    return String();
 }
 #endif

trunk/Source/WebCore/page/SecurityOrigin.h

@@ -216 +216 @@
     bool passesFileCheck(const SecurityOrigin*) const;
     bool isThirdParty(const SecurityOrigin*) const;
+
+    // This method checks that the scheme for this origin is an HTTP-family
+    // scheme, e.g. HTTP and HTTPS.
+    bool isHTTPFamily() const { return m_protocol == "http" || m_protocol == "https"; }
     
     enum ShouldAllowFromThirdParty { AlwaysAllowFromThirdParty, MaybeAllowFromThirdParty };

trunk/Source/WebCore/platform/SchemeRegistry.cpp

@@ -27 +27 @@
 #include "SchemeRegistry.h"
 #include <wtf/MainThread.h>
+#include <wtf/NeverDestroyed.h>
 
 namespace WebCore {
@@ -165 +166 @@
 }
 
+#if ENABLE(CACHE_PARTITIONING)
+static URLSchemesMap& cachePartitioningSchemes()
+{
+    static NeverDestroyed<URLSchemesMap> schemes;
+    return schemes;
+}
+#endif
+
 bool SchemeRegistry::shouldTreatURLSchemeAsLocal(const String& scheme)
 {
@@ -324 +333 @@
 }
 
+#if ENABLE(CACHE_PARTITIONING)
+void SchemeRegistry::registerURLSchemeAsCachePartitioned(const String& scheme)
+{
+    cachePartitioningSchemes().add(scheme);
+}
+
+bool SchemeRegistry::shouldPartitionCacheForURLScheme(const String& scheme)
+{
+    if (scheme.isEmpty())
+        return false;
+    return cachePartitioningSchemes().contains(scheme);
+}
+#endif
+
 } // namespace WebCore

trunk/Source/WebCore/platform/SchemeRegistry.h

@@ -92 +92 @@
     // Schemes whose responses can be cached indefinitely.
     static bool shouldCacheResponsesFromURLSchemeIndefinitely(const String& scheme);
+
+#if ENABLE(CACHE_PARTITIONING)
+    // Schemes whose requests should be partitioned in the cache
+    static void registerURLSchemeAsCachePartitioned(const String& scheme);
+    static bool shouldPartitionCacheForURLScheme(const String& scheme);
+#endif
 };
 

trunk/Source/WebKit2/ChangeLog

@@ +1 @@
+2014-01-27  Jeffrey Pfau  <jpfau@apple.com>
+
+        Add a method for schemes to be registered as supporting cache partitioning
+        https://bugs.webkit.org/show_bug.cgi?id=127739
+
+        Reviewed by Darin Adler.
+
+        Pipe information about cache partitioned scheme through WebKit2.
+
+        * Shared/WebProcessCreationParameters.cpp:
+        (WebKit::WebProcessCreationParameters::encode):
+        (WebKit::WebProcessCreationParameters::decode):
+        * Shared/WebProcessCreationParameters.h:
+        * UIProcess/API/C/WKContext.cpp:
+        (WKContextRegisterURLSchemeAsCachePartitioned):
+        * UIProcess/API/C/WKContextPrivate.h:
+        * UIProcess/WebContext.cpp:
+        (WebKit::WebContext::createNewWebProcess):
+        (WebKit::WebContext::registerURLSchemeAsCachePartitioned):
+        * UIProcess/WebContext.h:
+        * WebProcess/WebProcess.cpp:
+        (WebKit::WebProcess::initializeWebProcess):
+        (WebKit::WebProcess::registerURLSchemeAsCachePartitioned):
+        * WebProcess/WebProcess.h:
+        * WebProcess/WebProcess.messages.in:
+
 2014-01-30  Tim Horton  <timothy_horton@apple.com>
 

trunk/Source/WebKit2/Shared/WebProcessCreationParameters.cpp

@@ -71 +71 @@
     encoder << urlSchemesRegisteredAsDisplayIsolated;
     encoder << urlSchemesRegisteredAsCORSEnabled;
+#if ENABLE(CACHE_PARTITIONING)
+    encoder << urlSchemesRegisteredAsCachePartitioned;
+#endif
 #if ENABLE(CUSTOM_PROTOCOLS)
     encoder << urlSchemesRegisteredForCustomProtocols;
@@ -163 +166 @@
     if (!decoder.decode(parameters.urlSchemesRegisteredAsCORSEnabled))
         return false;
+#if ENABLE(CACHE_PARTITIONING)
+    if (!decoder.decode(parameters.urlSchemesRegisteredAsCachePartitioned))
+        return false;
+#endif
 #if ENABLE(CUSTOM_PROTOCOLS)
     if (!decoder.decode(parameters.urlSchemesRegisteredForCustomProtocols))

trunk/Source/WebKit2/Shared/WebProcessCreationParameters.h

@@ -79 +79 @@
     Vector<String> urlSchemesRegisteredAsDisplayIsolated;
     Vector<String> urlSchemesRegisteredAsCORSEnabled;
+#if ENABLE(CACHE_PARTITIONING)
+    Vector<String> urlSchemesRegisteredAsCachePartitioned;
+#endif
 #if ENABLE(CUSTOM_PROTOCOLS)
     Vector<String> urlSchemesRegisteredForCustomProtocols;

trunk/Source/WebKit2/UIProcess/API/C/WKContext.cpp

@@ -187 +187 @@
 }
 
+void WKContextRegisterURLSchemeAsCachePartitioned(WKContextRef contextRef, WKStringRef urlScheme)
+{
+#if ENABLE(CACHE_PARTITIONING)
+    toImpl(contextRef)->registerURLSchemeAsCachePartitioned(toImpl(urlScheme)->string());
+#else
+    UNUSED_PARAM(contextRef);
+    UNUSED_PARAM(urlScheme);
+#endif
+}
+
 void WKContextSetDomainRelaxationForbiddenForURLScheme(WKContextRef contextRef, WKStringRef urlScheme)
 {

trunk/Source/WebKit2/UIProcess/API/C/WKContextPrivate.h

@@ -53 +53 @@
 WK_EXPORT void WKContextRegisterURLSchemeAsSecure(WKContextRef context, WKStringRef urlScheme);
 
+WK_EXPORT void WKContextRegisterURLSchemeAsCachePartitioned(WKContextRef context, WKStringRef urlScheme);
+
 WK_EXPORT void WKContextSetDomainRelaxationForbiddenForURLScheme(WKContextRef context, WKStringRef urlScheme);
 

trunk/Source/WebKit2/UIProcess/WebContext.cpp

@@ -577 +577 @@
     copyToVector(m_schemesToRegisterAsDisplayIsolated, parameters.urlSchemesRegisteredAsDisplayIsolated);
     copyToVector(m_schemesToRegisterAsCORSEnabled, parameters.urlSchemesRegisteredAsCORSEnabled);
+#if ENABLE(CACHE_PARTITIONING)
+    copyToVector(m_schemesToRegisterAsCachePartitioned, parameters.urlSchemesRegisteredAsCachePartitioned);
+#endif
 
     parameters.shouldAlwaysUseComplexTextCodePath = m_alwaysUsesComplexTextCodePath;
@@ -939 +942 @@
 #endif
 
+#if ENABLE(CACHE_PARTITIONING)
+void WebContext::registerURLSchemeAsCachePartitioned(const String& urlScheme)
+{
+    m_schemesToRegisterAsCachePartitioned.add(urlScheme);
+    sendToAllProcesses(Messages::WebProcess::RegisterURLSchemeAsCachePartitioned(urlScheme));
+}
+#endif
+
 void WebContext::setCacheModel(CacheModel cacheModel)
 {

trunk/Source/WebKit2/UIProcess/WebContext.h

@@ -190 +190 @@
     void registerURLSchemeAsDisplayIsolated(const String&);
     void registerURLSchemeAsCORSEnabled(const String&);
+#if ENABLE(CACHE_PARTITIONING)
+    void registerURLSchemeAsCachePartitioned(const String&);
+#endif
 
     void addVisitedLink(const String&);
@@ -453 +456 @@
     HashSet<String> m_schemesToRegisterAsDisplayIsolated;
     HashSet<String> m_schemesToRegisterAsCORSEnabled;
+#if ENABLE(CACHE_PARTITIONING)
+    HashSet<String> m_schemesToRegisterAsCachePartitioned;
+#endif
 
     bool m_alwaysUsesComplexTextCodePath;

trunk/Source/WebKit2/WebProcess/WebProcess.cpp

@@ -328 +328 @@
         registerURLSchemeAsCORSEnabled(parameters.urlSchemesRegisteredAsCORSEnabled[i]);
 
+#if ENABLE(CACHE_PARTITIONING)
+    for (auto& scheme : parameters.urlSchemesRegisteredAsCachePartitioned)
+        registerURLSchemeAsCORSEnabled(scheme);
+#endif
+
     setDefaultRequestTimeoutInterval(parameters.defaultRequestTimeoutInterval);
 
@@ -429 +434 @@
     SchemeRegistry::registerURLSchemeAsCORSEnabled(urlScheme);
 }
+
+#if ENABLE(CACHE_PARTITIONING)
+void WebProcess::registerURLSchemeAsCachePartitioned(const String& urlScheme) const
+{
+    SchemeRegistry::registerURLSchemeAsCachePartitioned(urlScheme);
+}
+#endif
 
 void WebProcess::setDefaultRequestTimeoutInterval(double timeoutInterval)

trunk/Source/WebKit2/WebProcess/WebProcess.h

@@ -204 +204 @@
     void registerURLSchemeAsDisplayIsolated(const String&) const;
     void registerURLSchemeAsCORSEnabled(const String&) const;
+#if ENABLE(CACHE_PARTITIONING)
+    void registerURLSchemeAsCachePartitioned(const String&) const;
+#endif
     void setDefaultRequestTimeoutInterval(double);
     void setAlwaysUsesComplexTextCodePath(bool);

trunk/Source/WebKit2/WebProcess/WebProcess.messages.in

@@ -43 +43 @@
     RegisterURLSchemeAsDisplayIsolated(String scheme)
     RegisterURLSchemeAsCORSEnabled(String scheme)
+#if ENABLE(CACHE_PARTITIONING)
+    RegisterURLSchemeAsCachePartitioned(String scheme)
+#endif
     SetDefaultRequestTimeoutInterval(double timeoutInterval)
     SetAlwaysUsesComplexTextCodePath(bool alwaysUseComplexText)