Changeset 69661 in webkit

Timestamp:

Oct 13, 2010 7:42:35 AM (14 years ago)

Author:

jberlin@webkit.org

Message:

Add ability for WK2 to set domain relaxation forbidden for a URL scheme.
​https://bugs.webkit.org/show_bug.cgi?id=47562

Reviewed by Jon Honeycutt.

Add the schemes for which domain relaxation is forbidden to the
WebProcessCreationParameters.

• Shared/WebProcessCreationParameters.cpp:

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

• Shared/WebProcessCreationParameters.h:

• UIProcess/API/C/WKContext.cpp:

(WKContextSetDomainRelaxationForbiddenForURLScheme):

• UIProcess/API/C/WKContextPrivate.h:

• UIProcess/WebContext.cpp:

(WebKit::WebContext::ensureWebProcess):
Copy over the schemes for which domain relaxation is forbidden to
WebProcessCreationParameters.
(WebKit::WebContext::setDomainRelaxationForbiddenForURLScheme):
Only send a message to the WebProcess if it is valid.

• UIProcess/WebContext.h:

• WebProcess/WebProcess.cpp:

(WebKit::WebProcess::initializeWebProcess):
Set domain relaxation forbidden for the schemes in
WebProcesCreationParameters.urlSchemesForWhichDomainRelaxationIsForbidden.
(WebKit::WebProcess::setDomainRelaxationForbiddenForURLScheme):

• WebProcess/WebProcess.h:

• WebProcess/WebProcess.messages.in:

Add the SetDomainRelaxationFobiddenForURLScheme message.

Location:

trunk/WebKit2

Files:

• ChangeLog (modified) (1 diff)
• Shared/WebProcessCreationParameters.cpp (modified) (2 diffs)
• Shared/WebProcessCreationParameters.h (modified) (1 diff)
• UIProcess/API/C/WKContext.cpp (modified) (1 diff)
• UIProcess/API/C/WKContextPrivate.h (modified) (1 diff)
• UIProcess/WebContext.cpp (modified) (2 diffs)
• UIProcess/WebContext.h (modified) (2 diffs)
• WebProcess/WebProcess.cpp (modified) (3 diffs)
• WebProcess/WebProcess.h (modified) (1 diff)
• WebProcess/WebProcess.messages.in (modified) (1 diff)

trunk/WebKit2/ChangeLog

@@ +1 @@
+2010-10-12  Jessie Berlin  <jberlin@apple.com>
+
+        Reviewed by Jon Honeycutt.
+
+        Add ability for WK2 to set domain relaxation forbidden for a URL scheme.
+        https://bugs.webkit.org/show_bug.cgi?id=47562
+
+        Add the schemes for which domain relaxation is forbidden to the
+        WebProcessCreationParameters.
+        * Shared/WebProcessCreationParameters.cpp:
+        (WebKit::WebProcessCreationParameters::encode):
+        (WebKit::WebProcessCreationParameters::decode):
+        * Shared/WebProcessCreationParameters.h:
+
+        * UIProcess/API/C/WKContext.cpp:
+        (WKContextSetDomainRelaxationForbiddenForURLScheme):
+        * UIProcess/API/C/WKContextPrivate.h:
+
+        * UIProcess/WebContext.cpp:
+        (WebKit::WebContext::ensureWebProcess):
+        Copy over the schemes for which domain relaxation is forbidden to
+        WebProcessCreationParameters.
+        (WebKit::WebContext::setDomainRelaxationForbiddenForURLScheme):
+        Only send a message to the WebProcess if it is valid.
+        * UIProcess/WebContext.h:
+
+        * WebProcess/WebProcess.cpp:
+        (WebKit::WebProcess::initializeWebProcess):
+        Set domain relaxation forbidden for the schemes in
+        WebProcesCreationParameters.urlSchemesForWhichDomainRelaxationIsForbidden.
+        (WebKit::WebProcess::setDomainRelaxationForbiddenForURLScheme):
+        * WebProcess/WebProcess.h:
+
+        * WebProcess/WebProcess.messages.in:
+        Add the SetDomainRelaxationFobiddenForURLScheme message.
+
 2010-10-13  Csaba Osztrogonác  <ossy@webkit.org>
 

trunk/WebKit2/Shared/WebProcessCreationParameters.cpp

@@ -48 +48 @@
     encoder->encode(urlSchemesRegistererdAsEmptyDocument);
     encoder->encode(urlSchemesRegisteredAsSecure);
+    encoder->encode(urlSchemesForWhichDomainRelaxationIsForbidden);
     encoder->encode(static_cast<uint32_t>(cacheModel));
     encoder->encode(shouldTrackVisitedLinks);
@@ -73 +74 @@
     if (!decoder->decode(parameters.urlSchemesRegisteredAsSecure))
         return false;
+    if (!decoder->decode(parameters.urlSchemesForWhichDomainRelaxationIsForbidden))
+        return false;
 
     uint32_t cacheModel;

trunk/WebKit2/Shared/WebProcessCreationParameters.h

