<!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>[179870] trunk/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/179870">179870</a></dd>
<dt>Author</dt> <dd>commit-queue@webkit.org</dd>
<dt>Date</dt> <dd>2015-02-10 08:01:30 -0800 (Tue, 10 Feb 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>[WK2] Add support for registering url schemes to bypass Content Security Policy.
https://bugs.webkit.org/show_bug.cgi?id=140736
Patch by Zhuo Li <zachli@apple.com> on 2015-02-10
Reviewed by Anders Carlsson.
* Shared/WebProcessCreationParameters.cpp:
(WebKit::WebProcessCreationParameters::encode):
(WebKit::WebProcessCreationParameters::decode):
* Shared/WebProcessCreationParameters.h:
* UIProcess/API/C/WKContext.cpp:
(WKContextRegisterURLSchemeAsBypassingContentSecurityPolicy):
* UIProcess/API/C/WKContextPrivate.h:
* UIProcess/WebProcessPool.cpp:
(WebKit::WebProcessPool::createNewWebProcess):
(WebKit::WebProcessPool::registerURLSchemeAsBypassingContentSecurityPolicy):
* UIProcess/WebProcessPool.h:
* WebProcess/WebProcess.cpp:
(WebKit::WebProcess::initializeWebProcess):
(WebKit::WebProcess::registerURLSchemeAsBypassingContentSecurityPolicy):
* WebProcess/WebProcess.h:
* WebProcess/WebProcess.messages.in:</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebKit2ChangeLog">trunk/Source/WebKit2/ChangeLog</a></li>
<li><a href="#trunkSourceWebKit2SharedWebProcessCreationParameterscpp">trunk/Source/WebKit2/Shared/WebProcessCreationParameters.cpp</a></li>
<li><a href="#trunkSourceWebKit2SharedWebProcessCreationParametersh">trunk/Source/WebKit2/Shared/WebProcessCreationParameters.h</a></li>
<li><a href="#trunkSourceWebKit2UIProcessAPICWKContextcpp">trunk/Source/WebKit2/UIProcess/API/C/WKContext.cpp</a></li>
<li><a href="#trunkSourceWebKit2UIProcessAPICWKContextPrivateh">trunk/Source/WebKit2/UIProcess/API/C/WKContextPrivate.h</a></li>
<li><a href="#trunkSourceWebKit2UIProcessWebProcessPoolcpp">trunk/Source/WebKit2/UIProcess/WebProcessPool.cpp</a></li>
<li><a href="#trunkSourceWebKit2UIProcessWebProcessPoolh">trunk/Source/WebKit2/UIProcess/WebProcessPool.h</a></li>
<li><a href="#trunkSourceWebKit2WebProcessWebProcesscpp">trunk/Source/WebKit2/WebProcess/WebProcess.cpp</a></li>
<li><a href="#trunkSourceWebKit2WebProcessWebProcessh">trunk/Source/WebKit2/WebProcess/WebProcess.h</a></li>
<li><a href="#trunkSourceWebKit2WebProcessWebProcessmessagesin">trunk/Source/WebKit2/WebProcess/WebProcess.messages.in</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebKit2ChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/ChangeLog (179869 => 179870)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/ChangeLog 2015-02-10 15:47:51 UTC (rev 179869)
+++ trunk/Source/WebKit2/ChangeLog 2015-02-10 16:01:30 UTC (rev 179870)
</span><span class="lines">@@ -1,3 +1,27 @@
</span><ins>+2015-02-10 Zhuo Li <zachli@apple.com>
+
+ [WK2] Add support for registering url schemes to bypass Content Security Policy.
+ https://bugs.webkit.org/show_bug.cgi?id=140736
+
+ Reviewed by Anders Carlsson.
+
+ * Shared/WebProcessCreationParameters.cpp:
+ (WebKit::WebProcessCreationParameters::encode):
+ (WebKit::WebProcessCreationParameters::decode):
+ * Shared/WebProcessCreationParameters.h:
+ * UIProcess/API/C/WKContext.cpp:
+ (WKContextRegisterURLSchemeAsBypassingContentSecurityPolicy):
+ * UIProcess/API/C/WKContextPrivate.h:
+ * UIProcess/WebProcessPool.cpp:
+ (WebKit::WebProcessPool::createNewWebProcess):
+ (WebKit::WebProcessPool::registerURLSchemeAsBypassingContentSecurityPolicy):
+ * UIProcess/WebProcessPool.h:
+ * WebProcess/WebProcess.cpp:
+ (WebKit::WebProcess::initializeWebProcess):
+ (WebKit::WebProcess::registerURLSchemeAsBypassingContentSecurityPolicy):
+ * WebProcess/WebProcess.h:
+ * WebProcess/WebProcess.messages.in:
+
</ins><span class="cx"> 2015-02-10 Sanghyup Lee <sh53.lee@samsung.com>
</span><span class="cx">
</span><span class="cx"> [EFL] Use a variable to set flicking time instead of hardcoding
</span></span></pre></div>
<a id="trunkSourceWebKit2SharedWebProcessCreationParameterscpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/Shared/WebProcessCreationParameters.cpp (179869 => 179870)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/Shared/WebProcessCreationParameters.cpp 2015-02-10 15:47:51 UTC (rev 179869)
+++ trunk/Source/WebKit2/Shared/WebProcessCreationParameters.cpp 2015-02-10 16:01:30 UTC (rev 179870)
</span><span class="lines">@@ -82,6 +82,7 @@
</span><span class="cx"> encoder << shouldUseTestingNetworkSession;
</span><span class="cx"> encoder << urlSchemesRegistererdAsEmptyDocument;
</span><span class="cx"> encoder << urlSchemesRegisteredAsSecure;
</span><ins>+ encoder << urlSchemesRegisteredAsBypassingContentSecurityPolicy;
</ins><span class="cx"> encoder << urlSchemesForWhichDomainRelaxationIsForbidden;
</span><span class="cx"> encoder << urlSchemesRegisteredAsLocal;
</span><span class="cx"> encoder << urlSchemesRegisteredAsNoAccess;
</span><span class="lines">@@ -187,6 +188,8 @@
</span><span class="cx"> return false;
</span><span class="cx"> if (!decoder.decode(parameters.urlSchemesRegisteredAsSecure))
</span><span class="cx"> return false;
</span><ins>+ if (!decoder.decode(parameters.urlSchemesRegisteredAsBypassingContentSecurityPolicy))
+ return false;
</ins><span class="cx"> if (!decoder.decode(parameters.urlSchemesForWhichDomainRelaxationIsForbidden))
</span><span class="cx"> return false;
</span><span class="cx"> if (!decoder.decode(parameters.urlSchemesRegisteredAsLocal))
</span></span></pre></div>
<a id="trunkSourceWebKit2SharedWebProcessCreationParametersh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/Shared/WebProcessCreationParameters.h (179869 => 179870)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/Shared/WebProcessCreationParameters.h 2015-02-10 15:47:51 UTC (rev 179869)
+++ trunk/Source/WebKit2/Shared/WebProcessCreationParameters.h 2015-02-10 16:01:30 UTC (rev 179870)
</span><span class="lines">@@ -89,6 +89,7 @@
</span><span class="cx">
</span><span class="cx"> Vector<String> urlSchemesRegistererdAsEmptyDocument;
</span><span class="cx"> Vector<String> urlSchemesRegisteredAsSecure;
</span><ins>+ Vector<String> urlSchemesRegisteredAsBypassingContentSecurityPolicy;
</ins><span class="cx"> Vector<String> urlSchemesForWhichDomainRelaxationIsForbidden;
</span><span class="cx"> Vector<String> urlSchemesRegisteredAsLocal;
</span><span class="cx"> Vector<String> urlSchemesRegisteredAsNoAccess;
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessAPICWKContextcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/API/C/WKContext.cpp (179869 => 179870)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/API/C/WKContext.cpp 2015-02-10 15:47:51 UTC (rev 179869)
+++ trunk/Source/WebKit2/UIProcess/API/C/WKContext.cpp 2015-02-10 16:01:30 UTC (rev 179870)
</span><span class="lines">@@ -379,6 +379,11 @@
</span><span class="cx"> toImpl(contextRef)->registerURLSchemeAsSecure(toImpl(urlScheme)->string());
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+void WKContextRegisterURLSchemeAsBypassingContentSecurityPolicy(WKContextRef contextRef, WKStringRef urlScheme)
+{
+ toImpl(contextRef)->registerURLSchemeAsBypassingContentSecurityPolicy(toImpl(urlScheme)->string());
+}
+
</ins><span class="cx"> void WKContextRegisterURLSchemeAsCachePartitioned(WKContextRef contextRef, WKStringRef urlScheme)
</span><span class="cx"> {
</span><span class="cx"> #if ENABLE(CACHE_PARTITIONING)
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessAPICWKContextPrivateh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/API/C/WKContextPrivate.h (179869 => 179870)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/API/C/WKContextPrivate.h 2015-02-10 15:47:51 UTC (rev 179869)
+++ trunk/Source/WebKit2/UIProcess/API/C/WKContextPrivate.h 2015-02-10 16:01:30 UTC (rev 179870)
</span><span class="lines">@@ -52,6 +52,8 @@
</span><span class="cx">
</span><span class="cx"> WK_EXPORT void WKContextRegisterURLSchemeAsSecure(WKContextRef context, WKStringRef urlScheme);
</span><span class="cx">
</span><ins>+WK_EXPORT void WKContextRegisterURLSchemeAsBypassingContentSecurityPolicy(WKContextRef context, WKStringRef urlScheme);
+
</ins><span class="cx"> WK_EXPORT void WKContextRegisterURLSchemeAsCachePartitioned(WKContextRef context, WKStringRef urlScheme);
</span><span class="cx">
</span><span class="cx"> WK_EXPORT void WKContextSetDomainRelaxationForbiddenForURLScheme(WKContextRef context, WKStringRef urlScheme);
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessWebProcessPoolcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/WebProcessPool.cpp (179869 => 179870)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/WebProcessPool.cpp 2015-02-10 15:47:51 UTC (rev 179869)
+++ trunk/Source/WebKit2/UIProcess/WebProcessPool.cpp 2015-02-10 16:01:30 UTC (rev 179870)
</span><span class="lines">@@ -637,6 +637,7 @@
</span><span class="cx">
</span><span class="cx"> copyToVector(m_schemesToRegisterAsEmptyDocument, parameters.urlSchemesRegistererdAsEmptyDocument);
</span><span class="cx"> copyToVector(m_schemesToRegisterAsSecure, parameters.urlSchemesRegisteredAsSecure);
</span><ins>+ copyToVector(m_schemesToRegisterAsBypassingContentSecurityPolicy, parameters.urlSchemesRegisteredAsBypassingContentSecurityPolicy);
</ins><span class="cx"> copyToVector(m_schemesToSetDomainRelaxationForbiddenFor, parameters.urlSchemesForWhichDomainRelaxationIsForbidden);
</span><span class="cx"> copyToVector(m_schemesToRegisterAsLocal, parameters.urlSchemesRegisteredAsLocal);
</span><span class="cx"> copyToVector(m_schemesToRegisterAsNoAccess, parameters.urlSchemesRegisteredAsNoAccess);
</span><span class="lines">@@ -974,6 +975,12 @@
</span><span class="cx"> sendToAllProcesses(Messages::WebProcess::RegisterURLSchemeAsSecure(urlScheme));
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+void WebProcessPool::registerURLSchemeAsBypassingContentSecurityPolicy(const String& urlScheme)
+{
+ m_schemesToRegisterAsBypassingContentSecurityPolicy.add(urlScheme);
+ sendToAllProcesses(Messages::WebProcess::RegisterURLSchemeAsBypassingContentSecurityPolicy(urlScheme));
+}
+
</ins><span class="cx"> void WebProcessPool::setDomainRelaxationForbiddenForURLScheme(const String& urlScheme)
</span><span class="cx"> {
</span><span class="cx"> m_schemesToSetDomainRelaxationForbiddenFor.add(urlScheme);
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessWebProcessPoolh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/WebProcessPool.h (179869 => 179870)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/WebProcessPool.h 2015-02-10 15:47:51 UTC (rev 179869)
+++ trunk/Source/WebKit2/UIProcess/WebProcessPool.h 2015-02-10 16:01:30 UTC (rev 179870)
</span><span class="lines">@@ -196,6 +196,7 @@
</span><span class="cx">
</span><span class="cx"> void registerURLSchemeAsEmptyDocument(const String&);
</span><span class="cx"> void registerURLSchemeAsSecure(const String&);
</span><ins>+ void registerURLSchemeAsBypassingContentSecurityPolicy(const String&);
</ins><span class="cx"> void setDomainRelaxationForbiddenForURLScheme(const String&);
</span><span class="cx"> void setCanHandleHTTPSServerTrustEvaluation(bool);
</span><span class="cx"> void registerURLSchemeAsLocal(const String&);
</span><span class="lines">@@ -453,6 +454,7 @@
</span><span class="cx">
</span><span class="cx"> HashSet<String> m_schemesToRegisterAsEmptyDocument;
</span><span class="cx"> HashSet<String> m_schemesToRegisterAsSecure;
</span><ins>+ HashSet<String> m_schemesToRegisterAsBypassingContentSecurityPolicy;
</ins><span class="cx"> HashSet<String> m_schemesToSetDomainRelaxationForbiddenFor;
</span><span class="cx"> HashSet<String> m_schemesToRegisterAsLocal;
</span><span class="cx"> HashSet<String> m_schemesToRegisterAsNoAccess;
</span></span></pre></div>
<a id="trunkSourceWebKit2WebProcessWebProcesscpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/WebProcess.cpp (179869 => 179870)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/WebProcess.cpp 2015-02-10 15:47:51 UTC (rev 179869)
+++ trunk/Source/WebKit2/WebProcess/WebProcess.cpp 2015-02-10 16:01:30 UTC (rev 179870)
</span><span class="lines">@@ -313,6 +313,9 @@
</span><span class="cx"> for (size_t i = 0; i < parameters.urlSchemesRegisteredAsSecure.size(); ++i)
</span><span class="cx"> registerURLSchemeAsSecure(parameters.urlSchemesRegisteredAsSecure[i]);
</span><span class="cx">
</span><ins>+ for (size_t i = 0; i < parameters.urlSchemesRegisteredAsBypassingContentSecurityPolicy.size(); ++i)
+ registerURLSchemeAsBypassingContentSecurityPolicy(parameters.urlSchemesRegisteredAsBypassingContentSecurityPolicy[i]);
+
</ins><span class="cx"> for (size_t i = 0; i < parameters.urlSchemesForWhichDomainRelaxationIsForbidden.size(); ++i)
</span><span class="cx"> setDomainRelaxationForbiddenForURLScheme(parameters.urlSchemesForWhichDomainRelaxationIsForbidden[i]);
</span><span class="cx">
</span><span class="lines">@@ -415,6 +418,11 @@
</span><span class="cx"> SchemeRegistry::registerURLSchemeAsSecure(urlScheme);
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+void WebProcess::registerURLSchemeAsBypassingContentSecurityPolicy(const String& urlScheme) const
+{
+ SchemeRegistry::registerURLSchemeAsBypassingContentSecurityPolicy(urlScheme);
+}
+
</ins><span class="cx"> void WebProcess::setDomainRelaxationForbiddenForURLScheme(const String& urlScheme) const
</span><span class="cx"> {
</span><span class="cx"> SchemeRegistry::setDomainRelaxationForbiddenForURLScheme(true, urlScheme);
</span></span></pre></div>
<a id="trunkSourceWebKit2WebProcessWebProcessh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/WebProcess.h (179869 => 179870)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/WebProcess.h 2015-02-10 15:47:51 UTC (rev 179869)
+++ trunk/Source/WebKit2/WebProcess/WebProcess.h 2015-02-10 16:01:30 UTC (rev 179870)
</span><span class="lines">@@ -216,6 +216,7 @@
</span><span class="cx"> void platformTerminate();
</span><span class="cx"> void registerURLSchemeAsEmptyDocument(const String&);
</span><span class="cx"> void registerURLSchemeAsSecure(const String&) const;
</span><ins>+ void registerURLSchemeAsBypassingContentSecurityPolicy(const String&) const;
</ins><span class="cx"> void setDomainRelaxationForbiddenForURLScheme(const String&) const;
</span><span class="cx"> void registerURLSchemeAsLocal(const String&) const;
</span><span class="cx"> void registerURLSchemeAsNoAccess(const String&) const;
</span></span></pre></div>
<a id="trunkSourceWebKit2WebProcessWebProcessmessagesin"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/WebProcess.messages.in (179869 => 179870)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/WebProcess.messages.in 2015-02-10 15:47:51 UTC (rev 179869)
+++ trunk/Source/WebKit2/WebProcess/WebProcess.messages.in 2015-02-10 16:01:30 UTC (rev 179870)
</span><span class="lines">@@ -30,6 +30,7 @@
</span><span class="cx"> SetCacheModel(uint32_t cacheModel)
</span><span class="cx"> RegisterURLSchemeAsEmptyDocument(String scheme)
</span><span class="cx"> RegisterURLSchemeAsSecure(String scheme)
</span><ins>+ RegisterURLSchemeAsBypassingContentSecurityPolicy(String scheme)
</ins><span class="cx"> SetDomainRelaxationForbiddenForURLScheme(String scheme)
</span><span class="cx"> RegisterURLSchemeAsLocal(String scheme)
</span><span class="cx"> RegisterURLSchemeAsNoAccess(String scheme)
</span></span></pre>
</div>
</div>
</body>
</html>