<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[160949] tags/Safari-538.10/Source/WebKit2</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://trac.webkit.org/projects/webkit/changeset/160949">160949</a></dd>
<dt>Author</dt> <dd>lforschler@apple.com</dd>
<dt>Date</dt> <dd>2013-12-20 17:05:39 -0800 (Fri, 20 Dec 2013)</dd>
</dl>
<h3>Log Message</h3>
<pre>Merge <a href="http://trac.webkit.org/projects/webkit/changeset/160939">r160939</a>.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#tagsSafari53810SourceWebKit2ChangeLog">tags/Safari-538.10/Source/WebKit2/ChangeLog</a></li>
<li><a href="#tagsSafari53810SourceWebKit2UIProcessAPICmacWKContextPrivateMach">tags/Safari-538.10/Source/WebKit2/UIProcess/API/C/mac/WKContextPrivateMac.h</a></li>
<li><a href="#tagsSafari53810SourceWebKit2UIProcessAPICmacWKContextPrivateMacmm">tags/Safari-538.10/Source/WebKit2/UIProcess/API/C/mac/WKContextPrivateMac.mm</a></li>
<li><a href="#tagsSafari53810SourceWebKit2UIProcessAPICocoaWKBrowsingContextControllermm">tags/Safari-538.10/Source/WebKit2/UIProcess/API/Cocoa/WKBrowsingContextController.mm</a></li>
<li><a href="#tagsSafari53810SourceWebKit2UIProcessWebContextcpp">tags/Safari-538.10/Source/WebKit2/UIProcess/WebContext.cpp</a></li>
<li><a href="#tagsSafari53810SourceWebKit2UIProcessWebContexth">tags/Safari-538.10/Source/WebKit2/UIProcess/WebContext.h</a></li>
<li><a href="#tagsSafari53810SourceWebKit2UIProcessmacWebContextMacmm">tags/Safari-538.10/Source/WebKit2/UIProcess/mac/WebContextMac.mm</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="tagsSafari53810SourceWebKit2ChangeLog"></a>
<div class="modfile"><h4>Modified: tags/Safari-538.10/Source/WebKit2/ChangeLog (160948 => 160949)</h4>
<pre class="diff"><span>
<span class="info">--- tags/Safari-538.10/Source/WebKit2/ChangeLog 2013-12-21 00:59:14 UTC (rev 160948)
+++ tags/Safari-538.10/Source/WebKit2/ChangeLog 2013-12-21 01:05:39 UTC (rev 160949)
</span><span class="lines">@@ -1,3 +1,32 @@
</span><ins>+2013-12-20 Lucas Forschler <lforschler@apple.com>
+
+ Merge r160939
+
+ 2013-12-20 Sam Weinig <sam@webkit.org>
+
+ [WK2] Add SPI for using a custom protocol handler
+ https://bugs.webkit.org/show_bug.cgi?id=126089
+
+ Reviewed by Anders Carlsson.
+
+ * UIProcess/API/C/mac/WKContextPrivateMac.h:
+ * UIProcess/API/C/mac/WKContextPrivateMac.mm:
+ (WKContextRegisterSchemeForCustomProtocol):
+ (WKContextUnregisterSchemeForCustomProtocol):
+ * UIProcess/API/Cocoa/WKBrowsingContextController.mm:
+ (+[WKBrowsingContextController registerSchemeForCustomProtocol:]):
+ (+[WKBrowsingContextController unregisterSchemeForCustomProtocol:]):
+ * UIProcess/WebContext.cpp:
+ (WebKit::WebContext::globalURLSchemesWithCustomProtocolHandlers):
+ (WebKit::WebContext::registerGlobalURLSchemeAsHavingCustomProtocolHandlers):
+ (WebKit::WebContext::unregisterGlobalURLSchemeAsHavingCustomProtocolHandlers):
+ * UIProcess/WebContext.h:
+ * UIProcess/mac/WebContextMac.mm:
+ (WebKit::WebContext::platformInitializeWebProcess):
+ (WebKit::WebContext::platformInitializeNetworkProcess):
+ (WebKit::WebContext::registerNotificationObservers):
+ (WebKit::WebContext::unregisterNotificationObservers):
+
</ins><span class="cx"> 2013-12-19 Andy Estes <aestes@apple.com>
</span><span class="cx">
</span><span class="cx"> Remove WebFilterEvaluator wrappers from WebKitSystemInterface
</span></span></pre></div>
<a id="tagsSafari53810SourceWebKit2UIProcessAPICmacWKContextPrivateMach"></a>
<div class="modfile"><h4>Modified: tags/Safari-538.10/Source/WebKit2/UIProcess/API/C/mac/WKContextPrivateMac.h (160948 => 160949)</h4>
<pre class="diff"><span>
<span class="info">--- tags/Safari-538.10/Source/WebKit2/UIProcess/API/C/mac/WKContextPrivateMac.h 2013-12-21 00:59:14 UTC (rev 160948)
+++ tags/Safari-538.10/Source/WebKit2/UIProcess/API/C/mac/WKContextPrivateMac.h 2013-12-21 01:05:39 UTC (rev 160949)
</span><span class="lines">@@ -44,6 +44,9 @@
</span><span class="cx">
</span><span class="cx"> WK_EXPORT void WKContextResetHSTSHosts(WKContextRef context);
</span><span class="cx">
</span><ins>+WK_EXPORT void WKContextRegisterSchemeForCustomProtocol(WKContextRef context, WKStringRef scheme);
+WK_EXPORT void WKContextUnregisterSchemeForCustomProtocol(WKContextRef context, WKStringRef scheme);
+
</ins><span class="cx"> /* DEPRECATED - Please use constants from WKPluginInformation instead. */
</span><span class="cx">
</span><span class="cx"> /* Value type: WKStringRef */
</span></span></pre></div>
<a id="tagsSafari53810SourceWebKit2UIProcessAPICmacWKContextPrivateMacmm"></a>
<div class="modfile"><h4>Modified: tags/Safari-538.10/Source/WebKit2/UIProcess/API/C/mac/WKContextPrivateMac.mm (160948 => 160949)</h4>
<pre class="diff"><span>
<span class="info">--- tags/Safari-538.10/Source/WebKit2/UIProcess/API/C/mac/WKContextPrivateMac.mm 2013-12-21 00:59:14 UTC (rev 160948)
+++ tags/Safari-538.10/Source/WebKit2/UIProcess/API/C/mac/WKContextPrivateMac.mm 2013-12-21 01:05:39 UTC (rev 160949)
</span><span class="lines">@@ -105,6 +105,17 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx">
</span><ins>+
+void WKContextRegisterSchemeForCustomProtocol(WKContextRef context, WKStringRef scheme)
+{
+ WebContext::registerGlobalURLSchemeAsHavingCustomProtocolHandlers(toWTFString(scheme));
+}
+
+void WKContextUnregisterSchemeForCustomProtocol(WKContextRef context, WKStringRef scheme)
+{
+ WebContext::unregisterGlobalURLSchemeAsHavingCustomProtocolHandlers(toWTFString(scheme));
+}
+
</ins><span class="cx"> /* DEPRECATED - Please use constants from WKPluginInformation instead. */
</span><span class="cx">
</span><span class="cx"> WKStringRef WKPlugInInfoPathKey()
</span></span></pre></div>
<a id="tagsSafari53810SourceWebKit2UIProcessAPICocoaWKBrowsingContextControllermm"></a>
<div class="modfile"><h4>Modified: tags/Safari-538.10/Source/WebKit2/UIProcess/API/Cocoa/WKBrowsingContextController.mm (160948 => 160949)</h4>
<pre class="diff"><span>
<span class="info">--- tags/Safari-538.10/Source/WebKit2/UIProcess/API/Cocoa/WKBrowsingContextController.mm 2013-12-21 00:59:14 UTC (rev 160948)
+++ tags/Safari-538.10/Source/WebKit2/UIProcess/API/Cocoa/WKBrowsingContextController.mm 2013-12-21 01:05:39 UTC (rev 160949)
</span><span class="lines">@@ -176,22 +176,12 @@
</span><span class="cx">
</span><span class="cx"> + (void)registerSchemeForCustomProtocol:(NSString *)scheme
</span><span class="cx"> {
</span><del>- if (!scheme)
- return;
-
- NSString *lowercaseScheme = [scheme lowercaseString];
- [[WKBrowsingContextController customSchemes] addObject:lowercaseScheme];
- [[NSNotificationCenter defaultCenter] postNotificationName:SchemeForCustomProtocolRegisteredNotificationName object:lowercaseScheme];
</del><ins>+ WebContext::registerGlobalURLSchemeAsHavingCustomProtocolHandlers(scheme);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> + (void)unregisterSchemeForCustomProtocol:(NSString *)scheme
</span><span class="cx"> {
</span><del>- if (!scheme)
- return;
-
- NSString *lowercaseScheme = [scheme lowercaseString];
- [[WKBrowsingContextController customSchemes] removeObject:lowercaseScheme];
- [[NSNotificationCenter defaultCenter] postNotificationName:SchemeForCustomProtocolUnregisteredNotificationName object:lowercaseScheme];
</del><ins>+ WebContext::unregisterGlobalURLSchemeAsHavingCustomProtocolHandlers(scheme);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> - (void)loadRequest:(NSURLRequest *)request
</span></span></pre></div>
<a id="tagsSafari53810SourceWebKit2UIProcessWebContextcpp"></a>
<div class="modfile"><h4>Modified: tags/Safari-538.10/Source/WebKit2/UIProcess/WebContext.cpp (160948 => 160949)</h4>
<pre class="diff"><span>
<span class="info">--- tags/Safari-538.10/Source/WebKit2/UIProcess/WebContext.cpp 2013-12-21 00:59:14 UTC (rev 160948)
+++ tags/Safari-538.10/Source/WebKit2/UIProcess/WebContext.cpp 2013-12-21 01:05:39 UTC (rev 160949)
</span><span class="lines">@@ -64,6 +64,7 @@
</span><span class="cx"> #include <runtime/Operations.h>
</span><span class="cx"> #include <wtf/CurrentTime.h>
</span><span class="cx"> #include <wtf/MainThread.h>
</span><ins>+#include <wtf/NeverDestroyed.h>
</ins><span class="cx"> #include <wtf/RunLoop.h>
</span><span class="cx">
</span><span class="cx"> #if ENABLE(BATTERY_STATUS)
</span><span class="lines">@@ -874,6 +875,34 @@
</span><span class="cx"> sendToAllProcesses(Messages::WebProcess::RegisterURLSchemeAsCORSEnabled(urlScheme));
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+HashSet<String>& WebContext::globalURLSchemesWithCustomProtocolHandlers()
+{
+ static NeverDestroyed<HashSet<String>> set;
+ return set;
+}
+
+void WebContext::registerGlobalURLSchemeAsHavingCustomProtocolHandlers(const String& urlScheme)
+{
+ if (!urlScheme)
+ return;
+
+ String schemeLower = urlScheme.lower();
+ globalURLSchemesWithCustomProtocolHandlers().add(schemeLower);
+ for (auto* context : allContexts())
+ context->registerSchemeForCustomProtocol(schemeLower);
+}
+
+void WebContext::unregisterGlobalURLSchemeAsHavingCustomProtocolHandlers(const String& urlScheme)
+{
+ if (!urlScheme)
+ return;
+
+ String schemeLower = urlScheme.lower();
+ globalURLSchemesWithCustomProtocolHandlers().remove(schemeLower);
+ for (auto* context : allContexts())
+ context->unregisterSchemeForCustomProtocol(schemeLower);
+}
+
</ins><span class="cx"> void WebContext::setCacheModel(CacheModel cacheModel)
</span><span class="cx"> {
</span><span class="cx"> m_cacheModel = cacheModel;
</span></span></pre></div>
<a id="tagsSafari53810SourceWebKit2UIProcessWebContexth"></a>
<div class="modfile"><h4>Modified: tags/Safari-538.10/Source/WebKit2/UIProcess/WebContext.h (160948 => 160949)</h4>
<pre class="diff"><span>
<span class="info">--- tags/Safari-538.10/Source/WebKit2/UIProcess/WebContext.h 2013-12-21 00:59:14 UTC (rev 160948)
+++ tags/Safari-538.10/Source/WebKit2/UIProcess/WebContext.h 2013-12-21 01:05:39 UTC (rev 160949)
</span><span class="lines">@@ -85,11 +85,6 @@
</span><span class="cx"> struct NetworkProcessCreationParameters;
</span><span class="cx"> #endif
</span><span class="cx">
</span><del>-#if PLATFORM(MAC)
-extern NSString *SchemeForCustomProtocolRegisteredNotificationName;
-extern NSString *SchemeForCustomProtocolUnregisteredNotificationName;
-#endif
-
</del><span class="cx"> class WebContext : public API::ObjectImpl<API::Object::Type::Context>, private CoreIPC::MessageReceiver
</span><span class="cx"> #if ENABLE(NETSCAPE_PLUGIN_API)
</span><span class="cx"> , private PluginInfoStoreClient
</span><span class="lines">@@ -311,6 +306,15 @@
</span><span class="cx"> bool isURLKnownHSTSHost(const String& urlString, bool privateBrowsingEnabled) const;
</span><span class="cx"> void resetHSTSHosts();
</span><span class="cx">
</span><ins>+#if ENABLE(CUSTOM_PROTOCOLS)
+ void registerSchemeForCustomProtocol(const String&);
+ void unregisterSchemeForCustomProtocol(const String&);
+
+ static HashSet<String>& globalURLSchemesWithCustomProtocolHandlers();
+ static void registerGlobalURLSchemeAsHavingCustomProtocolHandlers(const String&);
+ static void unregisterGlobalURLSchemeAsHavingCustomProtocolHandlers(const String&);
+#endif
+
</ins><span class="cx"> private:
</span><span class="cx"> void platformInitialize();
</span><span class="cx">
</span><span class="lines">@@ -390,11 +394,6 @@
</span><span class="cx"> void unregisterNotificationObservers();
</span><span class="cx"> #endif
</span><span class="cx">
</span><del>-#if ENABLE(CUSTOM_PROTOCOLS)
- void registerSchemeForCustomProtocol(const String&);
- void unregisterSchemeForCustomProtocol(const String&);
-#endif
-
</del><span class="cx"> void addPlugInAutoStartOriginHash(const String& pageOrigin, unsigned plugInOriginHash);
</span><span class="cx"> void plugInDidReceiveUserInteraction(unsigned plugInOriginHash);
</span><span class="cx">
</span><span class="lines">@@ -468,9 +467,6 @@
</span><span class="cx">
</span><span class="cx"> #if PLATFORM(MAC)
</span><span class="cx"> RetainPtr<NSObject> m_enhancedAccessibilityObserver;
</span><del>- RetainPtr<NSObject> m_customSchemeRegisteredObserver;
- RetainPtr<NSObject> m_customSchemeUnregisteredObserver;
-
</del><span class="cx"> RetainPtr<NSObject> m_automaticTextReplacementNotificationObserver;
</span><span class="cx"> RetainPtr<NSObject> m_automaticSpellingCorrectionNotificationObserver;
</span><span class="cx"> #if !PLATFORM(IOS) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 1090
</span></span></pre></div>
<a id="tagsSafari53810SourceWebKit2UIProcessmacWebContextMacmm"></a>
<div class="modfile"><h4>Modified: tags/Safari-538.10/Source/WebKit2/UIProcess/mac/WebContextMac.mm (160948 => 160949)</h4>
<pre class="diff"><span>
<span class="info">--- tags/Safari-538.10/Source/WebKit2/UIProcess/mac/WebContextMac.mm 2013-12-21 00:59:14 UTC (rev 160948)
+++ tags/Safari-538.10/Source/WebKit2/UIProcess/mac/WebContextMac.mm 2013-12-21 01:05:39 UTC (rev 160949)
</span><span class="lines">@@ -310,8 +310,8 @@
</span><span class="cx"> #if ENABLE(NETWORK_PROCESS)
</span><span class="cx"> if (!m_usesNetworkProcess) {
</span><span class="cx"> #endif
</span><del>-#if ENABLE(CUSTOM_PROTOCOLS) && WK_API_ENABLED
- for (NSString *scheme in [WKBrowsingContextController customSchemes])
</del><ins>+#if ENABLE(CUSTOM_PROTOCOLS)
+ for (const auto& scheme : globalURLSchemesWithCustomProtocolHandlers())
</ins><span class="cx"> parameters.urlSchemesRegisteredForCustomProtocols.append(scheme);
</span><span class="cx"> #endif
</span><span class="cx"> #if ENABLE(NETWORK_PROCESS)
</span><span class="lines">@@ -329,8 +329,8 @@
</span><span class="cx"> parameters.parentProcessName = [[NSProcessInfo processInfo] processName];
</span><span class="cx"> parameters.uiProcessBundleIdentifier = [[NSBundle mainBundle] bundleIdentifier];
</span><span class="cx">
</span><del>-#if WK_API_ENABLED
- for (NSString *scheme in [WKBrowsingContextController customSchemes])
</del><ins>+#if ENABLE(CUSTOM_PROTOCOLS)
+ for (const auto& scheme : globalURLSchemesWithCustomProtocolHandlers())
</ins><span class="cx"> parameters.urlSchemesRegisteredForCustomProtocols.append(scheme);
</span><span class="cx"> #endif
</span><span class="cx">
</span><span class="lines">@@ -573,18 +573,6 @@
</span><span class="cx"> void WebContext::registerNotificationObservers()
</span><span class="cx"> {
</span><span class="cx"> #if !PLATFORM(IOS)
</span><del>- m_customSchemeRegisteredObserver = [[NSNotificationCenter defaultCenter] addObserverForName:WebKit::SchemeForCustomProtocolRegisteredNotificationName object:nil queue:[NSOperationQueue currentQueue] usingBlock:^(NSNotification *notification) {
- NSString *scheme = [notification object];
- ASSERT([scheme isKindOfClass:[NSString class]]);
- registerSchemeForCustomProtocol(scheme);
- }];
-
- m_customSchemeUnregisteredObserver = [[NSNotificationCenter defaultCenter] addObserverForName:WebKit::SchemeForCustomProtocolUnregisteredNotificationName object:nil queue:[NSOperationQueue currentQueue] usingBlock:^(NSNotification *notification) {
- NSString *scheme = [notification object];
- ASSERT([scheme isKindOfClass:[NSString class]]);
- unregisterSchemeForCustomProtocol(scheme);
- }];
-
</del><span class="cx"> // Listen for enhanced accessibility changes and propagate them to the WebProcess.
</span><span class="cx"> m_enhancedAccessibilityObserver = [[NSNotificationCenter defaultCenter] addObserverForName:WebKitApplicationDidChangeAccessibilityEnhancedUserInterfaceNotification object:nil queue:[NSOperationQueue currentQueue] usingBlock:^(NSNotification *note) {
</span><span class="cx"> setEnhancedAccessibility([[[note userInfo] objectForKey:@"AXEnhancedUserInterface"] boolValue]);
</span><span class="lines">@@ -617,10 +605,7 @@
</span><span class="cx"> void WebContext::unregisterNotificationObservers()
</span><span class="cx"> {
</span><span class="cx"> #if !PLATFORM(IOS)
</span><del>- [[NSNotificationCenter defaultCenter] removeObserver:m_customSchemeRegisteredObserver.get()];
- [[NSNotificationCenter defaultCenter] removeObserver:m_customSchemeUnregisteredObserver.get()];
- [[NSNotificationCenter defaultCenter] removeObserver:m_enhancedAccessibilityObserver.get()];
-
</del><ins>+ [[NSNotificationCenter defaultCenter] removeObserver:m_enhancedAccessibilityObserver.get()];
</ins><span class="cx"> [[NSNotificationCenter defaultCenter] removeObserver:m_automaticTextReplacementNotificationObserver.get()];
</span><span class="cx"> [[NSNotificationCenter defaultCenter] removeObserver:m_automaticSpellingCorrectionNotificationObserver.get()];
</span><span class="cx"> #if __MAC_OS_X_VERSION_MIN_REQUIRED >= 1090
</span></span></pre>
</div>
</div>
</body>
</html>