<!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>[209864] trunk</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/209864">209864</a></dd>
<dt>Author</dt> <dd>darin@apple.com</dd>
<dt>Date</dt> <dd>2016-12-15 09:25:53 -0800 (Thu, 15 Dec 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>Remove custom binding for MediaDevices
https://bugs.webkit.org/show_bug.cgi?id=165894
Reviewed by Eric Carlson.
Source/WebCore:
Removes the explicit code to parse the MediaStreamConstraints and
MediaTrackConstraints. Next step could be to change the internal
code to use the structs from bindings directly so we don't need
code to convert to an internal format.
* CMakeLists.txt: Added MediaTrackConstraints.idl and MediaTrackConstraints.cpp,
removed JSMediaDevicesCustom.cpp.
* DerivedSources.make: Added MediaTrackConstraints.idl.
Also sorted list of IDL files and fixed use of tabs.
* Modules/mediastream/MediaDevices.cpp:
(WebCore::createMediaConstraintsImpl): Added.
(WebCore::MediaDevices::getUserMedia): Changed this function to take arguments that
are generated by the bindings script, and call createMediaConstraintsImpl to convert
into the internal data structure.
* Modules/mediastream/MediaDevices.h: Added StreamConstraints struct and changed
getUserMedia to take that as specified in the IDL.
* Modules/mediastream/MediaDevices.idl: Added definition of the MediaStreamConstraints
dictionary. Removed [Custom] from getUserMedia.
* Modules/mediastream/MediaStream.cpp:
(WebCore::MediaStream::MediaStream): Pass a reference to addObserver.
(WebCore::MediaStream::~MediaStream): Pass a rference to removeObserver.
(WebCore::MediaStream::internalAddTrack): Ditto.
(WebCore::MediaStream::internalRemoveTrack): Ditto.
* Modules/mediastream/MediaStreamTrack.cpp:
(WebCore::createMediaConstraintsImpl): Added.
(WebCore::MediaStreamTrack::applyConstraints): Changed to take an optional
MediaTrackConstraints argument and call createMediaConstraintsImpl to convert
into the internal data structure. Also merged the multiple overloads of this
all into a single function, used auto to make the code easier to read, and
moved the code that stores new constrains into the success handling, since the
specification says that's the only case where we should store it.
(WebCore::MediaStreamTrack::addObserver): Take a reference instead of a pointer.
(WebCore::MediaStreamTrack::removeObserver): Ditto.
* Modules/mediastream/MediaStreamTrack.h: Removed many unneeded includes.
Changed getConstraints to return const MediaTrackConstraints&, applyConstraints
to take an optional MediaTrackConstraints, add/removeObserver to take a reference
rather than a pointer, and changed m_constraints to be a MediaTrackConstraints
instead of a RefPtr<MediaConstraints>.
* Modules/mediastream/MediaStreamTrack.idl: Removed [Custom] from getConstraints
and applyConstraints.
* Modules/mediastream/MediaTrackConstraints.cpp: Added.
(WebCore::set): Overloaded function to set constriaints in a
MediaTrackConstraintSetMap.
(WebCore::convertToInternalForm): Helper function that takes a
MediaTrackConstraintSet and turns it into a MediaTrackConstraintSetMap.
(WebCore::convertAdvancedToInternalForm): More of the same, but for vectors.
(WebCore::createMediaConstraintsImpl): Top level function. Calls the other
functions and then MediaConstraintsImpl::create.
* Modules/mediastream/MediaTrackConstraints.h: Added. Contains all the structures
and type definitions for the dictionaries defined in the IDL file, and also the
createMediaConstraintsImpl function declaration.
* Modules/mediastream/MediaTrackConstraints.idl: Added. Contains the
MediaTrackConstraints and all the other dictionaries and typedefs that are needed
to define that dictionary.
* Modules/mediastream/UserMediaRequest.cpp:
(WebCore::UserMediaRequest::start): Changed to not depend on MediaDevices::Promise.
(WebCore::UserMediaRequest::UserMediaRequest): Ditto.
(WebCore::isSecure): Rearranged to be easier to understand.
(WebCore::UserMediaRequest::start): Removed a local variable for simplicity.
(WebCore::UserMediaRequest::document): Removed a redundant null check.
* Modules/mediastream/UserMediaRequest.h: Reduced includes, changed to not depend
on MediaDevices::Promise, removing the reason to include MediaDevices.h.
* WebCore.xcodeproj/project.pbxproj: Updated to remove old files and add new ones.
* bindings/js/JSBindingsAllInOne.cpp: Removed JSMediaDevicesCustom.cpp.
* bindings/js/JSMediaDevicesCustom.cpp: Removed.
* bindings/js/JSMediaDevicesCustom.h: Removed.
* bindings/js/JSMediaStreamTrackCustom.cpp:
(WebCore::JSMediaStreamTrack::applyConstraints): Deleted.
(WebCore::JSMediaStreamTrack::getConstraints): Deleted.
* bindings/scripts/CodeGenerator.pm:
(ProcessDocument): Updated to allow multiple standalone dictionaries, as long as
the name of one of the dictionaries matches the name of the file.
* bindings/scripts/CodeGeneratorJS.pm:
(GenerateDictionary): Added "other dictionaries" argument so we can support
files with multiple dictionaries in them.
(GenerateDictionariesHeaderContent): Completed support for dictionaries that
are not named after a top level interface by added one more check for a missing
$interface in a place that otherwise would not handle it correctly.
(GenerateImplementation): Removed code that set $currentCachedAttribute and
$cacheIndex, since no was reading the value of either any longer.
(GenerateDictionaryHeader): Added "other dictionaries".
(GenerateDictionaryImplementation): Ditto.
(WriteData): Removed unnnecessarily indirect code that was using FileNamePrefix
and a local variable named $prefix instead of just writing "JS".
* bindings/scripts/generate-bindings.pl: Corrected the use of the fileparse
function from the Path::Basename module; after reading the documentation for
this it is clear that there is no need to first call basename, and fileparse
should also be used instead of basename.
* platform/mediastream/MediaConstraints.h: Removed unneeded includes.
(WebCore::StringConstraint::appendExact): Removed an incorrect use of clear
here that would mess up cases where there is supposed to be more than one
exact value.
* platform/mediastream/MediaStreamTrackPrivate.cpp: Remvoed unneeded includes.
(WebCore::MediaStreamTrackPrivate::clone): Removed code to copy m_constraints.
(WebCore::MediaStreamTrackPrivate::constraints): Deleted.
* platform/mediastream/MediaStreamTrackPrivate.h: Removed the constraints
function member and the m_constraints data member.
Source/WebKit2:
* WebProcess/MediaStream/UserMediaPermissionRequestManager.cpp:
Added include of MediaConstraintsImpl.h, now needed because we
removed some unneeded includes from the WebCore headers.
LayoutTests:
* fast/mediastream/MediaDevices-getUserMedia-expected.txt: Expect the exception the
generated bindings code throws, rather than the different one the hand-written binding
was throwing before.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsChangeLog">trunk/LayoutTests/ChangeLog</a></li>
<li><a href="#trunkLayoutTestsfastmediastreamMediaDevicesgetUserMediaexpectedtxt">trunk/LayoutTests/fast/mediastream/MediaDevices-getUserMedia-expected.txt</a></li>
<li><a href="#trunkSourceWebCoreCMakeListstxt">trunk/Source/WebCore/CMakeLists.txt</a></li>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoreDerivedSourcesmake">trunk/Source/WebCore/DerivedSources.make</a></li>
<li><a href="#trunkSourceWebCoreModulesmediastreamMediaDevicescpp">trunk/Source/WebCore/Modules/mediastream/MediaDevices.cpp</a></li>
<li><a href="#trunkSourceWebCoreModulesmediastreamMediaDevicesh">trunk/Source/WebCore/Modules/mediastream/MediaDevices.h</a></li>
<li><a href="#trunkSourceWebCoreModulesmediastreamMediaDevicesidl">trunk/Source/WebCore/Modules/mediastream/MediaDevices.idl</a></li>
<li><a href="#trunkSourceWebCoreModulesmediastreamMediaStreamcpp">trunk/Source/WebCore/Modules/mediastream/MediaStream.cpp</a></li>
<li><a href="#trunkSourceWebCoreModulesmediastreamMediaStreamTrackcpp">trunk/Source/WebCore/Modules/mediastream/MediaStreamTrack.cpp</a></li>
<li><a href="#trunkSourceWebCoreModulesmediastreamMediaStreamTrackh">trunk/Source/WebCore/Modules/mediastream/MediaStreamTrack.h</a></li>
<li><a href="#trunkSourceWebCoreModulesmediastreamMediaStreamTrackidl">trunk/Source/WebCore/Modules/mediastream/MediaStreamTrack.idl</a></li>
<li><a href="#trunkSourceWebCoreModulesmediastreamUserMediaRequestcpp">trunk/Source/WebCore/Modules/mediastream/UserMediaRequest.cpp</a></li>
<li><a href="#trunkSourceWebCoreModulesmediastreamUserMediaRequesth">trunk/Source/WebCore/Modules/mediastream/UserMediaRequest.h</a></li>
<li><a href="#trunkSourceWebCoreWebCorexcodeprojprojectpbxproj">trunk/Source/WebCore/WebCore.xcodeproj/project.pbxproj</a></li>
<li><a href="#trunkSourceWebCorebindingsjsJSBindingsAllInOnecpp">trunk/Source/WebCore/bindings/js/JSBindingsAllInOne.cpp</a></li>
<li><a href="#trunkSourceWebCorebindingsjsJSMediaStreamTrackCustomcpp">trunk/Source/WebCore/bindings/js/JSMediaStreamTrackCustom.cpp</a></li>
<li><a href="#trunkSourceWebCorebindingsscriptsCodeGeneratorpm">trunk/Source/WebCore/bindings/scripts/CodeGenerator.pm</a></li>
<li><a href="#trunkSourceWebCorebindingsscriptsCodeGeneratorJSpm">trunk/Source/WebCore/bindings/scripts/CodeGeneratorJS.pm</a></li>
<li><a href="#trunkSourceWebCorebindingsscriptsgeneratebindingspl">trunk/Source/WebCore/bindings/scripts/generate-bindings.pl</a></li>
<li><a href="#trunkSourceWebCoreplatformmediastreamMediaConstraintsh">trunk/Source/WebCore/platform/mediastream/MediaConstraints.h</a></li>
<li><a href="#trunkSourceWebCoreplatformmediastreamMediaStreamTrackPrivatecpp">trunk/Source/WebCore/platform/mediastream/MediaStreamTrackPrivate.cpp</a></li>
<li><a href="#trunkSourceWebCoreplatformmediastreamMediaStreamTrackPrivateh">trunk/Source/WebCore/platform/mediastream/MediaStreamTrackPrivate.h</a></li>
<li><a href="#trunkSourceWebKit2ChangeLog">trunk/Source/WebKit2/ChangeLog</a></li>
<li><a href="#trunkSourceWebKit2WebProcessMediaStreamUserMediaPermissionRequestManagercpp">trunk/Source/WebKit2/WebProcess/MediaStream/UserMediaPermissionRequestManager.cpp</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreModulesmediastreamMediaTrackConstraintscpp">trunk/Source/WebCore/Modules/mediastream/MediaTrackConstraints.cpp</a></li>
<li><a href="#trunkSourceWebCoreModulesmediastreamMediaTrackConstraintsh">trunk/Source/WebCore/Modules/mediastream/MediaTrackConstraints.h</a></li>
<li><a href="#trunkSourceWebCoreModulesmediastreamMediaTrackConstraintsidl">trunk/Source/WebCore/Modules/mediastream/MediaTrackConstraints.idl</a></li>
</ul>
<h3>Removed Paths</h3>
<ul>
<li><a href="#trunkSourceWebCorebindingsjsJSMediaDevicesCustomcpp">trunk/Source/WebCore/bindings/js/JSMediaDevicesCustom.cpp</a></li>
<li><a href="#trunkSourceWebCorebindingsjsJSMediaDevicesCustomh">trunk/Source/WebCore/bindings/js/JSMediaDevicesCustom.h</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkLayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/ChangeLog (209863 => 209864)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/ChangeLog 2016-12-15 16:53:38 UTC (rev 209863)
+++ trunk/LayoutTests/ChangeLog 2016-12-15 17:25:53 UTC (rev 209864)
</span><span class="lines">@@ -1,3 +1,14 @@
</span><ins>+2016-12-15 Darin Adler <darin@apple.com>
+
+ Remove custom binding for MediaDevices
+ https://bugs.webkit.org/show_bug.cgi?id=165894
+
+ Reviewed by Eric Carlson.
+
+ * fast/mediastream/MediaDevices-getUserMedia-expected.txt: Expect the exception the
+ generated bindings code throws, rather than the different one the hand-written binding
+ was throwing before.
+
</ins><span class="cx"> 2016-12-15 Youenn Fablet <youennf@gmail.com>
</span><span class="cx">
</span><span class="cx"> Sync web-platform-tests up to revision a4c2b37
</span></span></pre></div>
<a id="trunkLayoutTestsfastmediastreamMediaDevicesgetUserMediaexpectedtxt"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/fast/mediastream/MediaDevices-getUserMedia-expected.txt (209863 => 209864)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/mediastream/MediaDevices-getUserMedia-expected.txt 2016-12-15 16:53:38 UTC (rev 209863)
+++ trunk/LayoutTests/fast/mediastream/MediaDevices-getUserMedia-expected.txt 2016-12-15 17:25:53 UTC (rev 209864)
</span><span class="lines">@@ -5,7 +5,7 @@
</span><span class="cx">
</span><span class="cx"> PASS typeof navigator.mediaDevices.webkitGetUserMedia is 'undefined'
</span><span class="cx"> PASS navigator.mediaDevices.getUserMedia({audio:true}).then(gotStream1); did not throw exception.
</span><del>-PASS navigator.mediaDevices.getUserMedia() rejected with error: TypeError: Not enough arguments
</del><ins>+PASS navigator.mediaDevices.getUserMedia() rejected with error: TypeError: Type error
</ins><span class="cx"> PASS navigator.mediaDevices.getUserMedia({}) rejected with error: TypeError: Type error
</span><span class="cx"> PASS navigator.mediaDevices.getUserMedia.apply(undefined) rejected with error: TypeError: Can only call MediaDevices.getUserMedia on instances of MediaDevices
</span><span class="cx"> PASS Stream generated.
</span></span></pre></div>
<a id="trunkSourceWebCoreCMakeListstxt"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/CMakeLists.txt (209863 => 209864)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/CMakeLists.txt 2016-12-15 16:53:38 UTC (rev 209863)
+++ trunk/Source/WebCore/CMakeLists.txt 2016-12-15 17:25:53 UTC (rev 209864)
</span><span class="lines">@@ -219,6 +219,7 @@
</span><span class="cx"> Modules/mediastream/MediaStreamEvent.idl
</span><span class="cx"> Modules/mediastream/MediaStreamTrack.idl
</span><span class="cx"> Modules/mediastream/MediaStreamTrackEvent.idl
</span><ins>+ Modules/mediastream/MediaTrackConstraints.idl
</ins><span class="cx"> Modules/mediastream/MediaTrackSupportedConstraints.idl
</span><span class="cx"> Modules/mediastream/NavigatorMediaDevices.idl
</span><span class="cx"> Modules/mediastream/NavigatorUserMedia.idl
</span><span class="lines">@@ -907,6 +908,7 @@
</span><span class="cx"> Modules/mediastream/MediaStreamRegistry.cpp
</span><span class="cx"> Modules/mediastream/MediaStreamTrack.cpp
</span><span class="cx"> Modules/mediastream/MediaStreamTrackEvent.cpp
</span><ins>+ Modules/mediastream/MediaTrackConstraints.cpp
</ins><span class="cx"> Modules/mediastream/NavigatorMediaDevices.cpp
</span><span class="cx"> Modules/mediastream/PeerConnectionBackend.cpp
</span><span class="cx"> Modules/mediastream/RTCDTMFSender.cpp
</span><span class="lines">@@ -1162,7 +1164,6 @@
</span><span class="cx"> bindings/js/JSLazyEventListener.cpp
</span><span class="cx"> bindings/js/JSLocationCustom.cpp
</span><span class="cx"> bindings/js/JSMainThreadExecState.cpp
</span><del>- bindings/js/JSMediaDevicesCustom.cpp
</del><span class="cx"> bindings/js/JSMediaKeySessionCustom.cpp
</span><span class="cx"> bindings/js/JSMediaKeySystemAccessCustom.cpp
</span><span class="cx"> bindings/js/JSMediaStreamTrackCustom.cpp
</span></span></pre></div>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (209863 => 209864)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2016-12-15 16:53:38 UTC (rev 209863)
+++ trunk/Source/WebCore/ChangeLog 2016-12-15 17:25:53 UTC (rev 209864)
</span><span class="lines">@@ -1,3 +1,122 @@
</span><ins>+2016-12-15 Darin Adler <darin@apple.com>
+
+ Remove custom binding for MediaDevices
+ https://bugs.webkit.org/show_bug.cgi?id=165894
+
+ Reviewed by Eric Carlson.
+
+ Removes the explicit code to parse the MediaStreamConstraints and
+ MediaTrackConstraints. Next step could be to change the internal
+ code to use the structs from bindings directly so we don't need
+ code to convert to an internal format.
+
+ * CMakeLists.txt: Added MediaTrackConstraints.idl and MediaTrackConstraints.cpp,
+ removed JSMediaDevicesCustom.cpp.
+
+ * DerivedSources.make: Added MediaTrackConstraints.idl.
+ Also sorted list of IDL files and fixed use of tabs.
+
+ * Modules/mediastream/MediaDevices.cpp:
+ (WebCore::createMediaConstraintsImpl): Added.
+ (WebCore::MediaDevices::getUserMedia): Changed this function to take arguments that
+ are generated by the bindings script, and call createMediaConstraintsImpl to convert
+ into the internal data structure.
+ * Modules/mediastream/MediaDevices.h: Added StreamConstraints struct and changed
+ getUserMedia to take that as specified in the IDL.
+ * Modules/mediastream/MediaDevices.idl: Added definition of the MediaStreamConstraints
+ dictionary. Removed [Custom] from getUserMedia.
+
+ * Modules/mediastream/MediaStream.cpp:
+ (WebCore::MediaStream::MediaStream): Pass a reference to addObserver.
+ (WebCore::MediaStream::~MediaStream): Pass a rference to removeObserver.
+ (WebCore::MediaStream::internalAddTrack): Ditto.
+ (WebCore::MediaStream::internalRemoveTrack): Ditto.
+
+ * Modules/mediastream/MediaStreamTrack.cpp:
+ (WebCore::createMediaConstraintsImpl): Added.
+ (WebCore::MediaStreamTrack::applyConstraints): Changed to take an optional
+ MediaTrackConstraints argument and call createMediaConstraintsImpl to convert
+ into the internal data structure. Also merged the multiple overloads of this
+ all into a single function, used auto to make the code easier to read, and
+ moved the code that stores new constrains into the success handling, since the
+ specification says that's the only case where we should store it.
+ (WebCore::MediaStreamTrack::addObserver): Take a reference instead of a pointer.
+ (WebCore::MediaStreamTrack::removeObserver): Ditto.
+ * Modules/mediastream/MediaStreamTrack.h: Removed many unneeded includes.
+ Changed getConstraints to return const MediaTrackConstraints&, applyConstraints
+ to take an optional MediaTrackConstraints, add/removeObserver to take a reference
+ rather than a pointer, and changed m_constraints to be a MediaTrackConstraints
+ instead of a RefPtr<MediaConstraints>.
+ * Modules/mediastream/MediaStreamTrack.idl: Removed [Custom] from getConstraints
+ and applyConstraints.
+
+ * Modules/mediastream/MediaTrackConstraints.cpp: Added.
+ (WebCore::set): Overloaded function to set constriaints in a
+ MediaTrackConstraintSetMap.
+ (WebCore::convertToInternalForm): Helper function that takes a
+ MediaTrackConstraintSet and turns it into a MediaTrackConstraintSetMap.
+ (WebCore::convertAdvancedToInternalForm): More of the same, but for vectors.
+ (WebCore::createMediaConstraintsImpl): Top level function. Calls the other
+ functions and then MediaConstraintsImpl::create.
+ * Modules/mediastream/MediaTrackConstraints.h: Added. Contains all the structures
+ and type definitions for the dictionaries defined in the IDL file, and also the
+ createMediaConstraintsImpl function declaration.
+ * Modules/mediastream/MediaTrackConstraints.idl: Added. Contains the
+ MediaTrackConstraints and all the other dictionaries and typedefs that are needed
+ to define that dictionary.
+ * Modules/mediastream/UserMediaRequest.cpp:
+ (WebCore::UserMediaRequest::start): Changed to not depend on MediaDevices::Promise.
+ (WebCore::UserMediaRequest::UserMediaRequest): Ditto.
+ (WebCore::isSecure): Rearranged to be easier to understand.
+ (WebCore::UserMediaRequest::start): Removed a local variable for simplicity.
+ (WebCore::UserMediaRequest::document): Removed a redundant null check.
+ * Modules/mediastream/UserMediaRequest.h: Reduced includes, changed to not depend
+ on MediaDevices::Promise, removing the reason to include MediaDevices.h.
+
+ * WebCore.xcodeproj/project.pbxproj: Updated to remove old files and add new ones.
+
+ * bindings/js/JSBindingsAllInOne.cpp: Removed JSMediaDevicesCustom.cpp.
+
+ * bindings/js/JSMediaDevicesCustom.cpp: Removed.
+ * bindings/js/JSMediaDevicesCustom.h: Removed.
+
+ * bindings/js/JSMediaStreamTrackCustom.cpp:
+ (WebCore::JSMediaStreamTrack::applyConstraints): Deleted.
+ (WebCore::JSMediaStreamTrack::getConstraints): Deleted.
+
+ * bindings/scripts/CodeGenerator.pm:
+ (ProcessDocument): Updated to allow multiple standalone dictionaries, as long as
+ the name of one of the dictionaries matches the name of the file.
+
+ * bindings/scripts/CodeGeneratorJS.pm:
+ (GenerateDictionary): Added "other dictionaries" argument so we can support
+ files with multiple dictionaries in them.
+ (GenerateDictionariesHeaderContent): Completed support for dictionaries that
+ are not named after a top level interface by added one more check for a missing
+ $interface in a place that otherwise would not handle it correctly.
+ (GenerateImplementation): Removed code that set $currentCachedAttribute and
+ $cacheIndex, since no was reading the value of either any longer.
+ (GenerateDictionaryHeader): Added "other dictionaries".
+ (GenerateDictionaryImplementation): Ditto.
+ (WriteData): Removed unnnecessarily indirect code that was using FileNamePrefix
+ and a local variable named $prefix instead of just writing "JS".
+
+ * bindings/scripts/generate-bindings.pl: Corrected the use of the fileparse
+ function from the Path::Basename module; after reading the documentation for
+ this it is clear that there is no need to first call basename, and fileparse
+ should also be used instead of basename.
+
+ * platform/mediastream/MediaConstraints.h: Removed unneeded includes.
+ (WebCore::StringConstraint::appendExact): Removed an incorrect use of clear
+ here that would mess up cases where there is supposed to be more than one
+ exact value.
+
+ * platform/mediastream/MediaStreamTrackPrivate.cpp: Remvoed unneeded includes.
+ (WebCore::MediaStreamTrackPrivate::clone): Removed code to copy m_constraints.
+ (WebCore::MediaStreamTrackPrivate::constraints): Deleted.
+ * platform/mediastream/MediaStreamTrackPrivate.h: Removed the constraints
+ function member and the m_constraints data member.
+
</ins><span class="cx"> 2016-12-15 Dave Hyatt <hyatt@apple.com>
</span><span class="cx">
</span><span class="cx"> [CSS Parser] Enable CSS Deferred Parsing
</span></span></pre></div>
<a id="trunkSourceWebCoreDerivedSourcesmake"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/DerivedSources.make (209863 => 209864)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/DerivedSources.make 2016-12-15 16:53:38 UTC (rev 209863)
+++ trunk/Source/WebCore/DerivedSources.make 2016-12-15 17:25:53 UTC (rev 209864)
</span><span class="lines">@@ -152,6 +152,7 @@
</span><span class="cx"> $(WebCore)/Modules/mediastream/MediaStreamEvent.idl \
</span><span class="cx"> $(WebCore)/Modules/mediastream/MediaStreamTrack.idl \
</span><span class="cx"> $(WebCore)/Modules/mediastream/MediaStreamTrackEvent.idl \
</span><ins>+ $(WebCore)/Modules/mediastream/MediaTrackConstraints.idl \
</ins><span class="cx"> $(WebCore)/Modules/mediastream/MediaTrackSupportedConstraints.idl \
</span><span class="cx"> $(WebCore)/Modules/mediastream/NavigatorMediaDevices.idl \
</span><span class="cx"> $(WebCore)/Modules/mediastream/NavigatorUserMedia.idl \
</span><span class="lines">@@ -254,6 +255,9 @@
</span><span class="cx"> $(WebCore)/crypto/CryptoKeyPair.idl \
</span><span class="cx"> $(WebCore)/crypto/CryptoKeyUsage.idl \
</span><span class="cx"> $(WebCore)/crypto/JsonWebKey.idl \
</span><ins>+ $(WebCore)/crypto/RsaOtherPrimesInfo.idl \
+ $(WebCore)/crypto/SubtleCrypto.idl \
+ $(WebCore)/crypto/WebKitSubtleCrypto.idl \
</ins><span class="cx"> $(WebCore)/crypto/parameters/AesCbcParams.idl \
</span><span class="cx"> $(WebCore)/crypto/parameters/AesKeyGenParams.idl \
</span><span class="cx"> $(WebCore)/crypto/parameters/HmacKeyParams.idl \
</span><span class="lines">@@ -261,9 +265,6 @@
</span><span class="cx"> $(WebCore)/crypto/parameters/RsaHashedKeyGenParams.idl \
</span><span class="cx"> $(WebCore)/crypto/parameters/RsaKeyGenParams.idl \
</span><span class="cx"> $(WebCore)/crypto/parameters/RsaOaepParams.idl \
</span><del>- $(WebCore)/crypto/RsaOtherPrimesInfo.idl \
- $(WebCore)/crypto/SubtleCrypto.idl \
- $(WebCore)/crypto/WebKitSubtleCrypto.idl \
</del><span class="cx"> $(WebCore)/css/CSSFontFaceLoadEvent.idl \
</span><span class="cx"> $(WebCore)/css/CSSFontFaceRule.idl \
</span><span class="cx"> $(WebCore)/css/CSSImportRule.idl \
</span><span class="lines">@@ -270,7 +271,7 @@
</span><span class="cx"> $(WebCore)/css/CSSKeyframeRule.idl \
</span><span class="cx"> $(WebCore)/css/CSSKeyframesRule.idl \
</span><span class="cx"> $(WebCore)/css/CSSMediaRule.idl \
</span><del>- $(WebCore)/css/CSSNamespaceRule.idl \
</del><ins>+ $(WebCore)/css/CSSNamespaceRule.idl \
</ins><span class="cx"> $(WebCore)/css/CSSPageRule.idl \
</span><span class="cx"> $(WebCore)/css/CSSPrimitiveValue.idl \
</span><span class="cx"> $(WebCore)/css/CSSRule.idl \
</span><span class="lines">@@ -307,8 +308,8 @@
</span><span class="cx"> $(WebCore)/dom/ChildNode.idl \
</span><span class="cx"> $(WebCore)/dom/ClientRect.idl \
</span><span class="cx"> $(WebCore)/dom/ClientRectList.idl \
</span><ins>+ $(WebCore)/dom/ClipboardEvent.idl \
</ins><span class="cx"> $(WebCore)/dom/Comment.idl \
</span><del>- $(WebCore)/dom/ClipboardEvent.idl \
</del><span class="cx"> $(WebCore)/dom/CompositionEvent.idl \
</span><span class="cx"> $(WebCore)/dom/CustomElementRegistry.idl \
</span><span class="cx"> $(WebCore)/dom/CustomEvent.idl \
</span></span></pre></div>
<a id="trunkSourceWebCoreModulesmediastreamMediaDevicescpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/mediastream/MediaDevices.cpp (209863 => 209864)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/mediastream/MediaDevices.cpp 2016-12-15 16:53:38 UTC (rev 209863)
+++ trunk/Source/WebCore/Modules/mediastream/MediaDevices.cpp 2016-12-15 17:25:53 UTC (rev 209864)
</span><span class="lines">@@ -34,6 +34,7 @@
</span><span class="cx"> #if ENABLE(MEDIA_STREAM)
</span><span class="cx">
</span><span class="cx"> #include "Document.h"
</span><ins>+#include "MediaConstraintsImpl.h"
</ins><span class="cx"> #include "MediaDevicesRequest.h"
</span><span class="cx"> #include "MediaTrackSupportedConstraints.h"
</span><span class="cx"> #include "RealtimeMediaSourceCenter.h"
</span><span class="lines">@@ -56,12 +57,24 @@
</span><span class="cx"> return downcast<Document>(scriptExecutionContext());
</span><span class="cx"> }
</span><span class="cx">
</span><del>-ExceptionOr<void> MediaDevices::getUserMedia(Ref<MediaConstraintsImpl>&& audioConstraints, Ref<MediaConstraintsImpl>&& videoConstraints, Promise&& promise) const
</del><ins>+static Ref<MediaConstraintsImpl> createMediaConstraintsImpl(const Variant<bool, MediaTrackConstraints>& constraints)
</ins><span class="cx"> {
</span><ins>+ return WTF::switchOn(constraints,
+ [&] (bool constraints) {
+ return MediaConstraintsImpl::create({ }, { }, constraints);
+ },
+ [&] (const MediaTrackConstraints& constraints) {
+ return createMediaConstraintsImpl(constraints);
+ }
+ );
+}
+
+ExceptionOr<void> MediaDevices::getUserMedia(const StreamConstraints& constraints, Promise&& promise) const
+{
</ins><span class="cx"> auto* document = this->document();
</span><span class="cx"> if (!document)
</span><span class="cx"> return Exception { INVALID_STATE_ERR };
</span><del>- return UserMediaRequest::start(*document, WTFMove(audioConstraints), WTFMove(videoConstraints), WTFMove(promise));
</del><ins>+ return UserMediaRequest::start(*document, createMediaConstraintsImpl(constraints.audio), createMediaConstraintsImpl(constraints.video), WTFMove(promise));
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void MediaDevices::enumerateDevices(EnumerateDevicesPromise&& promise) const
</span></span></pre></div>
<a id="trunkSourceWebCoreModulesmediastreamMediaDevicesh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/mediastream/MediaDevices.h (209863 => 209864)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/mediastream/MediaDevices.h 2016-12-15 16:53:38 UTC (rev 209863)
+++ trunk/Source/WebCore/Modules/mediastream/MediaDevices.h 2016-12-15 17:25:53 UTC (rev 209864)
</span><span class="lines">@@ -1,5 +1,6 @@
</span><span class="cx"> /*
</span><span class="cx"> * Copyright (C) 2015 Ericsson AB. All rights reserved.
</span><ins>+ * Copyright (C) 2016 Apple Inc. All rights reserved.
</ins><span class="cx"> *
</span><span class="cx"> * Redistribution and use in source and binary forms, with or without
</span><span class="cx"> * modification, are permitted provided that the following conditions
</span><span class="lines">@@ -34,12 +35,12 @@
</span><span class="cx">
</span><span class="cx"> #include "ExceptionOr.h"
</span><span class="cx"> #include "JSDOMPromise.h"
</span><del>-#include "MediaDeviceInfo.h"
</del><ins>+#include "MediaTrackConstraints.h"
</ins><span class="cx">
</span><span class="cx"> namespace WebCore {
</span><span class="cx">
</span><span class="cx"> class Document;
</span><del>-class MediaConstraintsImpl;
</del><ins>+class MediaDeviceInfo;
</ins><span class="cx"> class MediaStream;
</span><span class="cx"> class MediaTrackSupportedConstraints;
</span><span class="cx">
</span><span class="lines">@@ -52,7 +53,11 @@
</span><span class="cx"> using Promise = DOMPromise<IDLInterface<MediaStream>>;
</span><span class="cx"> using EnumerateDevicesPromise = DOMPromise<IDLSequence<IDLInterface<MediaDeviceInfo>>>;
</span><span class="cx">
</span><del>- ExceptionOr<void> getUserMedia(Ref<MediaConstraintsImpl>&& audioConstraints, Ref<MediaConstraintsImpl>&& videoConstraints, Promise&&) const;
</del><ins>+ struct StreamConstraints {
+ Variant<bool, MediaTrackConstraints> video;
+ Variant<bool, MediaTrackConstraints> audio;
+ };
+ ExceptionOr<void> getUserMedia(const StreamConstraints&, Promise&&) const;
</ins><span class="cx"> void enumerateDevices(EnumerateDevicesPromise&&) const;
</span><span class="cx"> RefPtr<MediaTrackSupportedConstraints> getSupportedConstraints();
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCoreModulesmediastreamMediaDevicesidl"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/mediastream/MediaDevices.idl (209863 => 209864)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/mediastream/MediaDevices.idl 2016-12-15 16:53:38 UTC (rev 209863)
+++ trunk/Source/WebCore/Modules/mediastream/MediaDevices.idl 2016-12-15 17:25:53 UTC (rev 209864)
</span><span class="lines">@@ -29,11 +29,16 @@
</span><span class="cx"> */
</span><span class="cx">
</span><span class="cx"> [
</span><ins>+ Conditional=MEDIA_STREAM,
</ins><span class="cx"> NoInterfaceObject,
</span><del>- Conditional=MEDIA_STREAM
</del><span class="cx"> ] interface MediaDevices {
</span><span class="cx"> MediaTrackSupportedConstraints getSupportedConstraints();
</span><span class="cx">
</span><del>- [Custom, MayThrowException, PrivateIdentifier, PublicIdentifier] Promise<MediaStream> getUserMedia(optional MediaStreamConstraints constraints);
</del><ins>+ [MayThrowException, PrivateIdentifier, PublicIdentifier] Promise<MediaStream> getUserMedia(optional MediaStreamConstraints constraints);
</ins><span class="cx"> Promise<sequence<MediaDeviceInfo>> enumerateDevices();
</span><span class="cx"> };
</span><ins>+
+dictionary MediaStreamConstraints {
+ (boolean or MediaTrackConstraints) video = false;
+ (boolean or MediaTrackConstraints) audio = false;
+};
</ins></span></pre></div>
<a id="trunkSourceWebCoreModulesmediastreamMediaStreamcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/mediastream/MediaStream.cpp (209863 => 209864)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/mediastream/MediaStream.cpp 2016-12-15 16:53:38 UTC (rev 209863)
+++ trunk/Source/WebCore/Modules/mediastream/MediaStream.cpp 2016-12-15 17:25:53 UTC (rev 209864)
</span><span class="lines">@@ -72,7 +72,7 @@
</span><span class="cx"> trackPrivates.reserveCapacity(tracks.size());
</span><span class="cx">
</span><span class="cx"> for (auto& track : tracks) {
</span><del>- track->addObserver(this);
</del><ins>+ track->addObserver(*this);
</ins><span class="cx"> m_trackSet.add(track->id(), track);
</span><span class="cx"> trackPrivates.append(&track->privateTrack());
</span><span class="cx"> }
</span><span class="lines">@@ -96,7 +96,7 @@
</span><span class="cx">
</span><span class="cx"> for (auto& trackPrivate : m_private->tracks()) {
</span><span class="cx"> auto track = MediaStreamTrack::create(context, *trackPrivate);
</span><del>- track->addObserver(this);
</del><ins>+ track->addObserver(*this);
</ins><span class="cx"> m_trackSet.add(track->id(), WTFMove(track));
</span><span class="cx"> }
</span><span class="cx"> document()->addAudioProducer(this);
</span><span class="lines">@@ -110,7 +110,7 @@
</span><span class="cx"> MediaStreamRegistry::shared().unregisterStream(*this);
</span><span class="cx"> m_private->removeObserver(*this);
</span><span class="cx"> for (auto& track : m_trackSet.values())
</span><del>- track->removeObserver(this);
</del><ins>+ track->removeObserver(*this);
</ins><span class="cx"> if (Document* document = this->document()) {
</span><span class="cx"> document->removeAudioProducer(this);
</span><span class="cx"> if (m_isWaitingUntilMediaCanStart)
</span><span class="lines">@@ -215,7 +215,7 @@
</span><span class="cx">
</span><span class="cx"> ASSERT(result.iterator->value);
</span><span class="cx"> auto& track = *result.iterator->value;
</span><del>- track.addObserver(this);
</del><ins>+ track.addObserver(*this);
</ins><span class="cx">
</span><span class="cx"> if (streamModifier == StreamModifier::DomAPI)
</span><span class="cx"> m_private->addTrack(&track.privateTrack(), MediaStreamPrivate::NotifyClientOption::DontNotify);
</span><span class="lines">@@ -231,7 +231,7 @@
</span><span class="cx"> if (!track)
</span><span class="cx"> return false;
</span><span class="cx">
</span><del>- track->removeObserver(this);
</del><ins>+ track->removeObserver(*this);
</ins><span class="cx">
</span><span class="cx"> if (streamModifier == StreamModifier::DomAPI)
</span><span class="cx"> m_private->removeTrack(track->privateTrack(), MediaStreamPrivate::NotifyClientOption::DontNotify);
</span></span></pre></div>
<a id="trunkSourceWebCoreModulesmediastreamMediaStreamTrackcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/mediastream/MediaStreamTrack.cpp (209863 => 209864)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/mediastream/MediaStreamTrack.cpp 2016-12-15 16:53:38 UTC (rev 209863)
+++ trunk/Source/WebCore/Modules/mediastream/MediaStreamTrack.cpp 2016-12-15 17:25:53 UTC (rev 209864)
</span><span class="lines">@@ -158,49 +158,40 @@
</span><span class="cx"> return m_private->capabilities();
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void MediaStreamTrack::applyConstraints(Ref<MediaConstraints>&& constraints, DOMPromise<void>&& promise)
</del><ins>+static Ref<MediaConstraintsImpl> createMediaConstraintsImpl(const std::optional<MediaTrackConstraints>& constraints)
</ins><span class="cx"> {
</span><del>- if (!constraints->isValid()) {
- promise.reject(TypeError);
- return;
- }
</del><ins>+ if (!constraints)
+ return MediaConstraintsImpl::create({ }, { }, true);
+ return createMediaConstraintsImpl(constraints.value());
+}
</ins><span class="cx">
</span><del>- m_constraints = WTFMove(constraints);
</del><ins>+void MediaStreamTrack::applyConstraints(const std::optional<MediaTrackConstraints>& constraints, DOMPromise<void>&& promise)
+{
</ins><span class="cx"> m_promise = WTFMove(promise);
</span><span class="cx">
</span><del>- applyConstraints(*m_constraints);
-}
-
-void MediaStreamTrack::applyConstraints(const MediaConstraints& constraints)
-{
</del><span class="cx"> auto weakThis = createWeakPtr();
</span><del>- std::function<void(const String&, const String&)> failureHandler = [weakThis](const String& failedConstraint, const String& message) {
</del><ins>+ auto failureHandler = [weakThis] (const String& failedConstraint, const String& message) {
</ins><span class="cx"> if (!weakThis || !weakThis->m_promise)
</span><span class="cx"> return;
</span><del>-
</del><span class="cx"> weakThis->m_promise->rejectType<IDLInterface<OverconstrainedError>>(OverconstrainedError::create(failedConstraint, message).get());
</span><span class="cx"> };
</span><del>-
- std::function<void()> successHandler = [weakThis]() {
</del><ins>+ auto successHandler = [weakThis, constraints] () {
</ins><span class="cx"> if (!weakThis || !weakThis->m_promise)
</span><span class="cx"> return;
</span><del>-
</del><span class="cx"> weakThis->m_promise->resolve();
</span><ins>+ weakThis->m_constraints = constraints.value_or(MediaTrackConstraints { });
</ins><span class="cx"> };
</span><del>-
- m_private->applyConstraints(constraints, successHandler, failureHandler);
</del><ins>+ m_private->applyConstraints(createMediaConstraintsImpl(constraints), successHandler, failureHandler);
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-void MediaStreamTrack::addObserver(MediaStreamTrack::Observer* observer)
</del><ins>+void MediaStreamTrack::addObserver(Observer& observer)
</ins><span class="cx"> {
</span><del>- m_observers.append(observer);
</del><ins>+ m_observers.append(&observer);
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-void MediaStreamTrack::removeObserver(MediaStreamTrack::Observer* observer)
</del><ins>+void MediaStreamTrack::removeObserver(Observer& observer)
</ins><span class="cx"> {
</span><del>- size_t pos = m_observers.find(observer);
- if (pos != notFound)
- m_observers.remove(pos);
</del><ins>+ m_observers.removeFirst(&observer);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void MediaStreamTrack::trackEnded(MediaStreamTrackPrivate&)
</span></span></pre></div>
<a id="trunkSourceWebCoreModulesmediastreamMediaStreamTrackh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/mediastream/MediaStreamTrack.h (209863 => 209864)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/mediastream/MediaStreamTrack.h 2016-12-15 16:53:38 UTC (rev 209863)
+++ trunk/Source/WebCore/Modules/mediastream/MediaStreamTrack.h 2016-12-15 17:25:53 UTC (rev 209864)
</span><span class="lines">@@ -33,13 +33,7 @@
</span><span class="cx"> #include "EventTarget.h"
</span><span class="cx"> #include "JSDOMPromise.h"
</span><span class="cx"> #include "MediaStreamTrackPrivate.h"
</span><del>-#include "RealtimeMediaSource.h"
-#include "ScriptWrappable.h"
-#include <wtf/Optional.h>
-#include <wtf/RefPtr.h>
-#include <wtf/Vector.h>
-#include <wtf/WeakPtr.h>
-#include <wtf/text/WTFString.h>
</del><ins>+#include "MediaTrackConstraints.h"
</ins><span class="cx">
</span><span class="cx"> namespace WebCore {
</span><span class="cx">
</span><span class="lines">@@ -47,6 +41,8 @@
</span><span class="cx"> class MediaConstraints;
</span><span class="cx"> class MediaSourceSettings;
</span><span class="cx">
</span><ins>+struct MediaTrackConstraints;
+
</ins><span class="cx"> class MediaStreamTrack final : public RefCounted<MediaStreamTrack>, public ActiveDOMObject, public EventTargetWithInlineData, private MediaStreamTrackPrivate::Observer {
</span><span class="cx"> public:
</span><span class="cx"> class Observer {
</span><span class="lines">@@ -80,8 +76,8 @@
</span><span class="cx"> RefPtr<MediaSourceSettings> getSettings() const;
</span><span class="cx"> RefPtr<RealtimeMediaSourceCapabilities> getCapabilities() const;
</span><span class="cx">
</span><del>- void applyConstraints(Ref<MediaConstraints>&&, DOMPromise<void>&&);
- void applyConstraints(const MediaConstraints&);
</del><ins>+ const MediaTrackConstraints& getConstraints() const { return m_constraints; }
+ void applyConstraints(const std::optional<MediaTrackConstraints>&, DOMPromise<void>&&);
</ins><span class="cx">
</span><span class="cx"> RealtimeMediaSource& source() { return m_private->source(); }
</span><span class="cx"> MediaStreamTrackPrivate& privateTrack() { return m_private.get(); }
</span><span class="lines">@@ -88,16 +84,12 @@
</span><span class="cx">
</span><span class="cx"> AudioSourceProvider* audioSourceProvider();
</span><span class="cx">
</span><del>- void addObserver(Observer*);
- void removeObserver(Observer*);
</del><ins>+ void addObserver(Observer&);
+ void removeObserver(Observer&);
</ins><span class="cx">
</span><del>- // EventTarget
- EventTargetInterface eventTargetInterface() const final { return MediaStreamTrackEventTargetInterfaceType; }
- ScriptExecutionContext* scriptExecutionContext() const final { return ActiveDOMObject::scriptExecutionContext(); }
</del><ins>+ using RefCounted::ref;
+ using RefCounted::deref;
</ins><span class="cx">
</span><del>- using RefCounted<MediaStreamTrack>::ref;
- using RefCounted<MediaStreamTrack>::deref;
-
</del><span class="cx"> private:
</span><span class="cx"> MediaStreamTrack(ScriptExecutionContext&, Ref<MediaStreamTrackPrivate>&&);
</span><span class="cx"> explicit MediaStreamTrack(MediaStreamTrack&);
</span><span class="lines">@@ -112,6 +104,8 @@
</span><span class="cx"> // EventTarget
</span><span class="cx"> void refEventTarget() final { ref(); }
</span><span class="cx"> void derefEventTarget() final { deref(); }
</span><ins>+ EventTargetInterface eventTargetInterface() const final { return MediaStreamTrackEventTargetInterfaceType; }
+ ScriptExecutionContext* scriptExecutionContext() const final { return ActiveDOMObject::scriptExecutionContext(); }
</ins><span class="cx">
</span><span class="cx"> // MediaStreamTrackPrivate::Observer
</span><span class="cx"> void trackEnded(MediaStreamTrackPrivate&) override;
</span><span class="lines">@@ -124,7 +118,7 @@
</span><span class="cx"> Vector<Observer*> m_observers;
</span><span class="cx"> Ref<MediaStreamTrackPrivate> m_private;
</span><span class="cx">
</span><del>- RefPtr<MediaConstraints> m_constraints;
</del><ins>+ MediaTrackConstraints m_constraints;
</ins><span class="cx"> std::optional<DOMPromise<void>> m_promise;
</span><span class="cx"> WeakPtrFactory<MediaStreamTrack> m_weakPtrFactory;
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCoreModulesmediastreamMediaStreamTrackidl"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/mediastream/MediaStreamTrack.idl (209863 => 209864)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/mediastream/MediaStreamTrack.idl 2016-12-15 16:53:38 UTC (rev 209863)
+++ trunk/Source/WebCore/Modules/mediastream/MediaStreamTrack.idl 2016-12-15 17:25:53 UTC (rev 209864)
</span><span class="lines">@@ -47,11 +47,10 @@
</span><span class="cx"> MediaStreamTrack clone();
</span><span class="cx"> [ImplementedAs=stopProducingData] void stop();
</span><span class="cx">
</span><del>- [Custom] MediaTrackConstraints getConstraints();
</del><ins>+ MediaTrackConstraints getConstraints();
</ins><span class="cx"> [Custom] MediaSourceSettings getSettings();
</span><span class="cx"> [Custom] MediaTrackCapabilities getCapabilities();
</span><del>- [Custom] Promise<void> applyConstraints(optional MediaTrackConstraints constraints);
</del><ins>+ Promise<void> applyConstraints(optional MediaTrackConstraints constraints);
</ins><span class="cx">
</span><span class="cx"> attribute EventHandler onoverconstrained;
</span><span class="cx"> };
</span><del>-
</del></span></pre></div>
<a id="trunkSourceWebCoreModulesmediastreamMediaTrackConstraintscpp"></a>
<div class="addfile"><h4>Added: trunk/Source/WebCore/Modules/mediastream/MediaTrackConstraints.cpp (0 => 209864)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/mediastream/MediaTrackConstraints.cpp (rev 0)
+++ trunk/Source/WebCore/Modules/mediastream/MediaTrackConstraints.cpp 2016-12-15 17:25:53 UTC (rev 209864)
</span><span class="lines">@@ -0,0 +1,200 @@
</span><ins>+/*
+ * Copyright (C) 2016 Apple Inc. All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY APPLE INC. AND ITS CONTRIBUTORS ``AS IS'' AND ANY
+ * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ * DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR ITS CONTRIBUTORS BE LIABLE FOR ANY
+ * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
+ * ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#include "config.h"
+#include "MediaTrackConstraints.h"
+
+#if ENABLE(MEDIA_STREAM)
+
+#include "MediaConstraintsImpl.h"
+
+namespace WebCore {
+
+enum class ConstraintSetType { Mandatory, Advanced };
+
+static void set(MediaTrackConstraintSetMap& map, ConstraintSetType setType, const char* typeAsString, MediaConstraintType type, const ConstrainLong& value)
+{
+ IntConstraint constraint(typeAsString, type);
+ WTF::switchOn(value,
+ [&] (int integer) {
+ if (setType == ConstraintSetType::Mandatory)
+ constraint.setIdeal(integer);
+ else
+ constraint.setExact(integer);
+ },
+ [&] (const ConstrainLongRange& range) {
+ if (range.min)
+ constraint.setMin(range.min.value());
+ if (range.max)
+ constraint.setMax(range.max.value());
+ if (range.exact)
+ constraint.setExact(range.exact.value());
+ if (range.ideal)
+ constraint.setIdeal(range.ideal.value());
+ }
+ );
+ map.set(type, WTFMove(constraint));
+}
+
+static void set(MediaTrackConstraintSetMap& map, ConstraintSetType setType, const char* typeAsString, MediaConstraintType type, const ConstrainDouble& value)
+{
+ DoubleConstraint constraint(typeAsString, type);
+ WTF::switchOn(value,
+ [&] (double number) {
+ if (setType == ConstraintSetType::Mandatory)
+ constraint.setIdeal(number);
+ else
+ constraint.setExact(number);
+ },
+ [&] (const ConstrainDoubleRange& range) {
+ if (range.min)
+ constraint.setMin(range.min.value());
+ if (range.max)
+ constraint.setMax(range.max.value());
+ if (range.exact)
+ constraint.setExact(range.exact.value());
+ if (range.ideal)
+ constraint.setIdeal(range.ideal.value());
+ }
+ );
+ map.set(type, WTFMove(constraint));
+}
+
+static void set(MediaTrackConstraintSetMap& map, ConstraintSetType setType, const char* typeAsString, MediaConstraintType type, const ConstrainBoolean& value)
+{
+ BooleanConstraint constraint(typeAsString, type);
+ WTF::switchOn(value,
+ [&] (bool boolean) {
+ if (setType == ConstraintSetType::Mandatory)
+ constraint.setIdeal(boolean);
+ else
+ constraint.setExact(boolean);
+ },
+ [&] (const ConstrainBooleanParameters& parameters) {
+ if (parameters.exact)
+ constraint.setExact(parameters.exact.value());
+ if (parameters.ideal)
+ constraint.setIdeal(parameters.ideal.value());
+ }
+ );
+ map.set(type, WTFMove(constraint));
+}
+
+static void set(MediaTrackConstraintSetMap& map, ConstraintSetType setType, const char* typeAsString, MediaConstraintType type, const ConstrainDOMString& value)
+{
+ StringConstraint constraint(typeAsString, type);
+ WTF::switchOn(value,
+ [&] (const String& string) {
+ if (setType == ConstraintSetType::Mandatory)
+ constraint.appendIdeal(string);
+ else
+ constraint.appendExact(string);
+ },
+ [&] (const Vector<String>& vector) {
+ if (setType == ConstraintSetType::Mandatory) {
+ for (auto& string : vector)
+ constraint.appendIdeal(string);
+ } else {
+ for (auto& string : vector)
+ constraint.appendExact(string);
+ }
+ },
+ [&] (const ConstrainDOMStringParameters& parameters) {
+ if (parameters.exact) {
+ WTF::switchOn(parameters.exact.value(),
+ [&] (const String& string) {
+ constraint.appendExact(string);
+ },
+ [&] (const Vector<String>& vector) {
+ for (auto& string : vector)
+ constraint.appendExact(string);
+ }
+ );
+ }
+ if (parameters.ideal) {
+ WTF::switchOn(parameters.ideal.value(),
+ [&] (const String& string) {
+ constraint.appendIdeal(string);
+ },
+ [&] (const Vector<String>& vector) {
+ for (auto& string : vector)
+ constraint.appendIdeal(string);
+ }
+ );
+ }
+ }
+ );
+ map.set(type, WTFMove(constraint));
+}
+
+template<typename T> static inline void set(MediaTrackConstraintSetMap& map, ConstraintSetType setType, const char* typeAsString, MediaConstraintType type, const std::optional<T>& value)
+{
+ if (!value)
+ return;
+ set(map, setType, typeAsString, type, value.value());
+}
+
+static MediaTrackConstraintSetMap convertToInternalForm(ConstraintSetType setType, const MediaTrackConstraintSet& constraintSet)
+{
+ MediaTrackConstraintSetMap result;
+ set(result, setType, "width", MediaConstraintType::Width, constraintSet.width);
+ set(result, setType, "height", MediaConstraintType::Height, constraintSet.height);
+ set(result, setType, "aspectRatio", MediaConstraintType::AspectRatio, constraintSet.aspectRatio);
+ set(result, setType, "frameRate", MediaConstraintType::FrameRate, constraintSet.frameRate);
+ set(result, setType, "facingMode", MediaConstraintType::FacingMode, constraintSet.facingMode);
+ set(result, setType, "volume", MediaConstraintType::Volume, constraintSet.volume);
+ set(result, setType, "sampleRate", MediaConstraintType::SampleRate, constraintSet.sampleRate);
+ set(result, setType, "sampleSize", MediaConstraintType::SampleSize, constraintSet.sampleSize);
+ set(result, setType, "echoCancellation", MediaConstraintType::EchoCancellation, constraintSet.echoCancellation);
+ // FIXME: add latency
+ // FIXME: add channelCount
+ set(result, setType, "deviceId", MediaConstraintType::DeviceId, constraintSet.deviceId);
+ set(result, setType, "groupId", MediaConstraintType::GroupId, constraintSet.groupId);
+ return result;
+}
+
+static Vector<MediaTrackConstraintSetMap> convertAdvancedToInternalForm(const Vector<MediaTrackConstraintSet>& vector)
+{
+ Vector<MediaTrackConstraintSetMap> result;
+ result.reserveInitialCapacity(vector.size());
+ for (auto& set : vector)
+ result.uncheckedAppend(convertToInternalForm(ConstraintSetType::Advanced, set));
+ return result;
+}
+
+static Vector<MediaTrackConstraintSetMap> convertAdvancedToInternalForm(const std::optional<Vector<MediaTrackConstraintSet>>& optionalVector)
+{
+ if (!optionalVector)
+ return { };
+ return convertAdvancedToInternalForm(optionalVector.value());
+}
+
+Ref<MediaConstraintsImpl> createMediaConstraintsImpl(const MediaTrackConstraints& constraints)
+{
+ return MediaConstraintsImpl::create(convertToInternalForm(ConstraintSetType::Mandatory, constraints), convertAdvancedToInternalForm(constraints.advanced), true);
+}
+
+}
+
+#endif
</ins></span></pre></div>
<a id="trunkSourceWebCoreModulesmediastreamMediaTrackConstraintsh"></a>
<div class="addfile"><h4>Added: trunk/Source/WebCore/Modules/mediastream/MediaTrackConstraints.h (0 => 209864)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/mediastream/MediaTrackConstraints.h (rev 0)
+++ trunk/Source/WebCore/Modules/mediastream/MediaTrackConstraints.h 2016-12-15 17:25:53 UTC (rev 209864)
</span><span class="lines">@@ -0,0 +1,97 @@
</span><ins>+/*
+ * Copyright (C) 2016 Apple Inc. All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY APPLE INC. AND ITS CONTRIBUTORS ``AS IS'' AND ANY
+ * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ * DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR ITS CONTRIBUTORS BE LIABLE FOR ANY
+ * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
+ * ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#pragma once
+
+#if ENABLE(MEDIA_STREAM)
+
+#include <wtf/Optional.h>
+#include <wtf/Variant.h>
+#include <wtf/Vector.h>
+#include <wtf/text/WTFString.h>
+
+namespace WebCore {
+
+class MediaConstraintsImpl;
+
+struct DoubleRange {
+ std::optional<double> min;
+ std::optional<double> max;
+};
+
+struct LongRange {
+ std::optional<int> max;
+ std::optional<int> min;
+};
+
+struct ConstrainBooleanParameters {
+ std::optional<bool> exact;
+ std::optional<bool> ideal;
+};
+
+struct ConstrainDOMStringParameters {
+ std::optional<Variant<String, Vector<String>>> exact;
+ std::optional<Variant<String, Vector<String>>> ideal;
+};
+
+struct ConstrainDoubleRange : DoubleRange {
+ std::optional<double> exact;
+ std::optional<double> ideal;
+};
+
+struct ConstrainLongRange : LongRange {
+ std::optional<int> exact;
+ std::optional<int> ideal;
+};
+
+using ConstrainBoolean = Variant<bool, ConstrainBooleanParameters>;
+using ConstrainDOMString = Variant<String, Vector<String>, ConstrainDOMStringParameters>;
+using ConstrainDouble = Variant<double, ConstrainDoubleRange>;
+using ConstrainLong = Variant<int, ConstrainLongRange>;
+
+struct MediaTrackConstraintSet {
+ std::optional<ConstrainLong> width;
+ std::optional<ConstrainLong> height;
+ std::optional<ConstrainDouble> aspectRatio;
+ std::optional<ConstrainDouble> frameRate;
+ std::optional<ConstrainDOMString> facingMode;
+ std::optional<ConstrainDouble> volume;
+ std::optional<ConstrainLong> sampleRate;
+ std::optional<ConstrainLong> sampleSize;
+ std::optional<ConstrainBoolean> echoCancellation;
+ std::optional<ConstrainDouble> latency;
+ std::optional<ConstrainLong> channelCount;
+ std::optional<ConstrainDOMString> deviceId;
+ std::optional<ConstrainDOMString> groupId;
+};
+
+struct MediaTrackConstraints : MediaTrackConstraintSet {
+ std::optional<Vector<MediaTrackConstraintSet>> advanced;
+};
+
+Ref<MediaConstraintsImpl> createMediaConstraintsImpl(const MediaTrackConstraints&);
+
+}
+
+#endif
</ins></span></pre></div>
<a id="trunkSourceWebCoreModulesmediastreamMediaTrackConstraintsidl"></a>
<div class="addfile"><h4>Added: trunk/Source/WebCore/Modules/mediastream/MediaTrackConstraints.idl (0 => 209864)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/mediastream/MediaTrackConstraints.idl (rev 0)
+++ trunk/Source/WebCore/Modules/mediastream/MediaTrackConstraints.idl 2016-12-15 17:25:53 UTC (rev 209864)
</span><span class="lines">@@ -0,0 +1,91 @@
</span><ins>+/*
+ * Copyright (C) 2016 Apple Inc. All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY APPLE INC. AND ITS CONTRIBUTORS ``AS IS'' AND ANY
+ * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ * DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR ITS CONTRIBUTORS BE LIABLE FOR ANY
+ * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
+ * ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+[
+ Conditional=MEDIA_STREAM,
+ JSGenerateToJSObject,
+] dictionary MediaTrackConstraints : MediaTrackConstraintSet {
+ sequence<MediaTrackConstraintSet> advanced;
+};
+
+[
+ JSGenerateToJSObject,
+] dictionary MediaTrackConstraintSet {
+ ConstrainLong width;
+ ConstrainLong height;
+ ConstrainDouble aspectRatio;
+ ConstrainDouble frameRate;
+ ConstrainDOMString facingMode;
+ ConstrainDouble volume;
+ ConstrainLong sampleRate;
+ ConstrainLong sampleSize;
+ ConstrainBoolean echoCancellation;
+ ConstrainDouble latency;
+ ConstrainLong channelCount;
+ ConstrainDOMString deviceId;
+ ConstrainDOMString groupId;
+};
+
+typedef (double or ConstrainDoubleRange) ConstrainDouble;
+typedef (long or ConstrainLongRange) ConstrainLong;
+typedef (boolean or ConstrainBooleanParameters) ConstrainBoolean;
+typedef (DOMString or sequence<DOMString> or ConstrainDOMStringParameters) ConstrainDOMString;
+
+[
+ JSGenerateToJSObject,
+] dictionary ConstrainBooleanParameters {
+ boolean exact;
+ boolean ideal;
+};
+
+[
+ JSGenerateToJSObject,
+] dictionary ConstrainDOMStringParameters {
+ (DOMString or sequence<DOMString>) exact;
+ (DOMString or sequence<DOMString>) ideal;
+};
+
+[
+ JSGenerateToJSObject,
+] dictionary ConstrainDoubleRange : DoubleRange {
+ double exact;
+ double ideal;
+};
+
+[
+ JSGenerateToJSObject,
+] dictionary ConstrainLongRange : LongRange {
+ long exact;
+ long ideal;
+};
+
+dictionary DoubleRange {
+ double max;
+ double min;
+};
+
+dictionary LongRange {
+ long max;
+ long min;
+};
</ins></span></pre></div>
<a id="trunkSourceWebCoreModulesmediastreamUserMediaRequestcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/mediastream/UserMediaRequest.cpp (209863 => 209864)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/mediastream/UserMediaRequest.cpp 2016-12-15 16:53:38 UTC (rev 209863)
+++ trunk/Source/WebCore/Modules/mediastream/UserMediaRequest.cpp 2016-12-15 17:25:53 UTC (rev 209864)
</span><span class="lines">@@ -36,24 +36,20 @@
</span><span class="cx">
</span><span class="cx"> #if ENABLE(MEDIA_STREAM)
</span><span class="cx">
</span><ins>+#include "Document.h"
</ins><span class="cx"> #include "DocumentLoader.h"
</span><span class="cx"> #include "ExceptionCode.h"
</span><del>-#include "Frame.h"
</del><span class="cx"> #include "JSMediaStream.h"
</span><span class="cx"> #include "JSOverconstrainedError.h"
</span><span class="cx"> #include "MainFrame.h"
</span><del>-#include "MediaStream.h"
-#include "MediaStreamPrivate.h"
-#include "OverconstrainedError.h"
</del><ins>+#include "MediaConstraintsImpl.h"
</ins><span class="cx"> #include "RealtimeMediaSourceCenter.h"
</span><del>-#include "SecurityOrigin.h"
</del><span class="cx"> #include "Settings.h"
</span><span class="cx"> #include "UserMediaController.h"
</span><del>-#include <wtf/MainThread.h>
</del><span class="cx">
</span><span class="cx"> namespace WebCore {
</span><span class="cx">
</span><del>-ExceptionOr<void> UserMediaRequest::start(Document& document, Ref<MediaConstraintsImpl>&& audioConstraints, Ref<MediaConstraintsImpl>&& videoConstraints, MediaDevices::Promise&& promise)
</del><ins>+ExceptionOr<void> UserMediaRequest::start(Document& document, Ref<MediaConstraintsImpl>&& audioConstraints, Ref<MediaConstraintsImpl>&& videoConstraints, DOMPromise<IDLInterface<MediaStream>>&& promise)
</ins><span class="cx"> {
</span><span class="cx"> auto* userMedia = UserMediaController::from(document.page());
</span><span class="cx"> if (!userMedia)
</span><span class="lines">@@ -68,7 +64,7 @@
</span><span class="cx"> return { };
</span><span class="cx"> }
</span><span class="cx">
</span><del>-UserMediaRequest::UserMediaRequest(Document& document, UserMediaController& controller, Ref<MediaConstraintsImpl>&& audioConstraints, Ref<MediaConstraintsImpl>&& videoConstraints, MediaDevices::Promise&& promise)
</del><ins>+UserMediaRequest::UserMediaRequest(Document& document, UserMediaController& controller, Ref<MediaConstraintsImpl>&& audioConstraints, Ref<MediaConstraintsImpl>&& videoConstraints, DOMPromise<IDLInterface<MediaStream>>&& promise)
</ins><span class="cx"> : ContextDestructionObserver(&document)
</span><span class="cx"> , m_audioConstraints(WTFMove(audioConstraints))
</span><span class="cx"> , m_videoConstraints(WTFMove(videoConstraints))
</span><span class="lines">@@ -85,7 +81,6 @@
</span><span class="cx"> {
</span><span class="cx"> if (!m_scriptExecutionContext)
</span><span class="cx"> return nullptr;
</span><del>-
</del><span class="cx"> return m_scriptExecutionContext->securityOrigin();
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -93,19 +88,15 @@
</span><span class="cx"> {
</span><span class="cx"> if (!m_scriptExecutionContext)
</span><span class="cx"> return nullptr;
</span><del>-
</del><span class="cx"> return m_scriptExecutionContext->topOrigin();
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> static bool isSecure(DocumentLoader& documentLoader)
</span><span class="cx"> {
</span><del>- if (!documentLoader.response().url().protocolIs("https"))
- return false;
-
- if (!documentLoader.response().certificateInfo() || documentLoader.response().certificateInfo()->containsNonRootSHA1SignedCertificate())
- return false;
-
- return true;
</del><ins>+ auto& response = documentLoader.response();
+ return response.url().protocolIs("https")
+ && response.certificateInfo()
+ && !response.certificateInfo()->containsNonRootSHA1SignedCertificate();
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> static bool canCallGetUserMedia(Document& document, String& errorMessage)
</span><span class="lines">@@ -149,7 +140,6 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> Document& document = downcast<Document>(*m_scriptExecutionContext);
</span><del>- DOMWindow& window = *document.domWindow();
</del><span class="cx">
</span><span class="cx"> // 10.2 - 6.3 Optionally, e.g., based on a previously-established user preference, for security reasons,
</span><span class="cx"> // or due to platform limitations, jump to the step labeled Permission Failure below.
</span><span class="lines">@@ -156,7 +146,7 @@
</span><span class="cx"> String errorMessage;
</span><span class="cx"> if (!canCallGetUserMedia(document, errorMessage)) {
</span><span class="cx"> deny(MediaAccessDenialReason::PermissionDenied, emptyString());
</span><del>- window.printErrorMessage(errorMessage);
</del><ins>+ document.domWindow()->printErrorMessage(errorMessage);
</ins><span class="cx"> return;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -230,7 +220,6 @@
</span><span class="cx"> {
</span><span class="cx"> ContextDestructionObserver::contextDestroyed();
</span><span class="cx"> Ref<UserMediaRequest> protectedThis(*this);
</span><del>-
</del><span class="cx"> if (m_controller) {
</span><span class="cx"> m_controller->cancelUserMediaAccessRequest(*this);
</span><span class="cx"> m_controller = nullptr;
</span><span class="lines">@@ -239,9 +228,6 @@
</span><span class="cx">
</span><span class="cx"> Document* UserMediaRequest::document() const
</span><span class="cx"> {
</span><del>- if (!m_scriptExecutionContext)
- return nullptr;
-
</del><span class="cx"> return downcast<Document>(m_scriptExecutionContext);
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCoreModulesmediastreamUserMediaRequesth"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/mediastream/UserMediaRequest.h (209863 => 209864)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/mediastream/UserMediaRequest.h 2016-12-15 16:53:38 UTC (rev 209863)
+++ trunk/Source/WebCore/Modules/mediastream/UserMediaRequest.h 2016-12-15 17:25:53 UTC (rev 209864)
</span><span class="lines">@@ -35,20 +35,18 @@
</span><span class="cx"> #if ENABLE(MEDIA_STREAM)
</span><span class="cx">
</span><span class="cx"> #include "ActiveDOMObject.h"
</span><del>-#include "Document.h"
-#include "MediaConstraintsImpl.h"
-#include "MediaDevices.h"
</del><ins>+#include "JSDOMPromise.h"
</ins><span class="cx">
</span><span class="cx"> namespace WebCore {
</span><span class="cx">
</span><del>-class MediaConstraints;
-class MediaStreamPrivate;
</del><ins>+class MediaConstraintsImpl;
+class MediaStream;
+class SecurityOrigin;
</ins><span class="cx"> class UserMediaController;
</span><del>-class SecurityOrigin;
</del><span class="cx">
</span><span class="cx"> class UserMediaRequest : public RefCounted<UserMediaRequest>, private ContextDestructionObserver {
</span><span class="cx"> public:
</span><del>- static ExceptionOr<void> start(Document&, Ref<MediaConstraintsImpl>&& audioConstraints, Ref<MediaConstraintsImpl>&& videoConstraints, MediaDevices::Promise&&);
</del><ins>+ static ExceptionOr<void> start(Document&, Ref<MediaConstraintsImpl>&& audioConstraints, Ref<MediaConstraintsImpl>&& videoConstraints, DOMPromise<IDLInterface<MediaStream>>&&);
</ins><span class="cx">
</span><span class="cx"> virtual ~UserMediaRequest();
</span><span class="cx">
</span><span class="lines">@@ -74,7 +72,7 @@
</span><span class="cx"> WEBCORE_EXPORT Document* document() const;
</span><span class="cx">
</span><span class="cx"> private:
</span><del>- UserMediaRequest(Document&, UserMediaController&, Ref<MediaConstraintsImpl>&& audioConstraints, Ref<MediaConstraintsImpl>&& videoConstraints, MediaDevices::Promise&&);
</del><ins>+ UserMediaRequest(Document&, UserMediaController&, Ref<MediaConstraintsImpl>&& audioConstraints, Ref<MediaConstraintsImpl>&& videoConstraints, DOMPromise<IDLInterface<MediaStream>>&&);
</ins><span class="cx">
</span><span class="cx"> void contextDestroyed() final;
</span><span class="cx">
</span><span class="lines">@@ -88,7 +86,7 @@
</span><span class="cx"> String m_allowedAudioDeviceUID;
</span><span class="cx">
</span><span class="cx"> UserMediaController* m_controller;
</span><del>- MediaDevices::Promise m_promise;
</del><ins>+ DOMPromise<IDLInterface<MediaStream>> m_promise;
</ins><span class="cx"> RefPtr<UserMediaRequest> m_protector;
</span><span class="cx"> };
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCoreWebCorexcodeprojprojectpbxproj"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/WebCore.xcodeproj/project.pbxproj (209863 => 209864)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/WebCore.xcodeproj/project.pbxproj 2016-12-15 16:53:38 UTC (rev 209863)
+++ trunk/Source/WebCore/WebCore.xcodeproj/project.pbxproj 2016-12-15 17:25:53 UTC (rev 209864)
</span><span class="lines">@@ -125,7 +125,6 @@
</span><span class="cx"> 07277E5417D018CC0015534D /* JSMediaStreamTrackEvent.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 07277E4817D018CC0015534D /* JSMediaStreamTrackEvent.cpp */; };
</span><span class="cx"> 07277E5517D018CC0015534D /* JSMediaStreamTrackEvent.h in Headers */ = {isa = PBXBuildFile; fileRef = 07277E4917D018CC0015534D /* JSMediaStreamTrackEvent.h */; };
</span><span class="cx"> 072A70401D6E8F6200DF0AFC /* OverconstrainedErrorEvent.h in Headers */ = {isa = PBXBuildFile; fileRef = 072A703E1D6E8F6200DF0AFC /* OverconstrainedErrorEvent.h */; };
</span><del>- 072A70431D7396B300DF0AFC /* JSMediaDevicesCustom.h in Headers */ = {isa = PBXBuildFile; fileRef = 072A70421D7396B200DF0AFC /* JSMediaDevicesCustom.h */; };
</del><span class="cx"> 072AE1E5183C0741000A5988 /* PluginReplacement.h in Headers */ = {isa = PBXBuildFile; fileRef = 072AE1DF183C0741000A5988 /* PluginReplacement.h */; settings = {ATTRIBUTES = (Private, ); }; };
</span><span class="cx"> 072AE1E6183C0741000A5988 /* QuickTimePluginReplacement.mm in Sources */ = {isa = PBXBuildFile; fileRef = 072AE1E0183C0741000A5988 /* QuickTimePluginReplacement.mm */; };
</span><span class="cx"> 072AE1E8183C0741000A5988 /* QuickTimePluginReplacement.h in Headers */ = {isa = PBXBuildFile; fileRef = 072AE1E2183C0741000A5988 /* QuickTimePluginReplacement.h */; };
</span><span class="lines">@@ -989,7 +988,6 @@
</span><span class="cx"> 1AFFC4591D5E866100267A66 /* PluginBlacklist.h in Headers */ = {isa = PBXBuildFile; fileRef = 1AFFC44F1D5E7EC700267A66 /* PluginBlacklist.h */; settings = {ATTRIBUTES = (Private, ); }; };
</span><span class="cx"> 1B124D8D1D380B7000ECDFB0 /* MediaSampleAVFObjC.h in Headers */ = {isa = PBXBuildFile; fileRef = 1B124D8C1D380B7000ECDFB0 /* MediaSampleAVFObjC.h */; };
</span><span class="cx"> 1B124D8F1D380BB600ECDFB0 /* MediaSampleAVFObjC.mm in Sources */ = {isa = PBXBuildFile; fileRef = 1B124D8E1D380BB600ECDFB0 /* MediaSampleAVFObjC.mm */; };
</span><del>- 1B88DD131D5B9E5000E3B7A4 /* JSMediaDevicesCustom.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1B88DD121D5AD3B200E3B7A4 /* JSMediaDevicesCustom.cpp */; };
</del><span class="cx"> 1BE5BFC21D515715001666D9 /* MediaConstraints.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1BE5BFC11D515715001666D9 /* MediaConstraints.cpp */; };
</span><span class="cx"> 1BF9DB3C1D3973AD0026AEB7 /* MediaSample.h in Headers */ = {isa = PBXBuildFile; fileRef = CD641EC7181ED60100EE4C41 /* MediaSample.h */; settings = {ATTRIBUTES = (Private, ); }; };
</span><span class="cx"> 1C010700192594DF008A4201 /* InlineTextBoxStyle.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1C0106FE192594DF008A4201 /* InlineTextBoxStyle.cpp */; };
</span><span class="lines">@@ -3261,6 +3259,10 @@
</span><span class="cx"> 9327A94209968D1A0068A546 /* HTMLOptionsCollection.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 9327A94109968D1A0068A546 /* HTMLOptionsCollection.cpp */; };
</span><span class="cx"> 932AD70517EFA2C30038F8FF /* MainFrame.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 932AD70317EFA2C30038F8FF /* MainFrame.cpp */; };
</span><span class="cx"> 932AD70617EFA2C40038F8FF /* MainFrame.h in Headers */ = {isa = PBXBuildFile; fileRef = 932AD70417EFA2C30038F8FF /* MainFrame.h */; settings = {ATTRIBUTES = (Private, ); }; };
</span><ins>+ 932CC0B71DFFD158004C0F9F /* MediaTrackConstraints.h in Headers */ = {isa = PBXBuildFile; fileRef = 932CC0B61DFFD158004C0F9F /* MediaTrackConstraints.h */; };
+ 932CC0D41DFFD667004C0F9F /* JSMediaTrackConstraints.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 932CC0D01DFFD667004C0F9F /* JSMediaTrackConstraints.cpp */; };
+ 932CC0D51DFFD667004C0F9F /* JSMediaTrackConstraints.h in Headers */ = {isa = PBXBuildFile; fileRef = 932CC0D11DFFD667004C0F9F /* JSMediaTrackConstraints.h */; };
+ 932CC0F71DFFDA1F004C0F9F /* MediaTrackConstraints.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 932CC0F61DFFDA1F004C0F9F /* MediaTrackConstraints.cpp */; };
</ins><span class="cx"> 932E16090AF578340025F408 /* FrameLoader.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 932E16080AF578340025F408 /* FrameLoader.cpp */; };
</span><span class="cx"> 93309DD6099E64920056E581 /* AppendNodeCommand.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 93309D87099E64910056E581 /* AppendNodeCommand.cpp */; };
</span><span class="cx"> 93309DD7099E64920056E581 /* AppendNodeCommand.h in Headers */ = {isa = PBXBuildFile; fileRef = 93309D88099E64910056E581 /* AppendNodeCommand.h */; };
</span><span class="lines">@@ -7115,7 +7117,6 @@
</span><span class="cx"> 072847E216EBC5B00043CFA4 /* PlatformTextTrack.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = PlatformTextTrack.h; sourceTree = "<group>"; };
</span><span class="cx"> 072A703E1D6E8F6200DF0AFC /* OverconstrainedErrorEvent.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = OverconstrainedErrorEvent.h; sourceTree = "<group>"; };
</span><span class="cx"> 072A703F1D6E8F6200DF0AFC /* OverconstrainedErrorEvent.idl */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = OverconstrainedErrorEvent.idl; sourceTree = "<group>"; };
</span><del>- 072A70421D7396B200DF0AFC /* JSMediaDevicesCustom.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = JSMediaDevicesCustom.h; sourceTree = "<group>"; };
</del><span class="cx"> 072AE1DF183C0741000A5988 /* PluginReplacement.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = PluginReplacement.h; sourceTree = "<group>"; };
</span><span class="cx"> 072AE1E0183C0741000A5988 /* QuickTimePluginReplacement.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = QuickTimePluginReplacement.mm; sourceTree = "<group>"; };
</span><span class="cx"> 072AE1E1183C0741000A5988 /* QuickTimePluginReplacement.css */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.css; path = QuickTimePluginReplacement.css; sourceTree = "<group>"; };
</span><span class="lines">@@ -8040,7 +8041,6 @@
</span><span class="cx"> 1AFFC4561D5E83A700267A66 /* CFUtilitiesSPI.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CFUtilitiesSPI.h; sourceTree = "<group>"; };
</span><span class="cx"> 1B124D8C1D380B7000ECDFB0 /* MediaSampleAVFObjC.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = MediaSampleAVFObjC.h; path = ../MediaSampleAVFObjC.h; sourceTree = "<group>"; };
</span><span class="cx"> 1B124D8E1D380BB600ECDFB0 /* MediaSampleAVFObjC.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = MediaSampleAVFObjC.mm; sourceTree = "<group>"; };
</span><del>- 1B88DD121D5AD3B200E3B7A4 /* JSMediaDevicesCustom.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; path = JSMediaDevicesCustom.cpp; sourceTree = "<group>"; };
</del><span class="cx"> 1BE5BFC11D515715001666D9 /* MediaConstraints.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = MediaConstraints.cpp; sourceTree = "<group>"; };
</span><span class="cx"> 1C0106FE192594DF008A4201 /* InlineTextBoxStyle.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = InlineTextBoxStyle.cpp; sourceTree = "<group>"; };
</span><span class="cx"> 1C0106FF192594DF008A4201 /* InlineTextBoxStyle.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = InlineTextBoxStyle.h; sourceTree = "<group>"; };
</span><span class="lines">@@ -10814,6 +10814,11 @@
</span><span class="cx"> 9327A94109968D1A0068A546 /* HTMLOptionsCollection.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = HTMLOptionsCollection.cpp; sourceTree = "<group>"; };
</span><span class="cx"> 932AD70317EFA2C30038F8FF /* MainFrame.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = MainFrame.cpp; sourceTree = "<group>"; };
</span><span class="cx"> 932AD70417EFA2C30038F8FF /* MainFrame.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MainFrame.h; sourceTree = "<group>"; };
</span><ins>+ 932CC0B61DFFD158004C0F9F /* MediaTrackConstraints.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MediaTrackConstraints.h; sourceTree = "<group>"; };
+ 932CC0D01DFFD667004C0F9F /* JSMediaTrackConstraints.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = JSMediaTrackConstraints.cpp; sourceTree = "<group>"; };
+ 932CC0D11DFFD667004C0F9F /* JSMediaTrackConstraints.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = JSMediaTrackConstraints.h; sourceTree = "<group>"; };
+ 932CC0F01DFFD8D4004C0F9F /* MediaTrackConstraints.idl */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = MediaTrackConstraints.idl; sourceTree = "<group>"; };
+ 932CC0F61DFFDA1F004C0F9F /* MediaTrackConstraints.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = MediaTrackConstraints.cpp; sourceTree = "<group>"; };
</ins><span class="cx"> 932E16080AF578340025F408 /* FrameLoader.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = FrameLoader.cpp; sourceTree = "<group>"; };
</span><span class="cx"> 93309D87099E64910056E581 /* AppendNodeCommand.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = AppendNodeCommand.cpp; sourceTree = "<group>"; };
</span><span class="cx"> 93309D88099E64910056E581 /* AppendNodeCommand.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = AppendNodeCommand.h; sourceTree = "<group>"; };
</span><span class="lines">@@ -15026,6 +15031,9 @@
</span><span class="cx"> 07221B5717CEC32700848E51 /* MediaStreamTrackEvent.cpp */,
</span><span class="cx"> 07221B5817CEC32700848E51 /* MediaStreamTrackEvent.h */,
</span><span class="cx"> 07221B5917CEC32700848E51 /* MediaStreamTrackEvent.idl */,
</span><ins>+ 932CC0F61DFFDA1F004C0F9F /* MediaTrackConstraints.cpp */,
+ 932CC0B61DFFD158004C0F9F /* MediaTrackConstraints.h */,
+ 932CC0F01DFFD8D4004C0F9F /* MediaTrackConstraints.idl */,
</ins><span class="cx"> 07C1C0E01BFB600100BD2256 /* MediaTrackSupportedConstraints.h */,
</span><span class="cx"> 07C1C0E11BFB600100BD2256 /* MediaTrackSupportedConstraints.idl */,
</span><span class="cx"> 5EA725CA1ACABCB500EAD17B /* NavigatorMediaDevices.cpp */,
</span><span class="lines">@@ -15238,6 +15246,8 @@
</span><span class="cx"> 07277E4717D018CC0015534D /* JSMediaStreamTrack.h */,
</span><span class="cx"> 07277E4817D018CC0015534D /* JSMediaStreamTrackEvent.cpp */,
</span><span class="cx"> 07277E4917D018CC0015534D /* JSMediaStreamTrackEvent.h */,
</span><ins>+ 932CC0D01DFFD667004C0F9F /* JSMediaTrackConstraints.cpp */,
+ 932CC0D11DFFD667004C0F9F /* JSMediaTrackConstraints.h */,
</ins><span class="cx"> 0787C4671BFBDF6F006DCD7F /* JSMediaTrackSupportedConstraints.cpp */,
</span><span class="cx"> 0787C4681BFBDF6F006DCD7F /* JSMediaTrackSupportedConstraints.h */,
</span><span class="cx"> 073BE33E17D17E01002BD431 /* JSNavigatorUserMedia.cpp */,
</span><span class="lines">@@ -22024,8 +22034,6 @@
</span><span class="cx"> A7D0318D0E93540300E24ACD /* JSImageDataCustom.cpp */,
</span><span class="cx"> 7A74ECBC101839DA00BF939E /* JSInspectorFrontendHostCustom.cpp */,
</span><span class="cx"> BCE1C43F0D9830F4003B02F2 /* JSLocationCustom.cpp */,
</span><del>- 1B88DD121D5AD3B200E3B7A4 /* JSMediaDevicesCustom.cpp */,
- 072A70421D7396B200DF0AFC /* JSMediaDevicesCustom.h */,
</del><span class="cx"> AD726FE716D9F204003A4E6D /* JSMediaListCustom.h */,
</span><span class="cx"> 07C59B6D17F794F6000FBCBB /* JSMediaStreamTrackCustom.cpp */,
</span><span class="cx"> 07C1C0E61BFB90A700BD2256 /* JSMediaTrackSupportedConstraintsCustom.cpp */,
</span><span class="lines">@@ -25522,6 +25530,7 @@
</span><span class="cx"> 062287840B4DB322000C34DF /* FocusDirection.h in Headers */,
</span><span class="cx"> B6D9D23514EABD260090D75E /* FocusEvent.h in Headers */,
</span><span class="cx"> B2C3DA650D006CD600EF6F26 /* Font.h in Headers */,
</span><ins>+ 932CC0B71DFFD158004C0F9F /* MediaTrackConstraints.h in Headers */,
</ins><span class="cx"> 1AC2D89D1B1E291F00D52E87 /* FontAntialiasingStateSaver.h in Headers */,
</span><span class="cx"> BCB92D4F1293550B00C8387F /* FontBaseline.h in Headers */,
</span><span class="cx"> B2C3DA630D006CD600EF6F26 /* FontCache.h in Headers */,
</span><span class="lines">@@ -26213,7 +26222,6 @@
</span><span class="cx"> CDAB6D2E17C814EE00C60B34 /* JSMediaControlsHost.h in Headers */,
</span><span class="cx"> 159741DB1B7D140100201C92 /* JSMediaDeviceInfo.h in Headers */,
</span><span class="cx"> 15739BBB1B42012D00D258C1 /* JSMediaDevices.h in Headers */,
</span><del>- 072A70431D7396B300DF0AFC /* JSMediaDevicesCustom.h in Headers */,
</del><span class="cx"> FD23A12613F5FA5900F67001 /* JSMediaElementAudioSourceNode.h in Headers */,
</span><span class="cx"> 2D9BF7121DBFD914007A7D99 /* JSMediaEncryptedEvent.h in Headers */,
</span><span class="cx"> E44614190CD6826900FADA75 /* JSMediaError.h in Headers */,
</span><span class="lines">@@ -28245,6 +28253,7 @@
</span><span class="cx"> 9BAF3B2412C1A39800014BF1 /* WritingDirection.h in Headers */,
</span><span class="cx"> 14476AA815DC4BB100305DB2 /* WritingMode.h in Headers */,
</span><span class="cx"> 6565820209D1508D000E61D7 /* XLinkNames.h in Headers */,
</span><ins>+ 932CC0D51DFFD667004C0F9F /* JSMediaTrackConstraints.h in Headers */,
</ins><span class="cx"> 830784B21C52EE2C00104D1D /* XMLDocument.h in Headers */,
</span><span class="cx"> 00B9318813BA8DBA0035A948 /* XMLDocumentParser.h in Headers */,
</span><span class="cx"> 00B9318C13BA8DCC0035A948 /* XMLDocumentParserScope.h in Headers */,
</span><span class="lines">@@ -28935,6 +28944,7 @@
</span><span class="cx"> 31BC742D1AAFF45C006B4340 /* CSSAnimationTriggerScrollValue.cpp in Sources */,
</span><span class="cx"> CAE9F90F146441F000C245B0 /* CSSAspectRatioValue.cpp in Sources */,
</span><span class="cx"> 94DE5C811D7F3A1400164F2A /* CSSAtRuleID.cpp in Sources */,
</span><ins>+ 932CC0F71DFFDA1F004C0F9F /* MediaTrackConstraints.cpp in Sources */,
</ins><span class="cx"> FBD6AF8B15EF25E5008B7110 /* CSSBasicShapes.cpp in Sources */,
</span><span class="cx"> E16A84F914C85CCC002977DF /* CSSBorderImage.cpp in Sources */,
</span><span class="cx"> BC274B31140EBED800EADFA6 /* CSSBorderImageSliceValue.cpp in Sources */,
</span><span class="lines">@@ -29841,6 +29851,7 @@
</span><span class="cx"> BC94D14E0C275C68006BC617 /* JSHistory.cpp in Sources */,
</span><span class="cx"> BCE7B1930D4E86960075A539 /* JSHistoryCustom.cpp in Sources */,
</span><span class="cx"> 57E233691DCAB24300F28D01 /* JSHmacKeyParams.cpp in Sources */,
</span><ins>+ 932CC0D41DFFD667004C0F9F /* JSMediaTrackConstraints.cpp in Sources */,
</ins><span class="cx"> BC97E412109154FA0010D361 /* JSHTMLAllCollection.cpp in Sources */,
</span><span class="cx"> BC97E42C10915B060010D361 /* JSHTMLAllCollectionCustom.cpp in Sources */,
</span><span class="cx"> 1A4A2DEF0A1B852A00C807F8 /* JSHTMLAnchorElement.cpp in Sources */,
</span><span class="lines">@@ -29975,7 +29986,6 @@
</span><span class="cx"> CDAB6D2D17C814EE00C60B34 /* JSMediaControlsHost.cpp in Sources */,
</span><span class="cx"> 159741DA1B7D13F900201C92 /* JSMediaDeviceInfo.cpp in Sources */,
</span><span class="cx"> 15739BBA1B42012A00D258C1 /* JSMediaDevices.cpp in Sources */,
</span><del>- 1B88DD131D5B9E5000E3B7A4 /* JSMediaDevicesCustom.cpp in Sources */,
</del><span class="cx"> FD23A12513F5FA5900F67001 /* JSMediaElementAudioSourceNode.cpp in Sources */,
</span><span class="cx"> 2D9BF7101DBFD8CE007A7D99 /* JSMediaEncryptedEvent.cpp in Sources */,
</span><span class="cx"> E44614180CD6826900FADA75 /* JSMediaError.cpp in Sources */,
</span></span></pre></div>
<a id="trunkSourceWebCorebindingsjsJSBindingsAllInOnecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/bindings/js/JSBindingsAllInOne.cpp (209863 => 209864)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/bindings/js/JSBindingsAllInOne.cpp 2016-12-15 16:53:38 UTC (rev 209863)
+++ trunk/Source/WebCore/bindings/js/JSBindingsAllInOne.cpp 2016-12-15 17:25:53 UTC (rev 209864)
</span><span class="lines">@@ -99,7 +99,6 @@
</span><span class="cx"> #include "JSLazyEventListener.cpp"
</span><span class="cx"> #include "JSLocationCustom.cpp"
</span><span class="cx"> #include "JSMainThreadExecState.cpp"
</span><del>-#include "JSMediaDevicesCustom.cpp"
</del><span class="cx"> #include "JSMessageChannelCustom.cpp"
</span><span class="cx"> #include "JSMessageEventCustom.cpp"
</span><span class="cx"> #include "JSMessagePortCustom.cpp"
</span></span></pre></div>
<a id="trunkSourceWebCorebindingsjsJSMediaDevicesCustomcpp"></a>
<div class="delfile"><h4>Deleted: trunk/Source/WebCore/bindings/js/JSMediaDevicesCustom.cpp (209863 => 209864)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/bindings/js/JSMediaDevicesCustom.cpp 2016-12-15 16:53:38 UTC (rev 209863)
+++ trunk/Source/WebCore/bindings/js/JSMediaDevicesCustom.cpp 2016-12-15 17:25:53 UTC (rev 209864)
</span><span class="lines">@@ -1,399 +0,0 @@
</span><del>-/*
- * Copyright (C) 2016 Apple Inc. All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- * notice, this list of conditions and the following disclaimer in the
- * documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY APPLE INC. ``AS IS'' AND ANY
- * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR
- * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
- * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
- * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
- * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY
- * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-#include "config.h"
-#include "JSMediaDevicesCustom.h"
-
-#if ENABLE(MEDIA_STREAM)
-
-#include "ArrayValue.h"
-#include "Dictionary.h"
-#include "ExceptionCode.h"
-#include "JSDOMPromise.h"
-#include "JSMediaDevices.h"
-#include "Logging.h"
-#include "MediaConstraintsImpl.h"
-#include "RealtimeMediaSourceCenter.h"
-#include "RealtimeMediaSourceSupportedConstraints.h"
-#include <wtf/HashMap.h>
-#include <wtf/Vector.h>
-
-using namespace JSC;
-
-namespace WebCore {
-
-enum class ConstraintSetType { Mandatory, Advanced };
-
-static void initializeStringConstraintWithList(StringConstraint& constraint, void (StringConstraint::*appendValue)(const String&), const ArrayValue& list)
-{
- size_t size;
- if (!list.length(size))
- return;
-
- for (size_t i = 0; i < size; ++i) {
- String value;
- if (list.get(i, value))
- (constraint.*appendValue)(value);
- }
-}
-
-static std::optional<StringConstraint> createStringConstraint(const Dictionary& mediaTrackConstraintSet, const String& name, MediaConstraintType type, ConstraintSetType constraintSetType)
-{
- auto constraint = StringConstraint(name, type);
-
- // Dictionary constraint value.
- Dictionary dictionaryValue;
- if (mediaTrackConstraintSet.get(name, dictionaryValue) && !dictionaryValue.isUndefinedOrNull()) {
- ArrayValue exactArrayValue;
- if (dictionaryValue.get("exact", exactArrayValue) && !exactArrayValue.isUndefinedOrNull())
- initializeStringConstraintWithList(constraint, &StringConstraint::appendExact, exactArrayValue);
- else {
- String exactStringValue;
- if (dictionaryValue.get("exact", exactStringValue))
- constraint.setExact(exactStringValue);
- }
-
- ArrayValue idealArrayValue;
- if (dictionaryValue.get("ideal", idealArrayValue) && !idealArrayValue.isUndefinedOrNull())
- initializeStringConstraintWithList(constraint, &StringConstraint::appendIdeal, idealArrayValue);
- else {
- String idealStringValue;
- if (!dictionaryValue.get("ideal", idealStringValue))
- constraint.setIdeal(idealStringValue);
- }
-
- if (constraint.isEmpty()) {
- LOG(Media, "createStringConstraint() - ignoring string constraint '%s' with dictionary value since it has no valid or supported key/value pairs.", name.utf8().data());
- return std::nullopt;
- }
-
- return WTFMove(constraint);
- }
-
- // Array constraint value.
- ArrayValue arrayValue;
- if (mediaTrackConstraintSet.get(name, arrayValue) && !arrayValue.isUndefinedOrNull()) {
- initializeStringConstraintWithList(constraint, &StringConstraint::appendIdeal, arrayValue);
-
- if (constraint.isEmpty()) {
- LOG(Media, "createStringConstraint() - ignoring string constraint '%s' with array value since it is empty.", name.utf8().data());
- return std::nullopt;
- }
-
- return WTFMove(constraint);
- }
-
- // Scalar constraint value.
- String value;
- if (mediaTrackConstraintSet.get(name, value)) {
- if (constraintSetType == ConstraintSetType::Mandatory)
- constraint.setIdeal(value);
- else
- constraint.setExact(value);
-
- return WTFMove(constraint);
- }
-
- // Invalid constraint value.
- LOG(Media, "createStringConstraint() - ignoring string constraint '%s' since it has neither a dictionary nor sequence nor scalar value.", name.utf8().data());
- return std::nullopt;
-}
-
-static std::optional<BooleanConstraint> createBooleanConstraint(const Dictionary& mediaTrackConstraintSet, const String& name, MediaConstraintType type, ConstraintSetType constraintSetType)
-{
- auto constraint = BooleanConstraint(name, type);
-
- // Dictionary constraint value.
- Dictionary dictionaryValue;
- if (mediaTrackConstraintSet.get(name, dictionaryValue) && !dictionaryValue.isUndefinedOrNull()) {
- bool exactValue;
- if (dictionaryValue.get("exact", exactValue))
- constraint.setExact(exactValue);
-
- bool idealValue;
- if (dictionaryValue.get("ideal", idealValue))
- constraint.setIdeal(idealValue);
-
- if (constraint.isEmpty()) {
- LOG(Media, "createBooleanConstraint() - ignoring boolean constraint '%s' with dictionary value since it has no valid or supported key/value pairs.", name.utf8().data());
- return std::nullopt;
- }
-
- return WTFMove(constraint);
- }
-
- // Scalar constraint value.
- bool value;
- if (mediaTrackConstraintSet.get(name, value)) {
- if (constraintSetType == ConstraintSetType::Mandatory)
- constraint.setIdeal(value);
- else
- constraint.setExact(value);
-
- return WTFMove(constraint);
- }
-
- // Invalid constraint value.
- LOG(Media, "createBooleanConstraint() - ignoring boolean constraint '%s' since it has neither a dictionary nor scalar value.", name.utf8().data());
- return std::nullopt;
-}
-
-static std::optional<DoubleConstraint> createDoubleConstraint(const Dictionary& mediaTrackConstraintSet, const String& name, MediaConstraintType type, ConstraintSetType constraintSetType)
-{
- auto constraint = DoubleConstraint(name, type);
-
- // Dictionary constraint value.
- Dictionary dictionaryValue;
- if (mediaTrackConstraintSet.get(name, dictionaryValue) && !dictionaryValue.isUndefinedOrNull()) {
- double minValue;
- if (dictionaryValue.get("min", minValue))
- constraint.setMin(minValue);
-
- double maxValue;
- if (dictionaryValue.get("max", maxValue))
- constraint.setMax(maxValue);
-
- double exactValue;
- if (dictionaryValue.get("exact", exactValue))
- constraint.setExact(exactValue);
-
- double idealValue;
- if (dictionaryValue.get("ideal", idealValue))
- constraint.setIdeal(idealValue);
-
- if (constraint.isEmpty()) {
- LOG(Media, "createDoubleConstraint() - ignoring double constraint '%s' with dictionary value since it has no valid or supported key/value pairs.", name.utf8().data());
- return std::nullopt;
- }
-
- return WTFMove(constraint);
- }
-
- // Scalar constraint value.
- double value;
- if (mediaTrackConstraintSet.get(name, value)) {
- if (constraintSetType == ConstraintSetType::Mandatory)
- constraint.setIdeal(value);
- else
- constraint.setExact(value);
-
- return WTFMove(constraint);
- }
-
- // Invalid constraint value.
- LOG(Media, "createDoubleConstraint() - ignoring double constraint '%s' since it has neither a dictionary nor scalar value.", name.utf8().data());
- return std::nullopt;
-}
-
-static std::optional<IntConstraint> createIntConstraint(const Dictionary& mediaTrackConstraintSet, const String& name, MediaConstraintType type, ConstraintSetType constraintSetType)
-{
- auto constraint = IntConstraint(name, type);
-
- // Dictionary constraint value.
- Dictionary dictionaryValue;
- if (mediaTrackConstraintSet.get(name, dictionaryValue) && !dictionaryValue.isUndefinedOrNull()) {
- int minValue;
- if (dictionaryValue.get("min", minValue))
- constraint.setMin(minValue);
-
- int maxValue;
- if (dictionaryValue.get("max", maxValue))
- constraint.setMax(maxValue);
-
- int exactValue;
- if (dictionaryValue.get("exact", exactValue))
- constraint.setExact(exactValue);
-
- int idealValue;
- if (dictionaryValue.get("ideal", idealValue))
- constraint.setIdeal(idealValue);
-
- if (constraint.isEmpty()) {
- LOG(Media, "createIntConstraint() - ignoring long constraint '%s' with dictionary value since it has no valid or supported key/value pairs.", name.utf8().data());
- return std::nullopt;
- }
-
- return WTFMove(constraint);
- }
-
- // Scalar constraint value.
- int value;
- if (mediaTrackConstraintSet.get(name, value)) {
- if (constraintSetType == ConstraintSetType::Mandatory)
- constraint.setIdeal(value);
- else
- constraint.setExact(value);
-
- return WTFMove(constraint);
- }
-
- // Invalid constraint value.
- LOG(Media, "createIntConstraint() - ignoring long constraint '%s' since it has neither a dictionary nor scalar value.", name.utf8().data());
- return std::nullopt;
-}
-
-static void parseMediaTrackConstraintSetForKey(const Dictionary& mediaTrackConstraintSet, const String& name, MediaTrackConstraintSetMap& map, ConstraintSetType constraintSetType)
-{
- MediaConstraintType constraintType = RealtimeMediaSourceSupportedConstraints::constraintFromName(name);
- switch (constraintType) {
- case MediaConstraintType::Width:
- map.set(constraintType, createIntConstraint(mediaTrackConstraintSet, name, constraintType, constraintSetType));
- break;
- case MediaConstraintType::Height:
- map.set(constraintType, createIntConstraint(mediaTrackConstraintSet, name, constraintType, constraintSetType));
- break;
- case MediaConstraintType::SampleRate:
- map.set(constraintType, createIntConstraint(mediaTrackConstraintSet, name, constraintType, constraintSetType));
- break;
- case MediaConstraintType::SampleSize:
- map.set(constraintType, createIntConstraint(mediaTrackConstraintSet, name, constraintType, constraintSetType));
- break;
-
- case MediaConstraintType::AspectRatio:
- map.set(constraintType, createDoubleConstraint(mediaTrackConstraintSet, name, constraintType, constraintSetType));
- break;
- case MediaConstraintType::FrameRate:
- map.set(constraintType, createDoubleConstraint(mediaTrackConstraintSet, name, constraintType, constraintSetType));
- break;
- case MediaConstraintType::Volume:
- map.set(constraintType, createDoubleConstraint(mediaTrackConstraintSet, name, constraintType, constraintSetType));
- break;
-
- case MediaConstraintType::EchoCancellation:
- map.set(constraintType, createBooleanConstraint(mediaTrackConstraintSet, name, constraintType, constraintSetType));
- break;
-
- case MediaConstraintType::FacingMode:
- map.set(constraintType, createStringConstraint(mediaTrackConstraintSet, name, constraintType, constraintSetType));
- break;
- case MediaConstraintType::DeviceId:
- map.set(constraintType, createStringConstraint(mediaTrackConstraintSet, name, constraintType, constraintSetType));
- break;
- case MediaConstraintType::GroupId:
- map.set(constraintType, createStringConstraint(mediaTrackConstraintSet, name, constraintType, constraintSetType));
- break;
-
- case MediaConstraintType::Unknown:
- LOG(Media, "parseMediaTrackConstraintSetForKey() - ignoring unsupported constraint '%s'.", name.utf8().data());
- return;
- }
-}
-
-static void parseAdvancedConstraints(const Dictionary& mediaTrackConstraints, Vector<MediaTrackConstraintSetMap>& advancedConstraints)
-{
- ArrayValue sequenceOfMediaTrackConstraintSets;
- if (!mediaTrackConstraints.get("advanced", sequenceOfMediaTrackConstraintSets) || sequenceOfMediaTrackConstraintSets.isUndefinedOrNull()) {
- LOG(Media, "parseAdvancedConstraints() - value of advanced key is not a list.");
- return;
- }
-
- size_t numberOfConstraintSets;
- if (!sequenceOfMediaTrackConstraintSets.length(numberOfConstraintSets)) {
- LOG(Media, "parseAdvancedConstraints() - ignoring empty advanced sequence of MediaTrackConstraintSets.");
- return;
- }
-
- for (size_t i = 0; i < numberOfConstraintSets; ++i) {
- Dictionary mediaTrackConstraintSet;
- if (!sequenceOfMediaTrackConstraintSets.get(i, mediaTrackConstraintSet) || mediaTrackConstraintSet.isUndefinedOrNull()) {
- LOG(Media, "parseAdvancedConstraints() - ignoring constraint set with index '%zu' in advanced list.", i);
- continue;
- }
-
- MediaTrackConstraintSetMap map;
-
- Vector<String> localKeys;
- mediaTrackConstraintSet.getOwnPropertyNames(localKeys);
- for (auto& localKey : localKeys)
- parseMediaTrackConstraintSetForKey(mediaTrackConstraintSet, localKey, map, ConstraintSetType::Advanced);
-
- if (!map.isEmpty())
- advancedConstraints.append(WTFMove(map));
- }
-}
-
-void parseMediaConstraintsDictionary(const Dictionary& mediaTrackConstraints, MediaTrackConstraintSetMap& mandatoryConstraints, Vector<MediaTrackConstraintSetMap>& advancedConstraints)
-{
- if (mediaTrackConstraints.isUndefinedOrNull())
- return;
-
- Vector<String> keys;
- mediaTrackConstraints.getOwnPropertyNames(keys);
-
- for (auto& key : keys) {
- if (key == "advanced")
- parseAdvancedConstraints(mediaTrackConstraints, advancedConstraints);
- else
- parseMediaTrackConstraintSetForKey(mediaTrackConstraints, key, mandatoryConstraints, ConstraintSetType::Mandatory);
- }
-}
-
-static void JSMediaDevicesGetUserMediaPromiseFunction(ExecState& state, Ref<DeferredPromise>&& promise)
-{
- VM& vm = state.vm();
- auto scope = DECLARE_THROW_SCOPE(vm);
-
- if (UNLIKELY(state.argumentCount() < 1)) {
- throwVMError(&state, scope, createNotEnoughArgumentsError(&state));
- return;
- }
-
- auto constraintsDictionary = Dictionary(&state, state.uncheckedArgument(0));
-
- MediaTrackConstraintSetMap mandatoryAudioConstraints;
- Vector<MediaTrackConstraintSetMap> advancedAudioConstraints;
- bool areAudioConstraintsValid = false;
-
- Dictionary audioConstraintsDictionary;
- if (constraintsDictionary.get("audio", audioConstraintsDictionary) && !audioConstraintsDictionary.isUndefinedOrNull()) {
- parseMediaConstraintsDictionary(audioConstraintsDictionary, mandatoryAudioConstraints, advancedAudioConstraints);
- areAudioConstraintsValid = true;
- } else
- constraintsDictionary.get("audio", areAudioConstraintsValid);
-
- MediaTrackConstraintSetMap mandatoryVideoConstraints;
- Vector<MediaTrackConstraintSetMap> advancedVideoConstraints;
- bool areVideoConstraintsValid = false;
-
- Dictionary videoConstraintsDictionary;
- if (constraintsDictionary.get("video", videoConstraintsDictionary) && !videoConstraintsDictionary.isUndefinedOrNull()) {
- parseMediaConstraintsDictionary(videoConstraintsDictionary, mandatoryVideoConstraints, advancedVideoConstraints);
- areVideoConstraintsValid = true;
- } else
- constraintsDictionary.get("video", areVideoConstraintsValid);
-
- auto audioConstraints = MediaConstraintsImpl::create(WTFMove(mandatoryAudioConstraints), WTFMove(advancedAudioConstraints), areAudioConstraintsValid);
- auto videoConstraints = MediaConstraintsImpl::create(WTFMove(mandatoryVideoConstraints), WTFMove(advancedVideoConstraints), areVideoConstraintsValid);
- propagateException(state, scope, castThisValue<JSMediaDevices>(state).wrapped().getUserMedia(WTFMove(audioConstraints), WTFMove(videoConstraints), WTFMove(promise)));
-}
-
-JSValue JSMediaDevices::getUserMedia(ExecState& state)
-{
- return callPromiseFunction<JSMediaDevicesGetUserMediaPromiseFunction, PromiseExecutionScope::WindowOnly>(state);
-}
-
-}
-
-#endif
</del></span></pre></div>
<a id="trunkSourceWebCorebindingsjsJSMediaDevicesCustomh"></a>
<div class="delfile"><h4>Deleted: trunk/Source/WebCore/bindings/js/JSMediaDevicesCustom.h (209863 => 209864)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/bindings/js/JSMediaDevicesCustom.h 2016-12-15 16:53:38 UTC (rev 209863)
+++ trunk/Source/WebCore/bindings/js/JSMediaDevicesCustom.h 2016-12-15 17:25:53 UTC (rev 209864)
</span><span class="lines">@@ -1,41 +0,0 @@
</span><del>-/*
- * Copyright (C) 2016 Apple Inc. All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- * notice, this list of conditions and the following disclaimer in the
- * documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY APPLE INC. ``AS IS'' AND ANY
- * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR
- * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
- * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
- * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
- * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY
- * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-#pragma once
-
-#if ENABLE(MEDIA_STREAM)
-
-#include "MediaConstraints.h"
-#include <wtf/Vector.h>
-
-namespace WebCore {
-
-class Dictionary;
-
-void parseMediaConstraintsDictionary(const Dictionary&, MediaTrackConstraintSetMap&, Vector<MediaTrackConstraintSetMap>&);
-
-}
-
-#endif
</del></span></pre></div>
<a id="trunkSourceWebCorebindingsjsJSMediaStreamTrackCustomcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/bindings/js/JSMediaStreamTrackCustom.cpp (209863 => 209864)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/bindings/js/JSMediaStreamTrackCustom.cpp 2016-12-15 16:53:38 UTC (rev 209863)
+++ trunk/Source/WebCore/bindings/js/JSMediaStreamTrackCustom.cpp 2016-12-15 17:25:53 UTC (rev 209864)
</span><span class="lines">@@ -31,8 +31,6 @@
</span><span class="cx"> #include "Dictionary.h"
</span><span class="cx"> #include "ExceptionCode.h"
</span><span class="cx"> #include "JSDOMBinding.h"
</span><del>-#include "JSMediaDevicesCustom.h"
-#include "MediaConstraintsImpl.h"
</del><span class="cx"> #include "MediaSourceSettings.h"
</span><span class="cx"> #include "MediaStreamTrack.h"
</span><span class="cx"> #include "WebCoreJSClientData.h"
</span><span class="lines">@@ -166,40 +164,6 @@
</span><span class="cx"> return object;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-JSValue JSMediaStreamTrack::applyConstraints(ExecState& state)
-{
- MediaTrackConstraintSetMap mandatoryConstraints;
- Vector<MediaTrackConstraintSetMap> advancedConstraints;
- bool valid = false;
-
- if (state.argumentCount() >= 1) {
- JSValue argument = state.uncheckedArgument(0);
-
- JSVMClientData& clientData = *static_cast<JSVMClientData*>(state.vm().clientData);
- putDirect(state.vm(), clientData.builtinNames().mediaStreamTrackConstraintsPrivateName(), argument, DontEnum);
-
- auto constraintsDictionary = Dictionary(&state, argument);
- if (!constraintsDictionary.isUndefinedOrNull())
- parseMediaConstraintsDictionary(constraintsDictionary, mandatoryConstraints, advancedConstraints);
- valid = !advancedConstraints.isEmpty() || !mandatoryConstraints.isEmpty();
- }
-
- auto deferredPromise = createDeferredPromise(state, domWindow());
- auto promise = deferredPromise->promise();
-
- auto constraints = MediaConstraintsImpl::create(WTFMove(mandatoryConstraints), WTFMove(advancedConstraints), valid);
- wrapped().applyConstraints(WTFMove(constraints), WTFMove(deferredPromise));
-
- return promise;
-}
-
-JSValue JSMediaStreamTrack::getConstraints(ExecState& state)
-{
- JSVMClientData& clientData = *static_cast<JSVMClientData*>(state.vm().clientData);
- JSValue result = getDirect(state.vm(), clientData.builtinNames().mediaStreamTrackConstraintsPrivateName());
- return !result.isEmpty() ? result : jsUndefined();
-}
-
</del><span class="cx"> } // namespace WebCore
</span><span class="cx">
</span><span class="cx"> #endif
</span></span></pre></div>
<a id="trunkSourceWebCorebindingsscriptsCodeGeneratorpm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/bindings/scripts/CodeGenerator.pm (209863 => 209864)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/bindings/scripts/CodeGenerator.pm 2016-12-15 16:53:38 UTC (rev 209863)
+++ trunk/Source/WebCore/bindings/scripts/CodeGenerator.pm 2016-12-15 17:25:53 UTC (rev 209864)
</span><span class="lines">@@ -28,6 +28,7 @@
</span><span class="cx">
</span><span class="cx"> use strict;
</span><span class="cx">
</span><ins>+use File::Basename;
</ins><span class="cx"> use File::Find;
</span><span class="cx"> use Carp qw<longmess>;
</span><span class="cx"> use Data::Dumper;
</span><span class="lines">@@ -203,11 +204,24 @@
</span><span class="cx">
</span><span class="cx"> my $dictionaries = $useDocument->dictionaries;
</span><span class="cx"> if (@$dictionaries) {
</span><del>- die "Multiple standalone dictionaries per document are not supported" if @$dictionaries > 1;
</del><ins>+ my $dictionary;
+ my $otherDictionaries;
+ if (@$dictionaries == 1) {
+ $dictionary = @$dictionaries[0];
+ } else {
+ my $primaryDictionaryName = fileparse($targetIdlFilePath, ".idl");
+ for my $candidate (@$dictionaries) {
+ if ($candidate->type->name eq $primaryDictionaryName) {
+ $dictionary = $candidate;
+ } else {
+ push @$otherDictionaries, $candidate;
+ }
+ }
+ die "Multiple dictionaries per document are only supported if one matches the filename" unless $dictionary;
+ }
</ins><span class="cx">
</span><del>- my $dictionary = @$dictionaries[0];
</del><span class="cx"> print "Generating $useGenerator bindings code for IDL dictionary \"" . $dictionary->type->name . "\"...\n" if $verbose;
</span><del>- $codeGenerator->GenerateDictionary($dictionary, $useDocument->enumerations);
</del><ins>+ $codeGenerator->GenerateDictionary($dictionary, $useDocument->enumerations, $otherDictionaries);
</ins><span class="cx"> $codeGenerator->WriteData($dictionary, $useOutputDir, $useOutputHeadersDir);
</span><span class="cx"> return;
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebCorebindingsscriptsCodeGeneratorJSpm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/bindings/scripts/CodeGeneratorJS.pm (209863 => 209864)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/bindings/scripts/CodeGeneratorJS.pm 2016-12-15 16:53:38 UTC (rev 209863)
+++ trunk/Source/WebCore/bindings/scripts/CodeGeneratorJS.pm 2016-12-15 17:25:53 UTC (rev 209864)
</span><span class="lines">@@ -50,7 +50,6 @@
</span><span class="cx"> my %implIncludes = ();
</span><span class="cx"> my @depsContent = ();
</span><span class="cx"> my $numCachedAttributes = 0;
</span><del>-my $currentCachedAttribute = 0;
</del><span class="cx">
</span><span class="cx"> my $beginAppleCopyrightForHeaderFiles = <<END;
</span><span class="cx"> // ------- Begin Apple Copyright -------
</span><span class="lines">@@ -143,11 +142,11 @@
</span><span class="cx">
</span><span class="cx"> sub GenerateDictionary
</span><span class="cx"> {
</span><del>- my ($object, $dictionary, $enumerations) = @_;
</del><ins>+ my ($object, $dictionary, $enumerations, $otherDictionaries) = @_;
</ins><span class="cx">
</span><span class="cx"> my $className = GetDictionaryClassName($dictionary->type);
</span><del>- $object->GenerateDictionaryHeader($dictionary, $className, $enumerations);
- $object->GenerateDictionaryImplementation($dictionary, $className, $enumerations);
</del><ins>+ $object->GenerateDictionaryHeader($dictionary, $className, $enumerations, $otherDictionaries);
+ $object->GenerateDictionaryImplementation($dictionary, $className, $enumerations, $otherDictionaries);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> sub GenerateCallbackFunction
</span><span class="lines">@@ -1224,7 +1223,7 @@
</span><span class="cx">
</span><span class="cx"> my $result = "";
</span><span class="cx"> foreach my $dictionary (@$allDictionaries) {
</span><del>- $headerIncludes{$interface->type->name . ".h"} = 1;
</del><ins>+ $headerIncludes{$interface->type->name . ".h"} = 1 if $interface;
</ins><span class="cx"> my $className = GetDictionaryClassName($dictionary->type, $interface);
</span><span class="cx"> my $conditionalString = $codeGenerator->GenerateConditionalString($dictionary);
</span><span class="cx"> $result .= GenerateDictionaryHeaderContent($dictionary, $className, $conditionalString);
</span><span class="lines">@@ -3398,10 +3397,7 @@
</span><span class="cx"> push(@implContent, " return JS" . $constructorType . "::getConstructor(state.vm(), thisObject.globalObject());\n");
</span><span class="cx"> }
</span><span class="cx"> } else {
</span><del>- my $cacheIndex = 0;
</del><span class="cx"> if ($attribute->extendedAttributes->{CachedAttribute}) {
</span><del>- $cacheIndex = $currentCachedAttribute;
- $currentCachedAttribute++;
</del><span class="cx"> push(@implContent, " if (JSValue cachedValue = thisObject.m_" . $attribute->name . ".get())\n");
</span><span class="cx"> push(@implContent, " return cachedValue;\n");
</span><span class="cx"> }
</span><span class="lines">@@ -4537,7 +4533,7 @@
</span><span class="cx">
</span><span class="cx"> sub GenerateDictionaryHeader
</span><span class="cx"> {
</span><del>- my ($object, $dictionary, $className, $enumerations) = @_;
</del><ins>+ my ($object, $dictionary, $className, $enumerations, $otherDictionaries) = @_;
</ins><span class="cx">
</span><span class="cx"> # - Add default header template and header protection.
</span><span class="cx"> push(@headerContentHeader, GenerateHeaderContentHeader($dictionary));
</span><span class="lines">@@ -4548,6 +4544,7 @@
</span><span class="cx"> push(@headerContent, "\nnamespace WebCore {\n\n");
</span><span class="cx"> push(@headerContent, GenerateDictionaryHeaderContent($dictionary, $className));
</span><span class="cx"> push(@headerContent, GenerateEnumerationsHeaderContent($dictionary, $enumerations));
</span><ins>+ push(@headerContent, GenerateDictionariesHeaderContent(undef, $otherDictionaries)) if $otherDictionaries;
</ins><span class="cx"> push(@headerContent, "} // namespace WebCore\n");
</span><span class="cx">
</span><span class="cx"> my $conditionalString = $codeGenerator->GenerateConditionalString($dictionary);
</span><span class="lines">@@ -4570,7 +4567,7 @@
</span><span class="cx">
</span><span class="cx"> sub GenerateDictionaryImplementation
</span><span class="cx"> {
</span><del>- my ($object, $dictionary, $className, $enumerations) = @_;
</del><ins>+ my ($object, $dictionary, $className, $enumerations, $otherDictionaries) = @_;
</ins><span class="cx">
</span><span class="cx"> # - Add default header template
</span><span class="cx"> push(@implContentHeader, GenerateImplementationContentHeader($dictionary));
</span><span class="lines">@@ -4577,8 +4574,9 @@
</span><span class="cx">
</span><span class="cx"> push(@implContent, "\nusing namespace JSC;\n\n");
</span><span class="cx"> push(@implContent, "namespace WebCore {\n\n");
</span><ins>+ push(@implContent, GenerateDictionaryImplementationContent($dictionary, $className));
</ins><span class="cx"> push(@implContent, GenerateEnumerationsImplementationContent($dictionary, $enumerations));
</span><del>- push(@implContent, GenerateDictionaryImplementationContent($dictionary, $className));
</del><ins>+ push(@implContent, GenerateDictionariesImplementationContent(undef, $otherDictionaries)) if $otherDictionaries;
</ins><span class="cx"> push(@implContent, "} // namespace WebCore\n");
</span><span class="cx">
</span><span class="cx"> my $conditionalString = $codeGenerator->GenerateConditionalString($dictionary);
</span><span class="lines">@@ -5603,10 +5601,9 @@
</span><span class="cx"> my $outputDir = shift;
</span><span class="cx">
</span><span class="cx"> my $name = $interface->type->name;
</span><del>- my $prefix = FileNamePrefix;
- my $headerFileName = "$outputDir/$prefix$name.h";
- my $implFileName = "$outputDir/$prefix$name.cpp";
- my $depsFileName = "$outputDir/$prefix$name.dep";
</del><ins>+ my $headerFileName = "$outputDir/JS$name.h";
+ my $implFileName = "$outputDir/JS$name.cpp";
+ my $depsFileName = "$outputDir/JS$name.dep";
</ins><span class="cx">
</span><span class="cx"> # Update a .cpp file if the contents are changed.
</span><span class="cx"> my $contents = join "", @implContentHeader;
</span><span class="lines">@@ -5659,7 +5656,7 @@
</span><span class="cx"> }
</span><span class="cx"> foreach my $include (sort @includes) {
</span><span class="cx"> # "JSClassName.h" is already included right after config.h.
</span><del>- next if $include eq "\"$prefix$name.h\"";
</del><ins>+ next if $include eq "\"JS$name.h\"";
</ins><span class="cx"> $contents .= "#include $include\n";
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCorebindingsscriptsgeneratebindingspl"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/bindings/scripts/generate-bindings.pl (209863 => 209864)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/bindings/scripts/generate-bindings.pl 2016-12-15 16:53:38 UTC (rev 209863)
+++ trunk/Source/WebCore/bindings/scripts/generate-bindings.pl 2016-12-15 17:25:53 UTC (rev 209864)
</span><span class="lines">@@ -82,7 +82,7 @@
</span><span class="cx"> if ($verbose) {
</span><span class="cx"> print "$generator: $targetIdlFile\n";
</span><span class="cx"> }
</span><del>-my $targetInterfaceName = fileparse(basename($targetIdlFile), ".idl");
</del><ins>+my $targetInterfaceName = fileparse($targetIdlFile, ".idl");
</ins><span class="cx">
</span><span class="cx"> my $idlFound = 0;
</span><span class="cx"> my @supplementedIdlFiles;
</span><span class="lines">@@ -100,7 +100,7 @@
</span><span class="cx"> open FH, "< $supplementalDependencyFile" or die "Cannot open $supplementalDependencyFile\n";
</span><span class="cx"> while (my $line = <FH>) {
</span><span class="cx"> my ($idlFile, @followingIdlFiles) = split(/\s+/, $line);
</span><del>- if ($idlFile and basename($idlFile) eq basename($targetIdlFile)) {
</del><ins>+ if ($idlFile and fileparse($idlFile) eq fileparse($targetIdlFile)) {
</ins><span class="cx"> $idlFound = 1;
</span><span class="cx"> @supplementedIdlFiles = sort @followingIdlFiles;
</span><span class="cx"> }
</span><span class="lines">@@ -112,7 +112,7 @@
</span><span class="cx"> # dependency file) but should generate .h and .cpp files.
</span><span class="cx"> if (!$idlFound and $additionalIdlFiles) {
</span><span class="cx"> my @idlFiles = shellwords($additionalIdlFiles);
</span><del>- $idlFound = grep { $_ and basename($_) eq basename($targetIdlFile) } @idlFiles;
</del><ins>+ $idlFound = grep { $_ and fileparse($_) eq fileparse($targetIdlFile) } @idlFiles;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> if (!$idlFound) {
</span><span class="lines">@@ -130,13 +130,13 @@
</span><span class="cx">
</span><span class="cx"> if ($idlAttributesFile) {
</span><span class="cx"> my $idlAttributes = loadIDLAttributes($idlAttributesFile);
</span><del>- checkIDLAttributes($idlAttributes, $targetDocument, basename($targetIdlFile));
</del><ins>+ checkIDLAttributes($idlAttributes, $targetDocument, fileparse($targetIdlFile));
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> foreach my $idlFile (@supplementedIdlFiles) {
</span><span class="cx"> next if $idlFile eq $targetIdlFile;
</span><span class="cx">
</span><del>- my $interfaceName = fileparse(basename($idlFile), ".idl");
</del><ins>+ my $interfaceName = fileparse($idlFile, ".idl");
</ins><span class="cx"> my $parser = IDLParser->new(!$verbose);
</span><span class="cx"> my $document = $parser->Parse($idlFile, $defines, $preprocessor);
</span><span class="cx">
</span><span class="lines">@@ -271,7 +271,7 @@
</span><span class="cx"> $idlAttributes{$name}{"VALUE_IS_MISSING"} = 1;
</span><span class="cx"> }
</span><span class="cx"> } else {
</span><del>- die "The format of " . basename($idlAttributesFile) . " is wrong: line $.\n";
</del><ins>+ die "The format of " . fileparse($idlAttributesFile) . " is wrong: line $.\n";
</ins><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx"> close FH;
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformmediastreamMediaConstraintsh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/mediastream/MediaConstraints.h (209863 => 209864)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/mediastream/MediaConstraints.h 2016-12-15 16:53:38 UTC (rev 209863)
+++ trunk/Source/WebCore/platform/mediastream/MediaConstraints.h 2016-12-15 17:25:53 UTC (rev 209864)
</span><span class="lines">@@ -29,18 +29,12 @@
</span><span class="cx"> * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
</span><span class="cx"> */
</span><span class="cx">
</span><del>-#ifndef MediaConstraints_h
-#define MediaConstraints_h
</del><ins>+#pragma once
</ins><span class="cx">
</span><span class="cx"> #if ENABLE(MEDIA_STREAM)
</span><span class="cx">
</span><span class="cx"> #include "RealtimeMediaSourceSupportedConstraints.h"
</span><span class="cx"> #include <cstdlib>
</span><del>-#include <wtf/HashMap.h>
-#include <wtf/RefCounted.h>
-#include <wtf/Variant.h>
-#include <wtf/text/StringHash.h>
-#include <wtf/text/WTFString.h>
</del><span class="cx">
</span><span class="cx"> namespace WebCore {
</span><span class="cx">
</span><span class="lines">@@ -495,7 +489,6 @@
</span><span class="cx">
</span><span class="cx"> void appendExact(const String& value)
</span><span class="cx"> {
</span><del>- m_exact.clear();
</del><span class="cx"> m_exact.append(value);
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -813,5 +806,3 @@
</span><span class="cx"> SPECIALIZE_TYPE_TRAITS_MEDIACONSTRAINT(BooleanConstraint, isBoolean())
</span><span class="cx">
</span><span class="cx"> #endif // ENABLE(MEDIA_STREAM)
</span><del>-
-#endif // MediaConstraints_h
</del></span></pre></div>
<a id="trunkSourceWebCoreplatformmediastreamMediaStreamTrackPrivatecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/mediastream/MediaStreamTrackPrivate.cpp (209863 => 209864)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/mediastream/MediaStreamTrackPrivate.cpp 2016-12-15 16:53:38 UTC (rev 209863)
+++ trunk/Source/WebCore/platform/mediastream/MediaStreamTrackPrivate.cpp 2016-12-15 17:25:53 UTC (rev 209864)
</span><span class="lines">@@ -130,7 +130,6 @@
</span><span class="cx"> auto clonedMediaStreamTrackPrivate = create(m_source.copyRef());
</span><span class="cx"> clonedMediaStreamTrackPrivate->m_isEnabled = this->m_isEnabled;
</span><span class="cx"> clonedMediaStreamTrackPrivate->m_isEnded = this->m_isEnded;
</span><del>- clonedMediaStreamTrackPrivate->m_constraints = this->m_constraints;
</del><span class="cx">
</span><span class="cx"> return clonedMediaStreamTrackPrivate;
</span><span class="cx"> }
</span><span class="lines">@@ -140,11 +139,6 @@
</span><span class="cx"> return m_source->type();
</span><span class="cx"> }
</span><span class="cx">
</span><del>-RefPtr<MediaConstraints> MediaStreamTrackPrivate::constraints() const
-{
- return m_constraints;
-}
-
</del><span class="cx"> const RealtimeMediaSourceSettings& MediaStreamTrackPrivate::settings() const
</span><span class="cx"> {
</span><span class="cx"> return m_source->settings();
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformmediastreamMediaStreamTrackPrivateh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/mediastream/MediaStreamTrackPrivate.h (209863 => 209864)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/mediastream/MediaStreamTrackPrivate.h 2016-12-15 16:53:38 UTC (rev 209863)
+++ trunk/Source/WebCore/platform/mediastream/MediaStreamTrackPrivate.h 2016-12-15 17:25:53 UTC (rev 209864)
</span><span class="lines">@@ -24,14 +24,11 @@
</span><span class="cx"> * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
</span><span class="cx"> */
</span><span class="cx">
</span><del>-#ifndef MediaStreamTrackPrivate_h
-#define MediaStreamTrackPrivate_h
</del><ins>+#pragma once
</ins><span class="cx">
</span><span class="cx"> #if ENABLE(MEDIA_STREAM)
</span><span class="cx">
</span><span class="cx"> #include "RealtimeMediaSource.h"
</span><del>-#include <wtf/RefCounted.h>
-#include <wtf/text/AtomicString.h>
</del><span class="cx">
</span><span class="cx"> namespace WebCore {
</span><span class="cx">
</span><span class="lines">@@ -90,7 +87,6 @@
</span><span class="cx"> const RealtimeMediaSourceSettings& settings() const;
</span><span class="cx"> RefPtr<RealtimeMediaSourceCapabilities> capabilities() const;
</span><span class="cx">
</span><del>- RefPtr<MediaConstraints> constraints() const;
</del><span class="cx"> void applyConstraints(const MediaConstraints&, RealtimeMediaSource::SuccessHandler, RealtimeMediaSource::FailureHandler);
</span><span class="cx">
</span><span class="cx"> AudioSourceProvider* audioSourceProvider();
</span><span class="lines">@@ -110,7 +106,6 @@
</span><span class="cx">
</span><span class="cx"> Vector<Observer*> m_observers;
</span><span class="cx"> Ref<RealtimeMediaSource> m_source;
</span><del>- RefPtr<MediaConstraints> m_constraints;
</del><span class="cx"> RefPtr<RealtimeMediaSourcePreview> m_preview;
</span><span class="cx">
</span><span class="cx"> String m_id;
</span><span class="lines">@@ -123,5 +118,3 @@
</span><span class="cx"> } // namespace WebCore
</span><span class="cx">
</span><span class="cx"> #endif // ENABLE(MEDIA_STREAM)
</span><del>-
-#endif // MediaStreamTrackPrivate_h
</del></span></pre></div>
<a id="trunkSourceWebKit2ChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/ChangeLog (209863 => 209864)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/ChangeLog 2016-12-15 16:53:38 UTC (rev 209863)
+++ trunk/Source/WebKit2/ChangeLog 2016-12-15 17:25:53 UTC (rev 209864)
</span><span class="lines">@@ -1,3 +1,14 @@
</span><ins>+2016-12-15 Darin Adler <darin@apple.com>
+
+ Remove custom binding for MediaDevices
+ https://bugs.webkit.org/show_bug.cgi?id=165894
+
+ Reviewed by Eric Carlson.
+
+ * WebProcess/MediaStream/UserMediaPermissionRequestManager.cpp:
+ Added include of MediaConstraintsImpl.h, now needed because we
+ removed some unneeded includes from the WebCore headers.
+
</ins><span class="cx"> 2016-12-15 Dave Hyatt <hyatt@apple.com>
</span><span class="cx">
</span><span class="cx"> [CSS Parser] Enable CSS Deferred Parsing
</span></span></pre></div>
<a id="trunkSourceWebKit2WebProcessMediaStreamUserMediaPermissionRequestManagercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/MediaStream/UserMediaPermissionRequestManager.cpp (209863 => 209864)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/MediaStream/UserMediaPermissionRequestManager.cpp 2016-12-15 16:53:38 UTC (rev 209863)
+++ trunk/Source/WebKit2/WebProcess/MediaStream/UserMediaPermissionRequestManager.cpp 2016-12-15 17:25:53 UTC (rev 209864)
</span><span class="lines">@@ -29,6 +29,7 @@
</span><span class="cx"> #include <WebCore/Document.h>
</span><span class="cx"> #include <WebCore/Frame.h>
</span><span class="cx"> #include <WebCore/FrameLoader.h>
</span><ins>+#include <WebCore/MediaConstraintsImpl.h>
</ins><span class="cx"> #include <WebCore/SecurityOrigin.h>
</span><span class="cx"> #include <WebCore/SecurityOriginData.h>
</span><span class="cx">
</span></span></pre>
</div>
</div>
</body>
</html>