@@ -56 +56 @@
     Vector<String> urlSchemesRegistererdAsEmptyDocument;
     Vector<String> urlSchemesRegisteredAsSecure;
+    Vector<String> urlSchemesForWhichDomainRelaxationIsForbidden;
 
     CacheModel cacheModel;

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

@@ -126 +126 @@
     toImpl(contextRef)->registerURLSchemeAsSecure(toImpl(urlScheme)->string());
 }
+
+void WKContextSetDomainRelaxationForbiddenForURLScheme(WKContextRef contextRef, WKStringRef urlScheme)
+{
+    toImpl(contextRef)->setDomainRelaxationForbiddenForURLScheme(toImpl(urlScheme)->string());
+}

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

@@ -51 +51 @@
 WK_EXPORT void WKContextRegisterURLSchemeAsSecure(WKContextRef context, WKStringRef urlScheme);
 
+WK_EXPORT void WKContextSetDomainRelaxationForbiddenForURLScheme(WKContextRef context, WKStringRef urlScheme);
+
 #ifdef __cplusplus
 }

trunk/WebKit2/UIProcess/WebContext.cpp

@@ -154 +154 @@
     copyToVector(m_schemesToRegisterAsEmptyDocument, parameters.urlSchemesRegistererdAsEmptyDocument);
     copyToVector(m_schemesToRegisterAsSecure, parameters.urlSchemesRegisteredAsSecure);
+    copyToVector(m_schemesToSetDomainRelaxationForbiddenFor, parameters.urlSchemesForWhichDomainRelaxationIsForbidden);
 
     // Add any platform specific parameters
@@ -320 +321 @@
 
     m_process->send(Messages::WebProcess::RegisterURLSchemeAsSecure(urlScheme), 0);
+}
+
+void WebContext::setDomainRelaxationForbiddenForURLScheme(const String& urlScheme)
+{
+    m_schemesToSetDomainRelaxationForbiddenFor.add(urlScheme);
+
+    if (!hasValidProcess())
+        return;
+
+    m_process->send(Messages::WebProcess::SetDomainRelaxationForbiddenForURLScheme(urlScheme), 0);
 }
 

trunk/WebKit2/UIProcess/WebContext.h

@@ -104 +104 @@
     void registerURLSchemeAsEmptyDocument(const String&);
     void registerURLSchemeAsSecure(const String&);
-    
+    void setDomainRelaxationForbiddenForURLScheme(const String&);
+
     void addVisitedLink(const String&);
     void addVisitedLink(WebCore::LinkHash);
@@ -145 +146 @@
     HashSet<String> m_schemesToRegisterAsEmptyDocument;
     HashSet<String> m_schemesToRegisterAsSecure;
+    HashSet<String> m_schemesToSetDomainRelaxationForbiddenFor;
+
     Vector<pair<String, RefPtr<APIObject> > > m_pendingMessagesToPostToInjectedBundle;
 

trunk/WebKit2/WebProcess/WebProcess.cpp

@@ -42 +42 @@
 #include <WebCore/PageGroup.h>
 #include <WebCore/SchemeRegistry.h>
+#include <WebCore/SecurityOrigin.h>
 #include <WebCore/Settings.h>
 #include <wtf/PassRefPtr.h>
@@ -140 +141 @@
         registerURLSchemeAsSecure(parameters.urlSchemesRegisteredAsSecure[i]);
 
+    for (size_t i = 0; i < parameters.urlSchemesForWhichDomainRelaxationIsForbidden.size(); ++i)
+        setDomainRelaxationForbiddenForURLScheme(parameters.urlSchemesForWhichDomainRelaxationIsForbidden[i]);
+
 #if USE(ACCELERATED_COMPOSITING) && PLATFORM(MAC)
     m_compositingRenderServerPort = parameters.acceleratedCompositingPort.port();
@@ -161 +165 @@
 {
     SchemeRegistry::registerURLSchemeAsSecure(urlScheme);
+}
+
+void WebProcess::setDomainRelaxationForbiddenForURLScheme(const String& urlScheme) const
+{
+    SecurityOrigin::setDomainRelaxationForbiddenForURLScheme(true, urlScheme);
 }
 

trunk/WebKit2/WebProcess/WebProcess.h

@@ -92 +92 @@
     void registerURLSchemeAsEmptyDocument(const String&);
     void registerURLSchemeAsSecure(const String&) const;
+    void setDomainRelaxationForbiddenForURLScheme(const String&) const;
 #if PLATFORM(WIN)
     void setShouldPaintNativeControls(bool);

trunk/WebKit2/WebProcess/WebProcess.messages.in

@@ -38 +38 @@
     RegisterURLSchemeAsEmptyDocument(WTF::String scheme)
     RegisterURLSchemeAsSecure(WTF::String scheme)
+    SetDomainRelaxationForbiddenForURLScheme(WTF::String scheme)
 #if PLATFORM(WIN)
     SetShouldPaintNativeControls(bool shouldPaintNativeControls)