<!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>[212443] 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/212443">212443</a></dd>
<dt>Author</dt> <dd>bfulgham@apple.com</dd>
<dt>Date</dt> <dd>2017-02-16 10:10:16 -0800 (Thu, 16 Feb 2017)</dd>
</dl>
<h3>Log Message</h3>
<pre>[WebRTC][Mac][WebKit2] Initial WebProcess does not support WebRTC
https://bugs.webkit.org/show_bug.cgi?id=168438
<rdar://problem/30401818>
Reviewed by Youenn Fablet.
The sandbox extension for microphone access does not take effect until the second WebProcess
is created, causing the initial browser tab to lack microphone support.
This patch checks the setting earlier in the boot process so that the initial WebProcess
instance gets the correct setting.
* UIProcess/Cocoa/WebProcessPoolCocoa.mm:
(WebKit::WebProcessPool::platformInitializeWebProcess): Move microphone sandbox extension here, so that the
initial WebProcess has the correct microphone access.
* UIProcess/WebProcessPool.cpp:
(WebKit::WebProcessPool::createNewWebProcess): Move microphone sandbox extension from here to platform-specific file.
(WebKit::WebProcessPool::createWebPage): Remove unneeded preference checks.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebKit2ChangeLog">trunk/Source/WebKit2/ChangeLog</a></li>
<li><a href="#trunkSourceWebKit2UIProcessCocoaWebProcessPoolCocoamm">trunk/Source/WebKit2/UIProcess/Cocoa/WebProcessPoolCocoa.mm</a></li>
<li><a href="#trunkSourceWebKit2UIProcessWebProcessPoolcpp">trunk/Source/WebKit2/UIProcess/WebProcessPool.cpp</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebKit2ChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/ChangeLog (212442 => 212443)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/ChangeLog 2017-02-16 18:07:28 UTC (rev 212442)
+++ trunk/Source/WebKit2/ChangeLog 2017-02-16 18:10:16 UTC (rev 212443)
</span><span class="lines">@@ -1,3 +1,24 @@
</span><ins>+2017-02-16 Brent Fulgham <bfulgham@apple.com>
+
+ [WebRTC][Mac][WebKit2] Initial WebProcess does not support WebRTC
+ https://bugs.webkit.org/show_bug.cgi?id=168438
+ <rdar://problem/30401818>
+
+ Reviewed by Youenn Fablet.
+
+ The sandbox extension for microphone access does not take effect until the second WebProcess
+ is created, causing the initial browser tab to lack microphone support.
+
+ This patch checks the setting earlier in the boot process so that the initial WebProcess
+ instance gets the correct setting.
+
+ * UIProcess/Cocoa/WebProcessPoolCocoa.mm:
+ (WebKit::WebProcessPool::platformInitializeWebProcess): Move microphone sandbox extension here, so that the
+ initial WebProcess has the correct microphone access.
+ * UIProcess/WebProcessPool.cpp:
+ (WebKit::WebProcessPool::createNewWebProcess): Move microphone sandbox extension from here to platform-specific file.
+ (WebKit::WebProcessPool::createWebPage): Remove unneeded preference checks.
+
</ins><span class="cx"> 2017-02-16 Eric Carlson <eric.carlson@apple.com>
</span><span class="cx">
</span><span class="cx"> Add WebRTC as an off-by-default experimental feature menu item.
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessCocoaWebProcessPoolCocoamm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/Cocoa/WebProcessPoolCocoa.mm (212442 => 212443)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/Cocoa/WebProcessPoolCocoa.mm 2017-02-16 18:07:28 UTC (rev 212442)
+++ trunk/Source/WebKit2/UIProcess/Cocoa/WebProcessPoolCocoa.mm 2017-02-16 18:10:16 UTC (rev 212443)
</span><span class="lines">@@ -245,6 +245,15 @@
</span><span class="cx"> ASSERT(parameters.uiProcessCookieStorageIdentifier.isEmpty());
</span><span class="cx"> parameters.uiProcessCookieStorageIdentifier.append(CFDataGetBytePtr(cookieStorageData.get()), CFDataGetLength(cookieStorageData.get()));
</span><span class="cx"> #endif
</span><ins>+#if ENABLE(MEDIA_STREAM)
+ bool webRTCEnabled = m_defaultPageGroup->preferences().peerConnectionEnabled();
+ if ([defaults objectForKey:@"ExperimentalPeerConnectionEnabled"])
+ webRTCEnabled = [defaults boolForKey:@"ExperimentalPeerConnectionEnabled"];
+
+ // FIXME: Remove this and related parameter when <rdar://problem/29448368> is fixed.
+ if (webRTCEnabled)
+ SandboxExtension::createHandleForGenericExtension("com.apple.webkit.microphone", parameters.audioCaptureExtensionHandle);
+#endif
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void WebProcessPool::platformInitializeNetworkProcess(NetworkProcessCreationParameters& parameters)
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessWebProcessPoolcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/WebProcessPool.cpp (212442 => 212443)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/WebProcessPool.cpp 2017-02-16 18:07:28 UTC (rev 212442)
+++ trunk/Source/WebKit2/UIProcess/WebProcessPool.cpp 2017-02-16 18:10:16 UTC (rev 212443)
</span><span class="lines">@@ -72,7 +72,6 @@
</span><span class="cx"> #include <WebCore/LinkHash.h>
</span><span class="cx"> #include <WebCore/LogInitialization.h>
</span><span class="cx"> #include <WebCore/ResourceRequest.h>
</span><del>-#include <WebCore/RuntimeEnabledFeatures.h>
</del><span class="cx"> #include <WebCore/SessionID.h>
</span><span class="cx"> #include <WebCore/URLParser.h>
</span><span class="cx"> #include <runtime/JSCInlines.h>
</span><span class="lines">@@ -574,12 +573,6 @@
</span><span class="cx"> if (!parameters.mediaKeyStorageDirectory.isEmpty())
</span><span class="cx"> SandboxExtension::createHandleWithoutResolvingPath(parameters.mediaKeyStorageDirectory, SandboxExtension::ReadWrite, parameters.mediaKeyStorageDirectoryExtensionHandle);
</span><span class="cx">
</span><del>-#if ENABLE(MEDIA_STREAM)
- // FIXME: Remove this and related parameter when <rdar://problem/29448368> is fixed.
- if (RuntimeEnabledFeatures::sharedFeatures().mediaStreamEnabled())
- SandboxExtension::createHandleForGenericExtension("com.apple.webkit.microphone", parameters.audioCaptureExtensionHandle);
-#endif
-
</del><span class="cx"> parameters.shouldUseTestingNetworkSession = m_shouldUseTestingNetworkSession;
</span><span class="cx">
</span><span class="cx"> parameters.cacheModel = cacheModel();
</span><span class="lines">@@ -798,12 +791,8 @@
</span><span class="cx"> } else if (pageConfiguration->relatedPage()) {
</span><span class="cx"> // Sharing processes, e.g. when creating the page via window.open().
</span><span class="cx"> process = &pageConfiguration->relatedPage()->process();
</span><del>- } else {
-#if ENABLE(MEDIA_STREAM)
- RuntimeEnabledFeatures::sharedFeatures().setMediaStreamEnabled(pageConfiguration->preferences()->store().getBoolValueForKey(WebPreferencesKey::mediaStreamEnabledKey()));
-#endif
</del><ins>+ } else
</ins><span class="cx"> process = &createNewWebProcessRespectingProcessCountLimit();
</span><del>- }
</del><span class="cx">
</span><span class="cx"> return process->createWebPage(pageClient, WTFMove(pageConfiguration));
</span><span class="cx"> }
</span></span></pre>
</div>
</div>
</body>
</html>