Changeset 69614 in webkit

Timestamp:

Oct 12, 2010 3:37:49 PM (14 years ago)

Author:

jberlin@webkit.org

Message:

Add ability for WK2 to register a scheme as secure.
​https://bugs.webkit.org/show_bug.cgi?id=47557

Reviewed by Jon Honeycutt.

Add the schemes that need to be registered as secure to the WebProcessCreationParameters.

• Shared/WebProcessCreationParameters.cpp:

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

• Shared/WebProcessCreationParameters.h:

• UIProcess/API/C/WKContext.cpp:

(WKContextRegisterURLSchemeAsSecure):

• UIProcess/API/C/WKContextPrivate.h:

• UIProcess/WebContext.cpp:

(WebKit::WebContext::ensureWebProcess):
Copy over the schemes that are to be registered as secure to the
WebProcessCreationParameters.
(WebKit::WebContext::registerURLSchemeAsSecure):
Only send a message to the WebProcess if it is valid.

• UIProcess/WebContext.h:

• WebProcess/WebProcess.cpp:

(WebKit::WebProcess::initializeWebProcess):
Register the schemes that need to be registered as secure from the
WebProcessCreationParameters.
(WebKit::WebProcess::registerURLSchemeAsSecure):

• WebProcess/WebProcess.h:

• WebProcess/WebProcess.messages.in:

Add the RegisterURLSchemeAsSecure 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) (2 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 register a scheme as secure.
+        https://bugs.webkit.org/show_bug.cgi?id=47557
+
+        Add the schemes that need to be registered as secure to the WebProcessCreationParameters.
+        * Shared/WebProcessCreationParameters.cpp:
+        (WebKit::WebProcessCreationParameters::encode):
+        (WebKit::WebProcessCreationParameters::decode):
+        * Shared/WebProcessCreationParameters.h:
+
+        * UIProcess/API/C/WKContext.cpp:
+        (WKContextRegisterURLSchemeAsSecure):
+        * UIProcess/API/C/WKContextPrivate.h:
+
+        * UIProcess/WebContext.cpp:
+        (WebKit::WebContext::ensureWebProcess):
+        Copy over the schemes that are to be registered as secure to the
+        WebProcessCreationParameters.
+        (WebKit::WebContext::registerURLSchemeAsSecure):
+        Only send a message to the WebProcess if it is valid.
+        * UIProcess/WebContext.h:
+
+        * WebProcess/WebProcess.cpp:
+        (WebKit::WebProcess::initializeWebProcess):
+        Register the schemes that need to be registered as secure from the
+        WebProcessCreationParameters.
+        (WebKit::WebProcess::registerURLSchemeAsSecure):
+        * WebProcess/WebProcess.h:
+
+        * WebProcess/WebProcess.messages.in:
+        Add the RegisterURLSchemeAsSecure message.
+
 2010-10-12  John Sullivan  <sullivan@apple.com>
 

trunk/WebKit2/Shared/WebProcessCreationParameters.cpp

@@ -47 +47 @@
     encoder->encode(applicationCacheDirectory);
     encoder->encode(urlSchemesRegistererdAsEmptyDocument);
+    encoder->encode(urlSchemesRegisteredAsSecure);
     encoder->encode(static_cast<uint32_t>(cacheModel));
     encoder->encode(shouldTrackVisitedLinks);
@@ -70 +71 @@
     if (!decoder->decode(parameters.urlSchemesRegistererdAsEmptyDocument))
         return false;
+    if (!decoder->decode(parameters.urlSchemesRegisteredAsSecure))
+        return false;
 
     uint32_t cacheModel;

trunk/WebKit2/Shared/WebProcessCreationParameters.h

@@ -55 +55 @@
     String applicationCacheDirectory;
     Vector<String> urlSchemesRegistererdAsEmptyDocument;
+    Vector<String> urlSchemesRegisteredAsSecure;
 
     CacheModel cacheModel;

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

@@ -121 +121 @@
     toImpl(contextRef)->registerURLSchemeAsEmptyDocument(toImpl(urlScheme)->string());
 }
+
+void WKContextRegisterURLSchemeAsSecure(WKContextRef contextRef, WKStringRef urlScheme)
+{
+    toImpl(contextRef)->registerURLSchemeAsSecure(toImpl(urlScheme)->string());
+}

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

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

trunk/WebKit2/UIProcess/WebContext.cpp

@@ -153 +153 @@
     
     copyToVector(m_schemesToRegisterAsEmptyDocument, parameters.urlSchemesRegistererdAsEmptyDocument);
+    copyToVector(m_schemesToRegisterAsSecure, parameters.urlSchemesRegisteredAsSecure);
 
     // Add any platform specific parameters
@@ -309 +310 @@
 
     m_process->send(Messages::WebProcess::RegisterURLSchemeAsEmptyDocument(urlScheme), 0);
+}
+
+void WebContext::registerURLSchemeAsSecure(const String& urlScheme)
+{
+    m_schemesToRegisterAsSecure.add(urlScheme);
+
+    if (!hasValidProcess())
+        return;
+
+    m_process->send(Messages::WebProcess::RegisterURLSchemeAsSecure(urlScheme), 0);
 }
 

trunk/WebKit2/UIProcess/WebContext.h

@@ -103 +103 @@
     
     void registerURLSchemeAsEmptyDocument(const String&);
+    void registerURLSchemeAsSecure(const String&);
     
     void addVisitedLink(const String&);
@@ -143 +144 @@
         
     HashSet<String> m_schemesToRegisterAsEmptyDocument;
+    HashSet<String> m_schemesToRegisterAsSecure;
     Vector<pair<String, RefPtr<APIObject> > > m_pendingMessagesToPostToInjectedBundle;
 

trunk/WebKit2/WebProcess/WebProcess.cpp

@@ -133 +133 @@
     setShouldTrackVisitedLinks(parameters.shouldTrackVisitedLinks);
     setCacheModel(static_cast<uint32_t>(parameters.cacheModel));
+
     for (size_t i = 0; i < parameters.urlSchemesRegistererdAsEmptyDocument.size(); ++i)
         registerURLSchemeAsEmptyDocument(parameters.urlSchemesRegistererdAsEmptyDocument[i]);
 
+    for (size_t i = 0; i < parameters.urlSchemesRegisteredAsSecure.size(); ++i)
+        registerURLSchemeAsSecure(parameters.urlSchemesRegisteredAsSecure[i]);
+
 #if USE(ACCELERATED_COMPOSITING) && PLATFORM(MAC)
     m_compositingRenderServerPort = parameters.acceleratedCompositingPort.port();
@@ -152 +156 @@
 {
     SchemeRegistry::registerURLSchemeAsEmptyDocument(urlScheme);
+}
+
+void WebProcess::registerURLSchemeAsSecure(const String& urlScheme) const
+{
+    SchemeRegistry::registerURLSchemeAsSecure(urlScheme);
 }
 

trunk/WebKit2/WebProcess/WebProcess.h

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

trunk/WebKit2/WebProcess/WebProcess.messages.in

@@ -37 +37 @@
     SetCacheModel(uint32_t cacheModel)
     RegisterURLSchemeAsEmptyDocument(WTF::String scheme)
+    RegisterURLSchemeAsSecure(WTF::String scheme)
 #if PLATFORM(WIN)
     SetShouldPaintNativeControls(bool shouldPaintNativeControls)