<!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>[207704] trunk/Source</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/207704">207704</a></dd>
<dt>Author</dt> <dd>eric.carlson@apple.com</dd>
<dt>Date</dt> <dd>2016-10-21 20:35:04 -0700 (Fri, 21 Oct 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>[MediaStream] Dynamically generate media capture sandbox extensions
https://bugs.webkit.org/show_bug.cgi?id=154861
<rdar://problem/24909411>
Reviewed by Tim Horton.
Source/WebCore:
No new tests, some of these changes are covered by existing tests and some can only be tested
with physical capture devices.
* platform/graphics/avfoundation/objc/MediaPlayerPrivateMediaSourceAVFObjC.mm: AVSampleBufferAudioRenderer
and AVSampleBufferRenderSynchronizer are now declared in AVFoundationSPI.h.
* platform/graphics/avfoundation/objc/MediaPlayerPrivateMediaStreamAVFObjC.h:
* platform/graphics/avfoundation/objc/MediaPlayerPrivateMediaStreamAVFObjC.mm:
(WebCore::MediaPlayerPrivateMediaStreamAVFObjC::MediaPlayerPrivateMediaStreamAVFObjC): Initialize
AVSampleBufferRenderSynchronizer.
(WebCore::MediaPlayerPrivateMediaStreamAVFObjC::isAvailable): Fail if AVSampleBufferRenderSynchronizer
isn't available.
(WebCore::MediaPlayerPrivateMediaStreamAVFObjC::enqueueAudioSampleBufferFromTrack): Take a MediaSample&
instead of a PlatformSample&.
(WebCore::MediaPlayerPrivateMediaStreamAVFObjC::enqueueVideoSampleBufferFromTrack): Ditto.
(WebCore::MediaPlayerPrivateMediaStreamAVFObjC::ensureLayer): Add the sample buffer display
later to the synchronizer.
(WebCore::MediaPlayerPrivateMediaStreamAVFObjC::destroyLayer): Remove the sample buffer display
later from the synchronizer.
(WebCore::MediaPlayerPrivateMediaStreamAVFObjC::play): Start the synchronizer.
(WebCore::MediaPlayerPrivateMediaStreamAVFObjC::pause): Stash the current clock time in
m_pausedTime, but leave the clock running. Pause the synchronizer.
(WebCore::MediaPlayerPrivateMediaStreamAVFObjC::currentMediaTime): Return the clock time
when playing, m_pausedTime time when paused because we leave the clock running forever.
(WebCore::MediaPlayerPrivateMediaStreamAVFObjC::sampleBufferUpdated):
* platform/graphics/avfoundation/objc/SourceBufferPrivateAVFObjC.mm: AVSampleBufferAudioRenderer
is now declared in AVFoundationSPI.h.
* platform/spi/mac/AVFoundationSPI.h: Add AVSampleBufferAudioRenderer and AVSampleBufferRenderSynchronizer.
Source/WebKit2:
* Shared/SandboxExtension.h:
(WebKit::SandboxExtension::createHandleForGenericExtension):
* Shared/mac/SandboxExtensionMac.mm:
(WebKit::wkSandboxExtensionType): Add case for generic handle.
(WebKit::SandboxExtension::createHandleForGenericExtension): New.
* UIProcess/UserMediaPermissionRequestManagerProxy.cpp:
(WebKit::UserMediaPermissionRequestManagerProxy::invalidateRequests): Clear the list of extensions granted.
(WebKit::UserMediaPermissionRequestManagerProxy::userMediaAccessWasGranted): Extend the web
process sandbox as necessary.
* UIProcess/UserMediaPermissionRequestManagerProxy.h:
* WebProcess/MediaStream/UserMediaPermissionRequestManager.cpp:
(WebKit::UserMediaPermissionRequestManager::~UserMediaPermissionRequestManager): Revoke all
sandbox extensions.
(WebKit::UserMediaPermissionRequestManager::grantUserMediaDevicesSandboxExtension): Consume
sandbox extensions.
* WebProcess/MediaStream/UserMediaPermissionRequestManager.h:
* WebProcess/WebPage/WebPage.cpp:
(WebKit::WebPage::grantUserMediaDevicesSandboxExtension): Pass-through to user media manager.
* WebProcess/WebPage/WebPage.h:
* WebProcess/WebPage/WebPage.messages.in: Add GrantUserMediaDevicesSandboxExtension.
* WebProcess/com.apple.WebProcess.sb.in: Add rules, defines, and a macro to allow dynamic extensions
for media capture devices.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicsavfoundationobjcMediaPlayerPrivateMediaSourceAVFObjCmm">trunk/Source/WebCore/platform/graphics/avfoundation/objc/MediaPlayerPrivateMediaSourceAVFObjC.mm</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicsavfoundationobjcMediaPlayerPrivateMediaStreamAVFObjCh">trunk/Source/WebCore/platform/graphics/avfoundation/objc/MediaPlayerPrivateMediaStreamAVFObjC.h</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicsavfoundationobjcMediaPlayerPrivateMediaStreamAVFObjCmm">trunk/Source/WebCore/platform/graphics/avfoundation/objc/MediaPlayerPrivateMediaStreamAVFObjC.mm</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicsavfoundationobjcSourceBufferPrivateAVFObjCmm">trunk/Source/WebCore/platform/graphics/avfoundation/objc/SourceBufferPrivateAVFObjC.mm</a></li>
<li><a href="#trunkSourceWebCoreplatformspimacAVFoundationSPIh">trunk/Source/WebCore/platform/spi/mac/AVFoundationSPI.h</a></li>
<li><a href="#trunkSourceWebKit2ChangeLog">trunk/Source/WebKit2/ChangeLog</a></li>
<li><a href="#trunkSourceWebKit2SharedSandboxExtensionh">trunk/Source/WebKit2/Shared/SandboxExtension.h</a></li>
<li><a href="#trunkSourceWebKit2SharedmacSandboxExtensionMacmm">trunk/Source/WebKit2/Shared/mac/SandboxExtensionMac.mm</a></li>
<li><a href="#trunkSourceWebKit2UIProcessUserMediaPermissionRequestManagerProxycpp">trunk/Source/WebKit2/UIProcess/UserMediaPermissionRequestManagerProxy.cpp</a></li>
<li><a href="#trunkSourceWebKit2UIProcessUserMediaPermissionRequestManagerProxyh">trunk/Source/WebKit2/UIProcess/UserMediaPermissionRequestManagerProxy.h</a></li>
<li><a href="#trunkSourceWebKit2WebProcessMediaStreamUserMediaPermissionRequestManagercpp">trunk/Source/WebKit2/WebProcess/MediaStream/UserMediaPermissionRequestManager.cpp</a></li>
<li><a href="#trunkSourceWebKit2WebProcessMediaStreamUserMediaPermissionRequestManagerh">trunk/Source/WebKit2/WebProcess/MediaStream/UserMediaPermissionRequestManager.h</a></li>
<li><a href="#trunkSourceWebKit2WebProcessWebPageWebPagecpp">trunk/Source/WebKit2/WebProcess/WebPage/WebPage.cpp</a></li>
<li><a href="#trunkSourceWebKit2WebProcessWebPageWebPageh">trunk/Source/WebKit2/WebProcess/WebPage/WebPage.h</a></li>
<li><a href="#trunkSourceWebKit2WebProcessWebPageWebPagemessagesin">trunk/Source/WebKit2/WebProcess/WebPage/WebPage.messages.in</a></li>
<li><a href="#trunkSourceWebKit2WebProcesscomappleWebProcesssbin">trunk/Source/WebKit2/WebProcess/com.apple.WebProcess.sb.in</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (207703 => 207704)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2016-10-22 02:47:18 UTC (rev 207703)
+++ trunk/Source/WebCore/ChangeLog 2016-10-22 03:35:04 UTC (rev 207704)
</span><span class="lines">@@ -1,3 +1,42 @@
</span><ins>+2016-10-21 Eric Carlson <eric.carlson@apple.com>
+
+ [MediaStream] Dynamically generate media capture sandbox extensions
+ https://bugs.webkit.org/show_bug.cgi?id=154861
+ <rdar://problem/24909411>
+
+ Reviewed by Tim Horton.
+
+ No new tests, some of these changes are covered by existing tests and some can only be tested
+ with physical capture devices.
+
+ * platform/graphics/avfoundation/objc/MediaPlayerPrivateMediaSourceAVFObjC.mm: AVSampleBufferAudioRenderer
+ and AVSampleBufferRenderSynchronizer are now declared in AVFoundationSPI.h.
+
+ * platform/graphics/avfoundation/objc/MediaPlayerPrivateMediaStreamAVFObjC.h:
+ * platform/graphics/avfoundation/objc/MediaPlayerPrivateMediaStreamAVFObjC.mm:
+ (WebCore::MediaPlayerPrivateMediaStreamAVFObjC::MediaPlayerPrivateMediaStreamAVFObjC): Initialize
+ AVSampleBufferRenderSynchronizer.
+ (WebCore::MediaPlayerPrivateMediaStreamAVFObjC::isAvailable): Fail if AVSampleBufferRenderSynchronizer
+ isn't available.
+ (WebCore::MediaPlayerPrivateMediaStreamAVFObjC::enqueueAudioSampleBufferFromTrack): Take a MediaSample&
+ instead of a PlatformSample&.
+ (WebCore::MediaPlayerPrivateMediaStreamAVFObjC::enqueueVideoSampleBufferFromTrack): Ditto.
+ (WebCore::MediaPlayerPrivateMediaStreamAVFObjC::ensureLayer): Add the sample buffer display
+ later to the synchronizer.
+ (WebCore::MediaPlayerPrivateMediaStreamAVFObjC::destroyLayer): Remove the sample buffer display
+ later from the synchronizer.
+ (WebCore::MediaPlayerPrivateMediaStreamAVFObjC::play): Start the synchronizer.
+ (WebCore::MediaPlayerPrivateMediaStreamAVFObjC::pause): Stash the current clock time in
+ m_pausedTime, but leave the clock running. Pause the synchronizer.
+ (WebCore::MediaPlayerPrivateMediaStreamAVFObjC::currentMediaTime): Return the clock time
+ when playing, m_pausedTime time when paused because we leave the clock running forever.
+ (WebCore::MediaPlayerPrivateMediaStreamAVFObjC::sampleBufferUpdated):
+
+ * platform/graphics/avfoundation/objc/SourceBufferPrivateAVFObjC.mm: AVSampleBufferAudioRenderer
+ is now declared in AVFoundationSPI.h.
+
+ * platform/spi/mac/AVFoundationSPI.h: Add AVSampleBufferAudioRenderer and AVSampleBufferRenderSynchronizer.
+
</ins><span class="cx"> 2016-10-21 Commit Queue <commit-queue@webkit.org>
</span><span class="cx">
</span><span class="cx"> Unreviewed, rolling out r207582.
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicsavfoundationobjcMediaPlayerPrivateMediaSourceAVFObjCmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/avfoundation/objc/MediaPlayerPrivateMediaSourceAVFObjC.mm (207703 => 207704)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/avfoundation/objc/MediaPlayerPrivateMediaSourceAVFObjC.mm 2016-10-22 02:47:18 UTC (rev 207703)
+++ trunk/Source/WebCore/platform/graphics/avfoundation/objc/MediaPlayerPrivateMediaSourceAVFObjC.mm 2016-10-22 03:35:04 UTC (rev 207704)
</span><span class="lines">@@ -93,31 +93,6 @@
</span><span class="cx"> @end
</span><span class="cx">
</span><span class="cx"> #pragma mark -
</span><del>-#pragma mark AVSampleBufferAudioRenderer
-
-@interface AVSampleBufferAudioRenderer : NSObject
-- (void)setVolume:(float)volume;
-- (void)setMuted:(BOOL)muted;
-@property (nonatomic, copy) NSString *audioTimePitchAlgorithm;
-@end
-
-#pragma mark -
-#pragma mark AVSampleBufferRenderSynchronizer
-
-@interface AVSampleBufferRenderSynchronizer : NSObject
-- (CMTimebaseRef)timebase;
-- (float)rate;
-- (void)setRate:(float)rate;
-- (void)setRate:(float)rate time:(CMTime)time;
-- (NSArray *)renderers;
-- (void)addRenderer:(id)renderer;
-- (void)removeRenderer:(id)renderer atTime:(CMTime)time withCompletionHandler:(void (^)(BOOL didRemoveRenderer))completionHandler;
-- (id)addPeriodicTimeObserverForInterval:(CMTime)interval queue:(dispatch_queue_t)queue usingBlock:(void (^)(CMTime time))block;
-- (id)addBoundaryTimeObserverForTimes:(NSArray *)times queue:(dispatch_queue_t)queue usingBlock:(void (^)(void))block;
-- (void)removeTimeObserver:(id)observer;
-@end
-
-#pragma mark -
</del><span class="cx"> #pragma mark AVStreamSession
</span><span class="cx">
</span><span class="cx"> @interface AVStreamSession : NSObject
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicsavfoundationobjcMediaPlayerPrivateMediaStreamAVFObjCh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/avfoundation/objc/MediaPlayerPrivateMediaStreamAVFObjC.h (207703 => 207704)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/avfoundation/objc/MediaPlayerPrivateMediaStreamAVFObjC.h 2016-10-22 02:47:18 UTC (rev 207703)
+++ trunk/Source/WebCore/platform/graphics/avfoundation/objc/MediaPlayerPrivateMediaStreamAVFObjC.h 2016-10-22 03:35:04 UTC (rev 207704)
</span><span class="lines">@@ -37,6 +37,7 @@
</span><span class="cx">
</span><span class="cx"> OBJC_CLASS AVSampleBufferAudioRenderer;
</span><span class="cx"> OBJC_CLASS AVSampleBufferDisplayLayer;
</span><ins>+OBJC_CLASS AVSampleBufferRenderSynchronizer;
</ins><span class="cx"> OBJC_CLASS AVStreamSession;
</span><span class="cx"> typedef struct opaqueCMSampleBuffer *CMSampleBufferRef;
</span><span class="cx">
</span><span class="lines">@@ -121,8 +122,8 @@
</span><span class="cx">
</span><span class="cx"> void setSize(const IntSize&) override { /* No-op */ }
</span><span class="cx">
</span><del>- void enqueueAudioSampleBufferFromTrack(MediaStreamTrackPrivate&, PlatformSample);
- void enqueueVideoSampleBufferFromTrack(MediaStreamTrackPrivate&, PlatformSample);
</del><ins>+ void enqueueAudioSampleBufferFromTrack(MediaStreamTrackPrivate&, MediaSample&);
+ void enqueueVideoSampleBufferFromTrack(MediaStreamTrackPrivate&, MediaSample&);
</ins><span class="cx"> bool shouldEnqueueVideoSampleBuffer() const;
</span><span class="cx"> void flushAndRemoveVideoSampleBuffers();
</span><span class="cx">
</span><span class="lines">@@ -186,7 +187,9 @@
</span><span class="cx"> WeakPtrFactory<MediaPlayerPrivateMediaStreamAVFObjC> m_weakPtrFactory;
</span><span class="cx"> RefPtr<MediaStreamPrivate> m_mediaStreamPrivate;
</span><span class="cx"> RetainPtr<AVSampleBufferDisplayLayer> m_sampleBufferDisplayLayer;
</span><ins>+ RetainPtr<AVSampleBufferRenderSynchronizer> m_synchronizer;
</ins><span class="cx"> RetainPtr<CGImageRef> m_pausedImage;
</span><ins>+ double m_pausedTime { 0 };
</ins><span class="cx"> std::unique_ptr<Clock> m_clock;
</span><span class="cx">
</span><span class="cx"> HashMap<String, RefPtr<AudioTrackPrivateMediaStream>> m_audioTrackMap;
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicsavfoundationobjcMediaPlayerPrivateMediaStreamAVFObjCmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/avfoundation/objc/MediaPlayerPrivateMediaStreamAVFObjC.mm (207703 => 207704)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/avfoundation/objc/MediaPlayerPrivateMediaStreamAVFObjC.mm 2016-10-22 02:47:18 UTC (rev 207703)
+++ trunk/Source/WebCore/platform/graphics/avfoundation/objc/MediaPlayerPrivateMediaStreamAVFObjC.mm 2016-10-22 03:35:04 UTC (rev 207704)
</span><span class="lines">@@ -29,6 +29,7 @@
</span><span class="cx"> #if ENABLE(MEDIA_STREAM) && USE(AVFOUNDATION)
</span><span class="cx">
</span><span class="cx"> #import "AVAudioCaptureSource.h"
</span><ins>+#import "AVFoundationSPI.h"
</ins><span class="cx"> #import "AVVideoCaptureSource.h"
</span><span class="cx"> #import "AudioTrackPrivateMediaStream.h"
</span><span class="cx"> #import "Clock.h"
</span><span class="lines">@@ -35,6 +36,7 @@
</span><span class="cx"> #import "GraphicsContext.h"
</span><span class="cx"> #import "Logging.h"
</span><span class="cx"> #import "MediaStreamPrivate.h"
</span><ins>+#import "MediaTimeAVFoundation.h"
</ins><span class="cx"> #import "VideoTrackPrivateMediaStream.h"
</span><span class="cx"> #import <AVFoundation/AVSampleBufferDisplayLayer.h>
</span><span class="cx"> #import <QuartzCore/CALayer.h>
</span><span class="lines">@@ -54,6 +56,7 @@
</span><span class="cx"> SOFT_LINK_FRAMEWORK_OPTIONAL(AVFoundation)
</span><span class="cx">
</span><span class="cx"> SOFT_LINK_CLASS_OPTIONAL(AVFoundation, AVSampleBufferDisplayLayer)
</span><ins>+SOFT_LINK_CLASS_OPTIONAL(AVFoundation, AVSampleBufferRenderSynchronizer)
</ins><span class="cx">
</span><span class="cx"> namespace WebCore {
</span><span class="cx">
</span><span class="lines">@@ -63,6 +66,7 @@
</span><span class="cx"> MediaPlayerPrivateMediaStreamAVFObjC::MediaPlayerPrivateMediaStreamAVFObjC(MediaPlayer* player)
</span><span class="cx"> : m_player(player)
</span><span class="cx"> , m_weakPtrFactory(this)
</span><ins>+ , m_synchronizer(adoptNS([allocAVSampleBufferRenderSynchronizerInstance() init]))
</ins><span class="cx"> , m_clock(Clock::create())
</span><span class="cx"> #if PLATFORM(MAC) && ENABLE(VIDEO_PRESENTATION_MODE)
</span><span class="cx"> , m_videoFullscreenLayerManager(VideoFullscreenLayerManager::create())
</span><span class="lines">@@ -99,7 +103,7 @@
</span><span class="cx">
</span><span class="cx"> bool MediaPlayerPrivateMediaStreamAVFObjC::isAvailable()
</span><span class="cx"> {
</span><del>- return AVFoundationLibrary() && isCoreMediaFrameworkAvailable() && getAVSampleBufferDisplayLayerClass();
</del><ins>+ return AVFoundationLibrary() && isCoreMediaFrameworkAvailable() && getAVSampleBufferDisplayLayerClass() && getAVSampleBufferRenderSynchronizerClass();
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void MediaPlayerPrivateMediaStreamAVFObjC::getSupportedTypes(HashSet<String, ASCIICaseInsensitiveHash>& types)
</span><span class="lines">@@ -119,26 +123,24 @@
</span><span class="cx"> #pragma mark -
</span><span class="cx"> #pragma mark AVSampleBuffer Methods
</span><span class="cx">
</span><del>-void MediaPlayerPrivateMediaStreamAVFObjC::enqueueAudioSampleBufferFromTrack(MediaStreamTrackPrivate&, PlatformSample)
</del><ins>+void MediaPlayerPrivateMediaStreamAVFObjC::enqueueAudioSampleBufferFromTrack(MediaStreamTrackPrivate&, MediaSample&)
</ins><span class="cx"> {
</span><span class="cx"> // FIXME: https://bugs.webkit.org/show_bug.cgi?id=159836
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void MediaPlayerPrivateMediaStreamAVFObjC::enqueueVideoSampleBufferFromTrack(MediaStreamTrackPrivate& track, PlatformSample platformSample)
</del><ins>+void MediaPlayerPrivateMediaStreamAVFObjC::enqueueVideoSampleBufferFromTrack(MediaStreamTrackPrivate& track, MediaSample& sample)
</ins><span class="cx"> {
</span><del>- if (&track != m_mediaStreamPrivate->activeVideoTrack())
</del><ins>+ if (&track != m_mediaStreamPrivate->activeVideoTrack() || !shouldEnqueueVideoSampleBuffer())
</ins><span class="cx"> return;
</span><span class="cx">
</span><del>- if (shouldEnqueueVideoSampleBuffer()) {
- [m_sampleBufferDisplayLayer enqueueSampleBuffer:platformSample.sample.cmSampleBuffer];
- m_isFrameDisplayed = true;
-
- if (!m_hasEverEnqueuedVideoFrame) {
- m_hasEverEnqueuedVideoFrame = true;
- m_player->firstVideoFrameAvailable();
</del><ins>+ sample.setTimestamps(toMediaTime(CMTimebaseGetTime([m_synchronizer timebase])), MediaTime::invalidTime());
+ [m_sampleBufferDisplayLayer enqueueSampleBuffer:sample.platformSample().sample.cmSampleBuffer];
+ m_isFrameDisplayed = true;
</ins><span class="cx">
</span><del>- updatePausedImage();
- }
</del><ins>+ if (!m_hasEverEnqueuedVideoFrame) {
+ m_hasEverEnqueuedVideoFrame = true;
+ m_player->firstVideoFrameAvailable();
+ updatePausedImage();
</ins><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -172,7 +174,9 @@
</span><span class="cx"> [m_sampleBufferDisplayLayer setName:@"MediaPlayerPrivateMediaStreamAVFObjC AVSampleBufferDisplayLayer"];
</span><span class="cx"> #endif
</span><span class="cx"> m_sampleBufferDisplayLayer.get().backgroundColor = cachedCGColor(Color::black);
</span><del>-
</del><ins>+
+ [m_synchronizer addRenderer:m_sampleBufferDisplayLayer.get()];
+
</ins><span class="cx"> renderingModeChanged();
</span><span class="cx">
</span><span class="cx"> #if PLATFORM(MAC) && ENABLE(VIDEO_PRESENTATION_MODE)
</span><span class="lines">@@ -186,7 +190,12 @@
</span><span class="cx"> return;
</span><span class="cx">
</span><span class="cx"> [m_sampleBufferDisplayLayer flush];
</span><ins>+ CMTime currentTime = CMTimebaseGetTime([m_synchronizer timebase]);
+ [m_synchronizer removeRenderer:m_sampleBufferDisplayLayer.get() atTime:currentTime withCompletionHandler:^(BOOL){
+ // No-op.
+ }];
</ins><span class="cx"> m_sampleBufferDisplayLayer = nullptr;
</span><ins>+
</ins><span class="cx"> renderingModeChanged();
</span><span class="cx">
</span><span class="cx"> #if PLATFORM(MAC) && ENABLE(VIDEO_PRESENTATION_MODE)
</span><span class="lines">@@ -310,6 +319,7 @@
</span><span class="cx">
</span><span class="cx"> m_clock->start();
</span><span class="cx"> m_playing = true;
</span><ins>+ [m_synchronizer setRate:1];
</ins><span class="cx"> m_haveEverPlayed = true;
</span><span class="cx"> scheduleDeferredTask([this] {
</span><span class="cx"> updateDisplayMode();
</span><span class="lines">@@ -324,8 +334,9 @@
</span><span class="cx"> if (!metaDataAvailable() || !m_playing || m_ended)
</span><span class="cx"> return;
</span><span class="cx">
</span><del>- m_clock->stop();
</del><ins>+ m_pausedTime = m_clock->currentTime();
</ins><span class="cx"> m_playing = false;
</span><ins>+ [m_synchronizer setRate:0];
</ins><span class="cx"> updateDisplayMode();
</span><span class="cx"> updatePausedImage();
</span><span class="cx"> }
</span><span class="lines">@@ -386,7 +397,7 @@
</span><span class="cx">
</span><span class="cx"> MediaTime MediaPlayerPrivateMediaStreamAVFObjC::currentMediaTime() const
</span><span class="cx"> {
</span><del>- return MediaTime::createWithDouble(m_clock->currentTime());
</del><ins>+ return MediaTime::createWithDouble(m_playing ? m_clock->currentTime() : m_pausedTime);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> MediaPlayer::NetworkState MediaPlayerPrivateMediaStreamAVFObjC::networkState() const
</span><span class="lines">@@ -514,7 +525,7 @@
</span><span class="cx"> // FIXME: https://bugs.webkit.org/show_bug.cgi?id=159836
</span><span class="cx"> break;
</span><span class="cx"> case RealtimeMediaSource::Video:
</span><del>- enqueueVideoSampleBufferFromTrack(track, mediaSample.platformSample());
</del><ins>+ enqueueVideoSampleBufferFromTrack(track, mediaSample);
</ins><span class="cx"> m_hasReceivedMedia = true;
</span><span class="cx"> scheduleDeferredTask([this] {
</span><span class="cx"> updateReadyState();
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicsavfoundationobjcSourceBufferPrivateAVFObjCmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/avfoundation/objc/SourceBufferPrivateAVFObjC.mm (207703 => 207704)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/avfoundation/objc/SourceBufferPrivateAVFObjC.mm 2016-10-22 02:47:18 UTC (rev 207703)
+++ trunk/Source/WebCore/platform/graphics/avfoundation/objc/SourceBufferPrivateAVFObjC.mm 2016-10-22 03:35:04 UTC (rev 207704)
</span><span class="lines">@@ -112,19 +112,6 @@
</span><span class="cx"> @end
</span><span class="cx">
</span><span class="cx"> #pragma mark -
</span><del>-#pragma mark AVSampleBufferAudioRenderer
-
-@interface AVSampleBufferAudioRenderer : NSObject
-- (NSInteger)status;
-- (NSError*)error;
-- (void)enqueueSampleBuffer:(CMSampleBufferRef)sampleBuffer;
-- (void)flush;
-- (BOOL)isReadyForMoreMediaData;
-- (void)requestMediaDataWhenReadyOnQueue:(dispatch_queue_t)queue usingBlock:(void (^)(void))block;
-- (void)stopRequestingMediaData;
-@end
-
-#pragma mark -
</del><span class="cx"> #pragma mark WebAVStreamDataParserListener
</span><span class="cx">
</span><span class="cx"> @interface WebAVStreamDataParserListener : NSObject<AVStreamDataParserOutputHandling> {
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformspimacAVFoundationSPIh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/spi/mac/AVFoundationSPI.h (207703 => 207704)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/spi/mac/AVFoundationSPI.h 2016-10-22 02:47:18 UTC (rev 207703)
+++ trunk/Source/WebCore/platform/spi/mac/AVFoundationSPI.h 2016-10-22 03:35:04 UTC (rev 207704)
</span><span class="lines">@@ -162,3 +162,40 @@
</span><span class="cx"> @end
</span><span class="cx">
</span><span class="cx"> NS_ASSUME_NONNULL_END
</span><ins>+
+#import <CoreMedia/CMSampleBuffer.h>
+#import <CoreMedia/CMSync.h>
+
+NS_ASSUME_NONNULL_BEGIN
+
+@interface AVSampleBufferRenderSynchronizer : NSObject
+- (CMTimebaseRef)timebase;
+- (float)rate;
+- (void)setRate:(float)rate;
+- (void)setRate:(float)rate time:(CMTime)time;
+- (NSArray *)renderers;
+- (void)addRenderer:(id)renderer;
+- (void)removeRenderer:(id)renderer atTime:(CMTime)time withCompletionHandler:(void (^)(BOOL didRemoveRenderer))completionHandler;
+- (id)addPeriodicTimeObserverForInterval:(CMTime)interval queue:(dispatch_queue_t)queue usingBlock:(void (^)(CMTime time))block;
+- (id)addBoundaryTimeObserverForTimes:(NSArray *)times queue:(dispatch_queue_t)queue usingBlock:(void (^)(void))block;
+- (void)removeTimeObserver:(id)observer;
+@end
+
+NS_ASSUME_NONNULL_END
+
+NS_ASSUME_NONNULL_BEGIN
+
+@interface AVSampleBufferAudioRenderer : NSObject
+- (NSInteger)status;
+- (NSError*)error;
+- (void)enqueueSampleBuffer:(CMSampleBufferRef)sampleBuffer;
+- (void)flush;
+- (BOOL)isReadyForMoreMediaData;
+- (void)requestMediaDataWhenReadyOnQueue:(dispatch_queue_t)queue usingBlock:(void (^)(void))block;
+- (void)stopRequestingMediaData;
+- (void)setVolume:(float)volume;
+- (void)setMuted:(BOOL)muted;
+@property (nonatomic, copy) NSString *audioTimePitchAlgorithm;
+@end
+
+NS_ASSUME_NONNULL_END
</ins></span></pre></div>
<a id="trunkSourceWebKit2ChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/ChangeLog (207703 => 207704)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/ChangeLog 2016-10-22 02:47:18 UTC (rev 207703)
+++ trunk/Source/WebKit2/ChangeLog 2016-10-22 03:35:04 UTC (rev 207704)
</span><span class="lines">@@ -1,3 +1,39 @@
</span><ins>+2016-10-21 Eric Carlson <eric.carlson@apple.com>
+
+ [MediaStream] Dynamically generate media capture sandbox extensions
+ https://bugs.webkit.org/show_bug.cgi?id=154861
+ <rdar://problem/24909411>
+
+ Reviewed by Tim Horton.
+
+ * Shared/SandboxExtension.h:
+ (WebKit::SandboxExtension::createHandleForGenericExtension):
+ * Shared/mac/SandboxExtensionMac.mm:
+ (WebKit::wkSandboxExtensionType): Add case for generic handle.
+ (WebKit::SandboxExtension::createHandleForGenericExtension): New.
+
+ * UIProcess/UserMediaPermissionRequestManagerProxy.cpp:
+ (WebKit::UserMediaPermissionRequestManagerProxy::invalidateRequests): Clear the list of extensions granted.
+ (WebKit::UserMediaPermissionRequestManagerProxy::userMediaAccessWasGranted): Extend the web
+ process sandbox as necessary.
+ * UIProcess/UserMediaPermissionRequestManagerProxy.h:
+
+ * WebProcess/MediaStream/UserMediaPermissionRequestManager.cpp:
+ (WebKit::UserMediaPermissionRequestManager::~UserMediaPermissionRequestManager): Revoke all
+ sandbox extensions.
+ (WebKit::UserMediaPermissionRequestManager::grantUserMediaDevicesSandboxExtension): Consume
+ sandbox extensions.
+ * WebProcess/MediaStream/UserMediaPermissionRequestManager.h:
+
+ * WebProcess/WebPage/WebPage.cpp:
+ (WebKit::WebPage::grantUserMediaDevicesSandboxExtension): Pass-through to user media manager.
+ * WebProcess/WebPage/WebPage.h:
+
+ * WebProcess/WebPage/WebPage.messages.in: Add GrantUserMediaDevicesSandboxExtension.
+
+ * WebProcess/com.apple.WebProcess.sb.in: Add rules, defines, and a macro to allow dynamic extensions
+ for media capture devices.
+
</ins><span class="cx"> 2016-10-21 Gavin Barraclough <barraclough@apple.com>
</span><span class="cx">
</span><span class="cx"> WebPage should take UserActivity directly for user input
</span></span></pre></div>
<a id="trunkSourceWebKit2SharedSandboxExtensionh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/Shared/SandboxExtension.h (207703 => 207704)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/Shared/SandboxExtension.h 2016-10-22 02:47:18 UTC (rev 207703)
+++ trunk/Source/WebKit2/Shared/SandboxExtension.h 2016-10-22 03:35:04 UTC (rev 207704)
</span><span class="lines">@@ -47,7 +47,8 @@
</span><span class="cx"> public:
</span><span class="cx"> enum Type {
</span><span class="cx"> ReadOnly,
</span><del>- ReadWrite
</del><ins>+ ReadWrite,
+ Generic,
</ins><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> class Handle {
</span><span class="lines">@@ -93,6 +94,7 @@
</span><span class="cx"> static bool createHandle(const String& path, Type type, Handle&);
</span><span class="cx"> static bool createHandleForReadWriteDirectory(const String& path, Handle&); // Will attempt to create the directory.
</span><span class="cx"> static String createHandleForTemporaryFile(const String& prefix, Type type, Handle&);
</span><ins>+ static bool createHandleForGenericExtension(const String& extensionClass, Handle&);
</ins><span class="cx"> ~SandboxExtension();
</span><span class="cx">
</span><span class="cx"> bool consume();
</span><span class="lines">@@ -127,6 +129,7 @@
</span><span class="cx"> inline bool SandboxExtension::createHandle(const String&, Type, Handle&) { return true; }
</span><span class="cx"> inline bool SandboxExtension::createHandleForReadWriteDirectory(const String&, Handle&) { return true; }
</span><span class="cx"> inline String SandboxExtension::createHandleForTemporaryFile(const String& /*prefix*/, Type, Handle&) {return String();}
</span><ins>+inline bool SandboxExtension::createHandleForGenericExtension(const String& /*extensionClass*/, Handle&) { return true; }
</ins><span class="cx"> inline SandboxExtension::~SandboxExtension() { }
</span><span class="cx"> inline bool SandboxExtension::revoke() { return true; }
</span><span class="cx"> inline bool SandboxExtension::consume() { return true; }
</span></span></pre></div>
<a id="trunkSourceWebKit2SharedmacSandboxExtensionMacmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/Shared/mac/SandboxExtensionMac.mm (207703 => 207704)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/Shared/mac/SandboxExtensionMac.mm 2016-10-22 02:47:18 UTC (rev 207703)
+++ trunk/Source/WebKit2/Shared/mac/SandboxExtensionMac.mm 2016-10-22 03:35:04 UTC (rev 207704)
</span><span class="lines">@@ -159,6 +159,9 @@
</span><span class="cx"> return WKSandboxExtensionTypeReadOnly;
</span><span class="cx"> case SandboxExtension::ReadWrite:
</span><span class="cx"> return WKSandboxExtensionTypeReadWrite;
</span><ins>+ case SandboxExtension::Generic:
+ return WKSandboxExtensionTypeGeneric;
+
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> CRASH();
</span><span class="lines">@@ -274,6 +277,19 @@
</span><span class="cx"> return String(path.data());
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+bool SandboxExtension::createHandleForGenericExtension(const String& extensionClass, Handle& handle)
+{
+ ASSERT(!handle.m_sandboxExtension);
+
+ handle.m_sandboxExtension = WKSandboxExtensionCreate(extensionClass.utf8().data(), wkSandboxExtensionType(Type::Generic));
+ if (!handle.m_sandboxExtension) {
+ WTFLogAlways("Could not create a '%s' sandbox extension", extensionClass.utf8().data());
+ return false;
+ }
+
+ return true;
+}
+
</ins><span class="cx"> SandboxExtension::SandboxExtension(const Handle& handle)
</span><span class="cx"> : m_sandboxExtension(handle.m_sandboxExtension)
</span><span class="cx"> , m_useCount(0)
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessUserMediaPermissionRequestManagerProxycpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/UserMediaPermissionRequestManagerProxy.cpp (207703 => 207704)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/UserMediaPermissionRequestManagerProxy.cpp 2016-10-22 02:47:18 UTC (rev 207703)
+++ trunk/Source/WebKit2/UIProcess/UserMediaPermissionRequestManagerProxy.cpp 2016-10-22 03:35:04 UTC (rev 207704)
</span><span class="lines">@@ -47,6 +47,8 @@
</span><span class="cx"> for (auto& request : m_pendingDeviceRequests.values())
</span><span class="cx"> request->invalidate();
</span><span class="cx"> m_pendingDeviceRequests.clear();
</span><ins>+
+ m_pageSandboxExtensionsGranted.clear();
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> Ref<UserMediaPermissionRequestProxy> UserMediaPermissionRequestManagerProxy::createRequest(uint64_t userMediaID, const Vector<String>& audioDeviceUIDs, const Vector<String>& videoDeviceUIDs)
</span><span class="lines">@@ -120,6 +122,8 @@
</span><span class="cx">
</span><span class="cx"> void UserMediaPermissionRequestManagerProxy::userMediaAccessWasGranted(uint64_t userMediaID, const String& audioDeviceUID, const String& videoDeviceUID)
</span><span class="cx"> {
</span><ins>+ ASSERT(!audioDeviceUID.isEmpty() || !videoDeviceUID.isEmpty());
+
</ins><span class="cx"> if (!m_page.isValid())
</span><span class="cx"> return;
</span><span class="cx">
</span><span class="lines">@@ -127,6 +131,30 @@
</span><span class="cx"> return;
</span><span class="cx">
</span><span class="cx"> #if ENABLE(MEDIA_STREAM)
</span><ins>+ size_t extensionCount = 0;
+ unsigned requiredExtensions = SandboxExtensionsGranted::None;
+ if (!audioDeviceUID.isEmpty()) {
+ requiredExtensions |= SandboxExtensionsGranted::Audio;
+ extensionCount++;
+ }
+ if (!videoDeviceUID.isEmpty()) {
+ requiredExtensions |= SandboxExtensionsGranted::Video;
+ extensionCount++;
+ }
+
+ unsigned currentExtensions = m_pageSandboxExtensionsGranted.get(m_page.pageID());
+ if (!(requiredExtensions & currentExtensions)) {
+ ASSERT(extensionCount);
+ m_pageSandboxExtensionsGranted.set(m_page.pageID(), requiredExtensions | currentExtensions);
+ SandboxExtension::HandleArray handles;
+ handles.allocate(extensionCount);
+ if (!videoDeviceUID.isEmpty())
+ SandboxExtension::createHandleForGenericExtension("com.apple.webkit.camera", handles[--extensionCount]);
+ if (!audioDeviceUID.isEmpty())
+ SandboxExtension::createHandleForGenericExtension("com.apple.webkit.microphone", handles[--extensionCount]);
+ m_page.process().send(Messages::WebPage::GrantUserMediaDevicesSandboxExtension(handles), m_page.pageID());
+ }
+
</ins><span class="cx"> m_page.process().send(Messages::WebPage::UserMediaAccessWasGranted(userMediaID, audioDeviceUID, videoDeviceUID), m_page.pageID());
</span><span class="cx"> #else
</span><span class="cx"> UNUSED_PARAM(audioDeviceUID);
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessUserMediaPermissionRequestManagerProxyh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/UserMediaPermissionRequestManagerProxy.h (207703 => 207704)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/UserMediaPermissionRequestManagerProxy.h 2016-10-22 02:47:18 UTC (rev 207703)
+++ trunk/Source/WebKit2/UIProcess/UserMediaPermissionRequestManagerProxy.h 2016-10-22 03:35:04 UTC (rev 207704)
</span><span class="lines">@@ -59,6 +59,13 @@
</span><span class="cx"> HashMap<uint64_t, RefPtr<UserMediaPermissionRequestProxy>> m_pendingUserMediaRequests;
</span><span class="cx"> HashMap<uint64_t, RefPtr<UserMediaPermissionCheckProxy>> m_pendingDeviceRequests;
</span><span class="cx">
</span><ins>+ enum SandboxExtensionsGranted {
+ None = 0,
+ Video = 1 << 0,
+ Audio = 1 << 1
+ };
+ HashMap<uint64_t, unsigned> m_pageSandboxExtensionsGranted;
+
</ins><span class="cx"> WebPageProxy& m_page;
</span><span class="cx"> };
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebKit2WebProcessMediaStreamUserMediaPermissionRequestManagercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/MediaStream/UserMediaPermissionRequestManager.cpp (207703 => 207704)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/MediaStream/UserMediaPermissionRequestManager.cpp 2016-10-22 02:47:18 UTC (rev 207703)
+++ trunk/Source/WebKit2/WebProcess/MediaStream/UserMediaPermissionRequestManager.cpp 2016-10-22 03:35:04 UTC (rev 207704)
</span><span class="lines">@@ -50,6 +50,8 @@
</span><span class="cx">
</span><span class="cx"> UserMediaPermissionRequestManager::~UserMediaPermissionRequestManager()
</span><span class="cx"> {
</span><ins>+ for (auto& sandboxExtension : m_userMediaDeviceSandboxExtensions)
+ sandboxExtension->revoke();
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void UserMediaPermissionRequestManager::startUserMediaRequest(UserMediaRequest& request)
</span><span class="lines">@@ -142,6 +144,18 @@
</span><span class="cx"> request->setDeviceInfo(deviceList, mediaDeviceIdentifierHashSalt, hasPersistentAccess);
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+void UserMediaPermissionRequestManager::grantUserMediaDevicesSandboxExtension(const SandboxExtension::HandleArray& sandboxExtensionHandles)
+{
+ ASSERT(m_userMediaDeviceSandboxExtensions.size() <= 2);
+
+ for (size_t i = 0; i < sandboxExtensionHandles.size(); i++) {
+ if (RefPtr<SandboxExtension> extension = SandboxExtension::create(sandboxExtensionHandles[i])) {
+ extension->consume();
+ m_userMediaDeviceSandboxExtensions.append(extension.release());
+ }
+ }
+}
+
</ins><span class="cx"> } // namespace WebKit
</span><span class="cx">
</span><span class="cx"> #endif // ENABLE(MEDIA_STREAM)
</span></span></pre></div>
<a id="trunkSourceWebKit2WebProcessMediaStreamUserMediaPermissionRequestManagerh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/MediaStream/UserMediaPermissionRequestManager.h (207703 => 207704)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/MediaStream/UserMediaPermissionRequestManager.h 2016-10-22 02:47:18 UTC (rev 207703)
+++ trunk/Source/WebKit2/WebProcess/MediaStream/UserMediaPermissionRequestManager.h 2016-10-22 03:35:04 UTC (rev 207704)
</span><span class="lines">@@ -22,6 +22,7 @@
</span><span class="cx">
</span><span class="cx"> #if ENABLE(MEDIA_STREAM)
</span><span class="cx">
</span><ins>+#include "SandboxExtension.h"
</ins><span class="cx"> #include <WebCore/MediaConstraints.h>
</span><span class="cx"> #include <WebCore/MediaDevicesEnumerationRequest.h>
</span><span class="cx"> #include <WebCore/UserMediaClient.h>
</span><span class="lines">@@ -48,6 +49,8 @@
</span><span class="cx"> void cancelMediaDevicesEnumeration(WebCore::MediaDevicesEnumerationRequest&);
</span><span class="cx"> void didCompleteMediaDeviceEnumeration(uint64_t, const Vector<WebCore::CaptureDevice>& deviceList, const String& deviceIdentifierHashSalt, bool originHasPersistentAccess);
</span><span class="cx">
</span><ins>+ void grantUserMediaDevicesSandboxExtension(const SandboxExtension::HandleArray&);
+
</ins><span class="cx"> private:
</span><span class="cx"> WebPage& m_page;
</span><span class="cx">
</span><span class="lines">@@ -56,6 +59,8 @@
</span><span class="cx">
</span><span class="cx"> HashMap<uint64_t, RefPtr<WebCore::MediaDevicesEnumerationRequest>> m_idToMediaDevicesEnumerationRequestMap;
</span><span class="cx"> HashMap<RefPtr<WebCore::MediaDevicesEnumerationRequest>, uint64_t> m_mediaDevicesEnumerationRequestToIDMap;
</span><ins>+
+ Vector<RefPtr<SandboxExtension>> m_userMediaDeviceSandboxExtensions;
</ins><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> } // namespace WebKit
</span></span></pre></div>
<a id="trunkSourceWebKit2WebProcessWebPageWebPagecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/WebPage/WebPage.cpp (207703 => 207704)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/WebPage/WebPage.cpp 2016-10-22 02:47:18 UTC (rev 207703)
+++ trunk/Source/WebKit2/WebProcess/WebPage/WebPage.cpp 2016-10-22 03:35:04 UTC (rev 207704)
</span><span class="lines">@@ -3706,6 +3706,11 @@
</span><span class="cx"> {
</span><span class="cx"> m_userMediaPermissionRequestManager.didCompleteMediaDeviceEnumeration(userMediaID, devices, deviceIdentifierHashSalt, originHasPersistentAccess);
</span><span class="cx"> }
</span><ins>+
+void WebPage::grantUserMediaDevicesSandboxExtension(const SandboxExtension::HandleArray& handles)
+{
+ m_userMediaPermissionRequestManager.grantUserMediaDevicesSandboxExtension(handles);
+}
</ins><span class="cx"> #endif
</span><span class="cx">
</span><span class="cx"> #if !PLATFORM(IOS)
</span></span></pre></div>
<a id="trunkSourceWebKit2WebProcessWebPageWebPageh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/WebPage/WebPage.h (207703 => 207704)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/WebPage/WebPage.h 2016-10-22 02:47:18 UTC (rev 207703)
+++ trunk/Source/WebKit2/WebProcess/WebPage/WebPage.h 2016-10-22 03:35:04 UTC (rev 207704)
</span><span class="lines">@@ -1171,6 +1171,7 @@
</span><span class="cx"> void userMediaAccessWasDenied(uint64_t userMediaID, uint64_t reason, String invalidConstraint);
</span><span class="cx">
</span><span class="cx"> void didCompleteMediaDeviceEnumeration(uint64_t userMediaID, const Vector<WebCore::CaptureDevice>& devices, const String& deviceIdentifierHashSalt, bool originHasPersistentAccess);
</span><ins>+ void grantUserMediaDevicesSandboxExtension(const SandboxExtension::HandleArray&);
</ins><span class="cx"> #endif
</span><span class="cx">
</span><span class="cx"> void advanceToNextMisspelling(bool startBeforeSelection);
</span></span></pre></div>
<a id="trunkSourceWebKit2WebProcessWebPageWebPagemessagesin"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/WebPage/WebPage.messages.in (207703 => 207704)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/WebPage/WebPage.messages.in 2016-10-22 02:47:18 UTC (rev 207703)
+++ trunk/Source/WebKit2/WebProcess/WebPage/WebPage.messages.in 2016-10-22 03:35:04 UTC (rev 207704)
</span><span class="lines">@@ -291,6 +291,7 @@
</span><span class="cx"> UserMediaAccessWasGranted(uint64_t userMediaID, String audioDeviceUID, String videoDeviceUID)
</span><span class="cx"> UserMediaAccessWasDenied(uint64_t userMediaID, uint64_t reason, String invalidConstraint)
</span><span class="cx"> DidCompleteMediaDeviceEnumeration(uint64_t userMediaID, Vector<WebCore::CaptureDevice> devices, String mediaDeviceIdentifierHashSalt, bool hasPersistentAccess)
</span><ins>+ GrantUserMediaDevicesSandboxExtension(WebKit::SandboxExtension::HandleArray sandboxExtensionHandle)
</ins><span class="cx"> #endif
</span><span class="cx">
</span><span class="cx"> # Notification
</span></span></pre></div>
<a id="trunkSourceWebKit2WebProcesscomappleWebProcesssbin"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/com.apple.WebProcess.sb.in (207703 => 207704)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/com.apple.WebProcess.sb.in 2016-10-22 02:47:18 UTC (rev 207703)
+++ trunk/Source/WebKit2/WebProcess/com.apple.WebProcess.sb.in 2016-10-22 03:35:04 UTC (rev 207704)
</span><span class="lines">@@ -318,3 +318,83 @@
</span><span class="cx">
</span><span class="cx"> ;; Data Detectors
</span><span class="cx"> (allow file-read* (subpath "/private/var/db/datadetectors/sys"))
</span><ins>+
+;; Media capture, utilities
+(if (not (defined? 'sbpl-filter?))
+ (define (sbpl-filter? x)
+ (and (list? x)
+ (eq? (car x) 'filter))))
+
+(macro (with-filter form)
+ (let* ((ps (cdr form))
+ (extra-filter (car ps))
+ (rules (cdr ps)))
+ `(letrec
+ ((collect
+ (lambda (l filters non-filters)
+ (if (null? l)
+ (list filters non-filters)
+ (let*
+ ((x (car l))
+ (rest (cdr l)))
+ (if (sbpl-filter? x)
+ (collect rest (cons x filters) non-filters)
+ (collect rest filters (cons x non-filters)))))))
+ (inject-filter
+ (lambda args
+ (let* ((collected (collect args '() '()))
+ (filters (car collected))
+ (non-filters (cadr collected)))
+ (if (null? filters)
+ (cons ,extra-filter non-filters)
+ (cons (require-all (apply require-any filters) ,extra-filter) non-filters)))))
+ (orig-allow allow)
+ (orig-deny deny)
+ (wrapper
+ (lambda (action)
+ (lambda args (apply action (apply inject-filter args))))))
+ (set! allow (wrapper orig-allow))
+ (set! deny (wrapper orig-deny))
+ ,@rules
+ (set! deny orig-deny)
+ (set! allow orig-allow))))
+
+(define (home-library-preferences-regex home-library-preferences-relative-regex)
+ (regex (string-append "^" (regex-quote (param "HOME_LIBRARY_PREFERENCES_DIR")) home-library-preferences-relative-regex)))
+
+(define (home-library-preferences-literal home-library-preferences-relative-literal)
+ (literal (string-append (param "HOME_LIBRARY_PREFERENCES_DIR") home-library-preferences-relative-literal)))
+
+(define (shared-preferences-read . domains)
+ (for-each (lambda (domain)
+ (begin
+ (if (defined? `user-preference-read)
+ (allow user-preference-read (preference-domain domain)))
+ ; (Temporary) backward compatibility with non-CFPreferences readers.
+ (allow file-read*
+ (literal (string-append "/Library/Preferences/" domain ".plist"))
+ (home-library-preferences-literal (string-append "/" domain ".plist"))
+ (home-library-preferences-regex (string-append #"/ByHost/" (regex-quote domain) #"\..*\.plist$")))))
+ domains))
+
+;; Media capture, microphone access
+(with-filter (extension "com.apple.webkit.microphone")
+ (allow device-microphone))
+
+;; Media capture, camera access
+(with-filter (extension "com.apple.webkit.camera")
+ (shared-preferences-read "com.apple.coremedia")
+ (allow mach-lookup (extension "com.apple.app-sandbox.mach"))
+ (allow mach-lookup
+ (global-name "com.apple.cmio.AppleCameraAssistant")
+ ;; Apple DAL assistants
+ (global-name "com.apple.cmio.VDCAssistant")
+ (global-name "com.apple.cmio.AVCAssistant")
+ (global-name "com.apple.cmio.IIDCVideoAssistant")
+ ;; QuickTimeIIDCDigitizer assistant
+ (global-name "com.apple.IIDCAssistant"))
+ (allow iokit-open
+ ;; QuickTimeUSBVDCDigitizer
+ (iokit-user-client-class "IOUSBDeviceUserClientV2")
+ (iokit-user-client-class "IOUSBInterfaceUserClientV2"))
+ (allow device-camera))
</ins></span></pre>
</div>
</div>
</body>
</html>