<!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>[191949] 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/191949">191949</a></dd>
<dt>Author</dt> <dd>youenn.fablet@crf.canon.fr</dd>
<dt>Date</dt> <dd>2015-11-03 05:43:56 -0800 (Tue, 03 Nov 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>Move webkitGetUserMedia to JS Builtin
https://bugs.webkit.org/show_bug.cgi?id=149499
Reviewed by Darin Adler.
Source/WebCore:
Implemented webkitGetUserMedia as a JSBuiltin wrapper around navigator.mediaDevices.getUserMedia.
Removed cpp based version.
The js builting implementation checks for argument but does not raise exception when the request is not supported.
The error callback is called instead, in an asynchronous fashion.
The js builtin implementation does not check first that it is called on navigator, contrary to the cpp implementation.
This is done afterwards when calling navigator.MediaDevices.@getUserMedia.
Covered by existing and modified tests.
* CMakeLists.txt: Adding NavigatorUserMedia.js as built-in JS file.
* DerivedSources.make: Ditto.
* Modules/mediastream/NavigatorUserMedia.idl: Making webkitGetUserMedia JSBuiltin
* Modules/mediastream/NavigatorUserMedia.js:
(webkitGetUserMedia):
* Modules/mediastream/NavigatorUserMediaErrorCallback.h: Removed.
* Modules/mediastream/NavigatorUserMediaErrorCallback.idl: Removed.
* Modules/mediastream/NavigatorUserMediaSuccessCallback.h: Removed.
* Modules/mediastream/NavigatorUserMediaSuccessCallback.idl: Removed.
* Modules/mediastream/UserMediaRequest.cpp:
* Modules/mediastream/UserMediaRequest.h:
* WebCore.xcodeproj/project.pbxproj:
* bindings/js/JSDOMWindowBase.cpp:
(WebCore::JSDOMWindowBase::finishCreation): Style modifications.
* bindings/js/JSNavigatorCustom.cpp: Removed.
* bindings/js/WebCoreJSBuiltins.cpp: Adding support for NavigatorUserMedia.js built-in JS file.
* bindings/js/WebCoreJSBuiltins.h: Ditto.
(WebCore::JSBuiltinFunctions::JSBuiltinFunctions):
(WebCore::JSBuiltinFunctions::navigatorUserMediaBuiltins):
LayoutTests:
* fast/mediastream/argument-types-expected.txt:
* fast/mediastream/getusermedia-expected.txt:
* fast/mediastream/getusermedia.html:
* fast/mediastream/script-tests/argument-types.js:
* http/tests/media/media-stream/disconnected-frame-already-expected.txt:</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsChangeLog">trunk/LayoutTests/ChangeLog</a></li>
<li><a href="#trunkLayoutTestsfastmediastreamargumenttypesexpectedtxt">trunk/LayoutTests/fast/mediastream/argument-types-expected.txt</a></li>
<li><a href="#trunkLayoutTestsfastmediastreamgetusermediaexpectedtxt">trunk/LayoutTests/fast/mediastream/getusermedia-expected.txt</a></li>
<li><a href="#trunkLayoutTestsfastmediastreamgetusermediahtml">trunk/LayoutTests/fast/mediastream/getusermedia.html</a></li>
<li><a href="#trunkLayoutTestsfastmediastreamscripttestsargumenttypesjs">trunk/LayoutTests/fast/mediastream/script-tests/argument-types.js</a></li>
<li><a href="#trunkLayoutTestshttptestsmediamediastreamdisconnectedframealreadyexpectedtxt">trunk/LayoutTests/http/tests/media/media-stream/disconnected-frame-already-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="#trunkSourceWebCoreModulesmediastreamNavigatorUserMediaidl">trunk/Source/WebCore/Modules/mediastream/NavigatorUserMedia.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="#trunkSourceWebCorebindingsjsJSDOMWindowBasecpp">trunk/Source/WebCore/bindings/js/JSDOMWindowBase.cpp</a></li>
<li><a href="#trunkSourceWebCorebindingsjsWebCoreJSBuiltinscpp">trunk/Source/WebCore/bindings/js/WebCoreJSBuiltins.cpp</a></li>
<li><a href="#trunkSourceWebCorebindingsjsWebCoreJSBuiltinsh">trunk/Source/WebCore/bindings/js/WebCoreJSBuiltins.h</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreModulesmediastreamNavigatorUserMediajs">trunk/Source/WebCore/Modules/mediastream/NavigatorUserMedia.js</a></li>
</ul>
<h3>Removed Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreModulesmediastreamNavigatorUserMediaErrorCallbackh">trunk/Source/WebCore/Modules/mediastream/NavigatorUserMediaErrorCallback.h</a></li>
<li><a href="#trunkSourceWebCoreModulesmediastreamNavigatorUserMediaErrorCallbackidl">trunk/Source/WebCore/Modules/mediastream/NavigatorUserMediaErrorCallback.idl</a></li>
<li><a href="#trunkSourceWebCoreModulesmediastreamNavigatorUserMediaSuccessCallbackh">trunk/Source/WebCore/Modules/mediastream/NavigatorUserMediaSuccessCallback.h</a></li>
<li><a href="#trunkSourceWebCoreModulesmediastreamNavigatorUserMediaSuccessCallbackidl">trunk/Source/WebCore/Modules/mediastream/NavigatorUserMediaSuccessCallback.idl</a></li>
<li><a href="#trunkSourceWebCorebindingsjsJSNavigatorCustomcpp">trunk/Source/WebCore/bindings/js/JSNavigatorCustom.cpp</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkLayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/ChangeLog (191948 => 191949)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/ChangeLog 2015-11-03 10:43:52 UTC (rev 191948)
+++ trunk/LayoutTests/ChangeLog 2015-11-03 13:43:56 UTC (rev 191949)
</span><span class="lines">@@ -1,3 +1,16 @@
</span><ins>+2015-11-03 Youenn Fablet <youenn.fablet@crf.canon.fr>
+
+ Move webkitGetUserMedia to JS Builtin
+ https://bugs.webkit.org/show_bug.cgi?id=149499
+
+ Reviewed by Darin Adler.
+
+ * fast/mediastream/argument-types-expected.txt:
+ * fast/mediastream/getusermedia-expected.txt:
+ * fast/mediastream/getusermedia.html:
+ * fast/mediastream/script-tests/argument-types.js:
+ * http/tests/media/media-stream/disconnected-frame-already-expected.txt:
+
</ins><span class="cx"> 2015-11-02 Keith Rollin <krollin@apple.com>
</span><span class="cx">
</span><span class="cx"> input[type=number] does not increment/decrement integers with trailing decimal characters
</span></span></pre></div>
<a id="trunkLayoutTestsfastmediastreamargumenttypesexpectedtxt"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/fast/mediastream/argument-types-expected.txt (191948 => 191949)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/mediastream/argument-types-expected.txt 2015-11-03 10:43:52 UTC (rev 191948)
+++ trunk/LayoutTests/fast/mediastream/argument-types-expected.txt 2015-11-03 13:43:56 UTC (rev 191949)
</span><span class="lines">@@ -30,7 +30,7 @@
</span><span class="cx"> PASS navigator.webkitGetUserMedia({video: true}, 42) threw exception TypeError: Not enough arguments.
</span><span class="cx"> PASS navigator.webkitGetUserMedia({video: true}, Infinity) threw exception TypeError: Not enough arguments.
</span><span class="cx"> PASS navigator.webkitGetUserMedia({video: true}, -Infinity) threw exception TypeError: Not enough arguments.
</span><del>-PASS navigator.webkitGetUserMedia({ }, emptyFunction, emptyFunction) threw exception Error: NotSupportedError: DOM Exception 9.
</del><ins>+PASS navigator.webkitGetUserMedia({ }, emptyFunction, emptyFunction) did not throw exception.
</ins><span class="cx"> PASS navigator.webkitGetUserMedia({video: true}, emptyFunction, emptyFunction) did not throw exception.
</span><span class="cx"> PASS navigator.webkitGetUserMedia({video: true}, emptyFunction, undefined) threw exception TypeError: Argument 3 ('errorCallback') to Navigator.webkitGetUserMedia must be a function.
</span><span class="cx"> PASS navigator.webkitGetUserMedia({audio:true, video:true}, emptyFunction, undefined) threw exception TypeError: Argument 3 ('errorCallback') to Navigator.webkitGetUserMedia must be a function.
</span></span></pre></div>
<a id="trunkLayoutTestsfastmediastreamgetusermediaexpectedtxt"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/fast/mediastream/getusermedia-expected.txt (191948 => 191949)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/mediastream/getusermedia-expected.txt 2015-11-03 10:43:52 UTC (rev 191948)
+++ trunk/LayoutTests/fast/mediastream/getusermedia-expected.txt 2015-11-03 13:43:56 UTC (rev 191949)
</span><span class="lines">@@ -3,9 +3,10 @@
</span><span class="cx"> On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE".
</span><span class="cx">
</span><span class="cx">
</span><del>-PASS navigator.webkitGetUserMedia({audio:false, video:false}, error, error); threw exception Error: NotSupportedError: DOM Exception 9.
</del><ins>+PASS navigator.webkitGetUserMedia({audio:false, video:false}, error, expectedError); did not throw exception.
</ins><span class="cx"> PASS navigator.webkitGetUserMedia({audio:false, video:false}, error, null); threw exception TypeError: Argument 3 ('errorCallback') to Navigator.webkitGetUserMedia must be a function.
</span><span class="cx"> PASS navigator.webkitGetUserMedia({audio:true}, gotStream1, error); did not throw exception.
</span><ins>+PASS Error callback called.
</ins><span class="cx"> PASS Stream generated.
</span><span class="cx"> PASS stream.getAudioTracks().length is 1
</span><span class="cx"> PASS stream.getVideoTracks().length is 0
</span></span></pre></div>
<a id="trunkLayoutTestsfastmediastreamgetusermediahtml"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/fast/mediastream/getusermedia.html (191948 => 191949)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/mediastream/getusermedia.html 2015-11-03 10:43:52 UTC (rev 191948)
+++ trunk/LayoutTests/fast/mediastream/getusermedia.html 2015-11-03 13:43:56 UTC (rev 191949)
</span><span class="lines">@@ -24,6 +24,10 @@
</span><span class="cx"> finishJSTest();
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+ function expectedError() {
+ testPassed('Error callback called.');
+ }
+
</ins><span class="cx"> function gotStreamInError(s) {
</span><span class="cx"> testFailed('Stream generated.');
</span><span class="cx"> finishJSTest();
</span><span class="lines">@@ -87,7 +91,7 @@
</span><span class="cx"> shouldNotThrow("navigator.webkitGetUserMedia({video:true}, gotStream2, error);")
</span><span class="cx"> }
</span><span class="cx">
</span><del>- shouldThrow("navigator.webkitGetUserMedia({audio:false, video:false}, error, error);")
</del><ins>+ shouldNotThrow("navigator.webkitGetUserMedia({audio:false, video:false}, error, expectedError);")
</ins><span class="cx"> shouldThrow("navigator.webkitGetUserMedia({audio:false, video:false}, error, null);")
</span><span class="cx">
</span><span class="cx"> setUserMediaPermission(true);
</span></span></pre></div>
<a id="trunkLayoutTestsfastmediastreamscripttestsargumenttypesjs"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/fast/mediastream/script-tests/argument-types.js (191948 => 191949)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/mediastream/script-tests/argument-types.js 2015-11-03 10:43:52 UTC (rev 191948)
+++ trunk/LayoutTests/fast/mediastream/script-tests/argument-types.js 2015-11-03 13:43:56 UTC (rev 191949)
</span><span class="lines">@@ -54,7 +54,7 @@
</span><span class="cx"> test('navigator.webkitGetUserMedia({video: true}, -Infinity)', true);
</span><span class="cx">
</span><span class="cx"> // 3 Arguments.
</span><del>-test('navigator.webkitGetUserMedia({ }, emptyFunction, emptyFunction)', true, notSupportedError);
</del><ins>+test('navigator.webkitGetUserMedia({ }, emptyFunction, emptyFunction)', false);
</ins><span class="cx"> test('navigator.webkitGetUserMedia({video: true}, emptyFunction, emptyFunction)', false);
</span><span class="cx"> test('navigator.webkitGetUserMedia({video: true}, emptyFunction, undefined)', true, errorCallbackError);
</span><span class="cx"> test('navigator.webkitGetUserMedia({audio:true, video:true}, emptyFunction, undefined)', true, errorCallbackError);
</span></span></pre></div>
<a id="trunkLayoutTestshttptestsmediamediastreamdisconnectedframealreadyexpectedtxt"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/http/tests/media/media-stream/disconnected-frame-already-expected.txt (191948 => 191949)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/http/tests/media/media-stream/disconnected-frame-already-expected.txt 2015-11-03 10:43:52 UTC (rev 191948)
+++ trunk/LayoutTests/http/tests/media/media-stream/disconnected-frame-already-expected.txt 2015-11-03 13:43:56 UTC (rev 191949)
</span><span class="lines">@@ -1,4 +1,4 @@
</span><del>-CONSOLE MESSAGE: line 24: NotSupportedError: DOM Exception 9: The implementation did not support the requested type of object or operation.
</del><ins>+CONSOLE MESSAGE: line 24: TypeError: The implementation did not support the requested type of object or operation.
</ins><span class="cx"> Tests that when a getUserMedia request is made after its frame has been disconnected, no callbacks are made and no crash occurs.
</span><span class="cx">
</span><span class="cx"> On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE".
</span></span></pre></div>
<a id="trunkSourceWebCoreCMakeListstxt"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/CMakeLists.txt (191948 => 191949)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/CMakeLists.txt 2015-11-03 10:43:52 UTC (rev 191948)
+++ trunk/Source/WebCore/CMakeLists.txt 2015-11-03 13:43:56 UTC (rev 191949)
</span><span class="lines">@@ -241,8 +241,6 @@
</span><span class="cx"> Modules/mediastream/NavigatorMediaDevices.idl
</span><span class="cx"> Modules/mediastream/NavigatorUserMedia.idl
</span><span class="cx"> Modules/mediastream/NavigatorUserMediaError.idl
</span><del>- Modules/mediastream/NavigatorUserMediaErrorCallback.idl
- Modules/mediastream/NavigatorUserMediaSuccessCallback.idl
</del><span class="cx"> Modules/mediastream/RTCConfiguration.idl
</span><span class="cx"> Modules/mediastream/RTCDTMFSender.idl
</span><span class="cx"> Modules/mediastream/RTCDTMFToneChangeEvent.idl
</span><span class="lines">@@ -1201,7 +1199,6 @@
</span><span class="cx"> bindings/js/JSMutationCallback.cpp
</span><span class="cx"> bindings/js/JSMutationObserverCustom.cpp
</span><span class="cx"> bindings/js/JSNamedNodeMapCustom.cpp
</span><del>- bindings/js/JSNavigatorCustom.cpp
</del><span class="cx"> bindings/js/JSNodeCustom.cpp
</span><span class="cx"> bindings/js/JSNodeFilterCustom.cpp
</span><span class="cx"> bindings/js/JSNodeIteratorCustom.cpp
</span><span class="lines">@@ -3588,6 +3585,7 @@
</span><span class="cx">
</span><span class="cx"> set(WebCore_BUILTINS_SOURCES
</span><span class="cx"> ${WEBCORE_DIR}/Modules/mediastream/MediaDevices.js
</span><ins>+ ${WEBCORE_DIR}/Modules/mediastream/NavigatorUserMedia.js
</ins><span class="cx"> ${WEBCORE_DIR}/Modules/streams/ByteLengthQueuingStrategy.js
</span><span class="cx"> ${WEBCORE_DIR}/Modules/streams/CountQueuingStrategy.js
</span><span class="cx"> ${WEBCORE_DIR}/Modules/streams/ReadableStream.js
</span></span></pre></div>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (191948 => 191949)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2015-11-03 10:43:52 UTC (rev 191948)
+++ trunk/Source/WebCore/ChangeLog 2015-11-03 13:43:56 UTC (rev 191949)
</span><span class="lines">@@ -1,3 +1,41 @@
</span><ins>+2015-11-03 Youenn Fablet <youenn.fablet@crf.canon.fr>
+
+ Move webkitGetUserMedia to JS Builtin
+ https://bugs.webkit.org/show_bug.cgi?id=149499
+
+ Reviewed by Darin Adler.
+
+ Implemented webkitGetUserMedia as a JSBuiltin wrapper around navigator.mediaDevices.getUserMedia.
+
+ Removed cpp based version.
+
+ The js builting implementation checks for argument but does not raise exception when the request is not supported.
+ The error callback is called instead, in an asynchronous fashion.
+ The js builtin implementation does not check first that it is called on navigator, contrary to the cpp implementation.
+ This is done afterwards when calling navigator.MediaDevices.@getUserMedia.
+
+ Covered by existing and modified tests.
+
+ * CMakeLists.txt: Adding NavigatorUserMedia.js as built-in JS file.
+ * DerivedSources.make: Ditto.
+ * Modules/mediastream/NavigatorUserMedia.idl: Making webkitGetUserMedia JSBuiltin
+ * Modules/mediastream/NavigatorUserMedia.js:
+ (webkitGetUserMedia):
+ * Modules/mediastream/NavigatorUserMediaErrorCallback.h: Removed.
+ * Modules/mediastream/NavigatorUserMediaErrorCallback.idl: Removed.
+ * Modules/mediastream/NavigatorUserMediaSuccessCallback.h: Removed.
+ * Modules/mediastream/NavigatorUserMediaSuccessCallback.idl: Removed.
+ * Modules/mediastream/UserMediaRequest.cpp:
+ * Modules/mediastream/UserMediaRequest.h:
+ * WebCore.xcodeproj/project.pbxproj:
+ * bindings/js/JSDOMWindowBase.cpp:
+ (WebCore::JSDOMWindowBase::finishCreation): Style modifications.
+ * bindings/js/JSNavigatorCustom.cpp: Removed.
+ * bindings/js/WebCoreJSBuiltins.cpp: Adding support for NavigatorUserMedia.js built-in JS file.
+ * bindings/js/WebCoreJSBuiltins.h: Ditto.
+ (WebCore::JSBuiltinFunctions::JSBuiltinFunctions):
+ (WebCore::JSBuiltinFunctions::navigatorUserMediaBuiltins):
+
</ins><span class="cx"> 2015-11-03 Carlos Garcia Campos <cgarcia@igalia.com>
</span><span class="cx">
</span><span class="cx"> [GStreamer] Use GstBus sync message handler and schedule tasks to the main thread with RunLoop::dispatch
</span></span></pre></div>
<a id="trunkSourceWebCoreDerivedSourcesmake"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/DerivedSources.make (191948 => 191949)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/DerivedSources.make 2015-11-03 10:43:52 UTC (rev 191948)
+++ trunk/Source/WebCore/DerivedSources.make 2015-11-03 13:43:56 UTC (rev 191949)
</span><span class="lines">@@ -137,8 +137,6 @@
</span><span class="cx"> $(WebCore)/Modules/mediastream/NavigatorMediaDevices.idl \
</span><span class="cx"> $(WebCore)/Modules/mediastream/NavigatorUserMedia.idl \
</span><span class="cx"> $(WebCore)/Modules/mediastream/NavigatorUserMediaError.idl \
</span><del>- $(WebCore)/Modules/mediastream/NavigatorUserMediaErrorCallback.idl \
- $(WebCore)/Modules/mediastream/NavigatorUserMediaSuccessCallback.idl \
</del><span class="cx"> $(WebCore)/Modules/mediastream/RTCConfiguration.idl \
</span><span class="cx"> $(WebCore)/Modules/mediastream/RTCDTMFSender.idl \
</span><span class="cx"> $(WebCore)/Modules/mediastream/RTCDTMFToneChangeEvent.idl \
</span><span class="lines">@@ -1257,6 +1255,7 @@
</span><span class="cx">
</span><span class="cx"> WebCore_BUILTINS_SOURCES = \
</span><span class="cx"> $(WebCore)/Modules/mediastream/MediaDevices.js \
</span><ins>+ $(WebCore)/Modules/mediastream/NavigatorUserMedia.js \
</ins><span class="cx"> $(WebCore)/Modules/streams/ByteLengthQueuingStrategy.js \
</span><span class="cx"> $(WebCore)/Modules/streams/CountQueuingStrategy.js \
</span><span class="cx"> $(WebCore)/Modules/streams/ReadableStream.js \
</span></span></pre></div>
<a id="trunkSourceWebCoreModulesmediastreamNavigatorUserMediaidl"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/mediastream/NavigatorUserMedia.idl (191948 => 191949)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/mediastream/NavigatorUserMedia.idl 2015-11-03 10:43:52 UTC (rev 191948)
+++ trunk/Source/WebCore/Modules/mediastream/NavigatorUserMedia.idl 2015-11-03 13:43:56 UTC (rev 191949)
</span><span class="lines">@@ -20,8 +20,6 @@
</span><span class="cx"> [
</span><span class="cx"> Conditional=MEDIA_STREAM,
</span><span class="cx"> ] partial interface Navigator {
</span><del>- [Custom, RaisesException] void webkitGetUserMedia(Dictionary options,
- NavigatorUserMediaSuccessCallback successCallback,
- optional NavigatorUserMediaErrorCallback errorCallback);
</del><ins>+ [JSBuiltin] void webkitGetUserMedia(Dictionary object, any successCallback, any errorCallback);
</ins><span class="cx"> };
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCoreModulesmediastreamNavigatorUserMediajs"></a>
<div class="addfile"><h4>Added: trunk/Source/WebCore/Modules/mediastream/NavigatorUserMedia.js (0 => 191949)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/mediastream/NavigatorUserMedia.js (rev 0)
+++ trunk/Source/WebCore/Modules/mediastream/NavigatorUserMedia.js 2015-11-03 13:43:56 UTC (rev 191949)
</span><span class="lines">@@ -0,0 +1,46 @@
</span><ins>+/*
+ * Copyright (C) 2015 Canon Inc.
+ *
+ * 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.
+ */
+
+function webkitGetUserMedia(options, successCallback, errorCallback)
+{
+ "use strict";
+
+ // FIXME: We should raise a DOM unsupported exception if there is no navigator and properly detect whether method is not called on a Navigator object.
+ if (!(this.mediaDevices && this.mediaDevices.@getUserMediaFromJS))
+ throw new @TypeError("The implementation did not support the requested type of object or operation.");
+
+ if (arguments.length < 3)
+ throw new @TypeError("Not enough arguments");
+
+ if (options !== Object(options))
+ throw new @TypeError("Argument 1 (options) to Navigator.webkitGetUserMedia must be an object");
+
+ if (typeof successCallback !== "function")
+ throw new @TypeError("Argument 2 ('successCallback') to Navigator.webkitGetUserMedia must be a function");
+ if (typeof errorCallback !== "function")
+ throw new @TypeError("Argument 3 ('errorCallback') to Navigator.webkitGetUserMedia must be a function");
+
+ this.mediaDevices.@getUserMediaFromJS(options).then(successCallback, errorCallback);
+}
</ins></span></pre></div>
<a id="trunkSourceWebCoreModulesmediastreamNavigatorUserMediaErrorCallbackh"></a>
<div class="delfile"><h4>Deleted: trunk/Source/WebCore/Modules/mediastream/NavigatorUserMediaErrorCallback.h (191948 => 191949)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/mediastream/NavigatorUserMediaErrorCallback.h 2015-11-03 10:43:52 UTC (rev 191948)
+++ trunk/Source/WebCore/Modules/mediastream/NavigatorUserMediaErrorCallback.h 2015-11-03 13:43:56 UTC (rev 191949)
</span><span class="lines">@@ -1,45 +0,0 @@
</span><del>-/*
- * Copyright (C) 2011 Google 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.
- */
-
-#ifndef NavigatorUserMediaErrorCallback_h
-#define NavigatorUserMediaErrorCallback_h
-
-#if ENABLE(MEDIA_STREAM)
-
-#include "NavigatorUserMediaError.h"
-#include <wtf/RefCounted.h>
-
-namespace WebCore {
-
-class NavigatorUserMediaErrorCallback : public RefCounted<NavigatorUserMediaErrorCallback> {
-public:
- virtual ~NavigatorUserMediaErrorCallback() { }
- virtual bool handleEvent(NavigatorUserMediaError*) = 0;
-};
-
-} // namespace WebCore
-
-#endif // ENABLE(MEDIA_STREAM)
-
-#endif // NavigatorUserMediaErrorCallback_h
</del></span></pre></div>
<a id="trunkSourceWebCoreModulesmediastreamNavigatorUserMediaErrorCallbackidl"></a>
<div class="delfile"><h4>Deleted: trunk/Source/WebCore/Modules/mediastream/NavigatorUserMediaErrorCallback.idl (191948 => 191949)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/mediastream/NavigatorUserMediaErrorCallback.idl 2015-11-03 10:43:52 UTC (rev 191948)
+++ trunk/Source/WebCore/Modules/mediastream/NavigatorUserMediaErrorCallback.idl 2015-11-03 13:43:56 UTC (rev 191949)
</span><span class="lines">@@ -1,31 +0,0 @@
</span><del>-/*
- * Copyright (C) 2011 Google 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,
- Callback=FunctionOnly,
-] callback interface NavigatorUserMediaErrorCallback {
- boolean handleEvent(NavigatorUserMediaError error);
-};
-
</del></span></pre></div>
<a id="trunkSourceWebCoreModulesmediastreamNavigatorUserMediaSuccessCallbackh"></a>
<div class="delfile"><h4>Deleted: trunk/Source/WebCore/Modules/mediastream/NavigatorUserMediaSuccessCallback.h (191948 => 191949)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/mediastream/NavigatorUserMediaSuccessCallback.h 2015-11-03 10:43:52 UTC (rev 191948)
+++ trunk/Source/WebCore/Modules/mediastream/NavigatorUserMediaSuccessCallback.h 2015-11-03 13:43:56 UTC (rev 191949)
</span><span class="lines">@@ -1,46 +0,0 @@
</span><del>-/*
- * Copyright (C) 2011 Google 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.
- */
-
-#ifndef NavigatorUserMediaSuccessCallback_h
-#define NavigatorUserMediaSuccessCallback_h
-
-#if ENABLE(MEDIA_STREAM)
-
-#include <wtf/RefCounted.h>
-
-namespace WebCore {
-
-class MediaStream;
-
-class NavigatorUserMediaSuccessCallback : public RefCounted<NavigatorUserMediaSuccessCallback> {
-public:
- virtual ~NavigatorUserMediaSuccessCallback() { }
- virtual bool handleEvent(MediaStream*) = 0;
-};
-
-} // namespace WebCore
-
-#endif // ENABLE(MEDIA_STREAM)
-
-#endif // NavigatorUserMediaSuccessCallback_h
</del></span></pre></div>
<a id="trunkSourceWebCoreModulesmediastreamNavigatorUserMediaSuccessCallbackidl"></a>
<div class="delfile"><h4>Deleted: trunk/Source/WebCore/Modules/mediastream/NavigatorUserMediaSuccessCallback.idl (191948 => 191949)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/mediastream/NavigatorUserMediaSuccessCallback.idl 2015-11-03 10:43:52 UTC (rev 191948)
+++ trunk/Source/WebCore/Modules/mediastream/NavigatorUserMediaSuccessCallback.idl 2015-11-03 13:43:56 UTC (rev 191949)
</span><span class="lines">@@ -1,31 +0,0 @@
</span><del>-/*
- * Copyright (C) 2011 Google 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,
- Callback=FunctionOnly,
-] callback interface NavigatorUserMediaSuccessCallback {
- boolean handleEvent(MediaStream stream);
-};
-
</del></span></pre></div>
<a id="trunkSourceWebCoreModulesmediastreamUserMediaRequestcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/mediastream/UserMediaRequest.cpp (191948 => 191949)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/mediastream/UserMediaRequest.cpp 2015-11-03 10:43:52 UTC (rev 191948)
+++ trunk/Source/WebCore/Modules/mediastream/UserMediaRequest.cpp 2015-11-03 13:43:56 UTC (rev 191949)
</span><span class="lines">@@ -47,8 +47,6 @@
</span><span class="cx"> #include "MediaConstraintsImpl.h"
</span><span class="cx"> #include "MediaStream.h"
</span><span class="cx"> #include "MediaStreamPrivate.h"
</span><del>-#include "NavigatorUserMediaErrorCallback.h"
-#include "NavigatorUserMediaSuccessCallback.h"
</del><span class="cx"> #include "RealtimeMediaSourceCenter.h"
</span><span class="cx"> #include "SecurityOrigin.h"
</span><span class="cx"> #include "UserMediaController.h"
</span></span></pre></div>
<a id="trunkSourceWebCoreModulesmediastreamUserMediaRequesth"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/mediastream/UserMediaRequest.h (191948 => 191949)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/mediastream/UserMediaRequest.h 2015-11-03 10:43:52 UTC (rev 191948)
+++ trunk/Source/WebCore/Modules/mediastream/UserMediaRequest.h 2015-11-03 13:43:56 UTC (rev 191949)
</span><span class="lines">@@ -49,8 +49,6 @@
</span><span class="cx"> class Frame;
</span><span class="cx"> class MediaConstraints;
</span><span class="cx"> class MediaStreamPrivate;
</span><del>-class NavigatorUserMediaErrorCallback;
-class NavigatorUserMediaSuccessCallback;
</del><span class="cx"> class UserMediaController;
</span><span class="cx"> class SecurityOrigin;
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCoreWebCorexcodeprojprojectpbxproj"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/WebCore.xcodeproj/project.pbxproj (191948 => 191949)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/WebCore.xcodeproj/project.pbxproj 2015-11-03 10:43:52 UTC (rev 191948)
+++ trunk/Source/WebCore/WebCore.xcodeproj/project.pbxproj 2015-11-03 13:43:56 UTC (rev 191949)
</span><span class="lines">@@ -153,7 +153,6 @@
</span><span class="cx"> 073794E219EE2D1B00E5A045 /* MediaConstraintsMock.h in Headers */ = {isa = PBXBuildFile; fileRef = 073794E019EE2D1B00E5A045 /* MediaConstraintsMock.h */; };
</span><span class="cx"> 073794E519EE2FF200E5A045 /* JSRTCConfiguration.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 073794E319EE2FF200E5A045 /* JSRTCConfiguration.cpp */; };
</span><span class="cx"> 073794E619EE2FF200E5A045 /* JSRTCConfiguration.h in Headers */ = {isa = PBXBuildFile; fileRef = 073794E419EE2FF200E5A045 /* JSRTCConfiguration.h */; };
</span><del>- 073794E819EE335C00E5A045 /* JSNavigatorCustom.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 073794E719EE335C00E5A045 /* JSNavigatorCustom.cpp */; };
</del><span class="cx"> 073794EB19EE341E00E5A045 /* JSRTCIceServer.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 073794E919EE341E00E5A045 /* JSRTCIceServer.cpp */; };
</span><span class="cx"> 073794EC19EE341E00E5A045 /* JSRTCIceServer.h in Headers */ = {isa = PBXBuildFile; fileRef = 073794EA19EE341E00E5A045 /* JSRTCIceServer.h */; };
</span><span class="cx"> 073794F119EE37BB00E5A045 /* RTCPeerConnectionHandlerMock.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 073794EF19EE37BB00E5A045 /* RTCPeerConnectionHandlerMock.cpp */; };
</span><span class="lines">@@ -173,10 +172,6 @@
</span><span class="cx"> 073BE34117D17E01002BD431 /* JSNavigatorUserMedia.h in Headers */ = {isa = PBXBuildFile; fileRef = 073BE33F17D17E01002BD431 /* JSNavigatorUserMedia.h */; settings = {ATTRIBUTES = (Private, ); }; };
</span><span class="cx"> 073BE34817D17E7A002BD431 /* JSNavigatorUserMediaError.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 073BE34217D17E7A002BD431 /* JSNavigatorUserMediaError.cpp */; };
</span><span class="cx"> 073BE34917D17E7A002BD431 /* JSNavigatorUserMediaError.h in Headers */ = {isa = PBXBuildFile; fileRef = 073BE34317D17E7A002BD431 /* JSNavigatorUserMediaError.h */; };
</span><del>- 073BE34A17D17E7A002BD431 /* JSNavigatorUserMediaErrorCallback.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 073BE34417D17E7A002BD431 /* JSNavigatorUserMediaErrorCallback.cpp */; };
- 073BE34B17D17E7A002BD431 /* JSNavigatorUserMediaErrorCallback.h in Headers */ = {isa = PBXBuildFile; fileRef = 073BE34517D17E7A002BD431 /* JSNavigatorUserMediaErrorCallback.h */; };
- 073BE34C17D17E7A002BD431 /* JSNavigatorUserMediaSuccessCallback.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 073BE34617D17E7A002BD431 /* JSNavigatorUserMediaSuccessCallback.cpp */; };
- 073BE34D17D17E7A002BD431 /* JSNavigatorUserMediaSuccessCallback.h in Headers */ = {isa = PBXBuildFile; fileRef = 073BE34717D17E7A002BD431 /* JSNavigatorUserMediaSuccessCallback.h */; };
</del><span class="cx"> 073BE34E17D180B2002BD431 /* RTCSessionDescriptionDescriptor.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 07221BAB17CF0AD400848E51 /* RTCSessionDescriptionDescriptor.cpp */; };
</span><span class="cx"> 073BE34F17D18183002BD431 /* RTCIceCandidateDescriptor.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 07221BA617CF0AD400848E51 /* RTCIceCandidateDescriptor.cpp */; };
</span><span class="cx"> 073BE35017D181A6002BD431 /* RTCPeerConnectionHandler.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 07221BA817CF0AD400848E51 /* RTCPeerConnectionHandler.cpp */; };
</span><span class="lines">@@ -240,8 +235,6 @@
</span><span class="cx"> 078E091817D14D1C00420AA1 /* MediaStreamTrack.h in Headers */ = {isa = PBXBuildFile; fileRef = 07221B5517CEC32700848E51 /* MediaStreamTrack.h */; };
</span><span class="cx"> 078E091917D14D1C00420AA1 /* MediaStreamTrackEvent.h in Headers */ = {isa = PBXBuildFile; fileRef = 07221B5817CEC32700848E51 /* MediaStreamTrackEvent.h */; settings = {ATTRIBUTES = (Private, ); }; };
</span><span class="cx"> 078E091B17D14D1C00420AA1 /* NavigatorUserMediaError.h in Headers */ = {isa = PBXBuildFile; fileRef = 07221B5D17CEC32700848E51 /* NavigatorUserMediaError.h */; settings = {ATTRIBUTES = (Private, ); }; };
</span><del>- 078E091C17D14D1C00420AA1 /* NavigatorUserMediaErrorCallback.h in Headers */ = {isa = PBXBuildFile; fileRef = 07221B5F17CEC32700848E51 /* NavigatorUserMediaErrorCallback.h */; settings = {ATTRIBUTES = (Private, ); }; };
- 078E091D17D14D1C00420AA1 /* NavigatorUserMediaSuccessCallback.h in Headers */ = {isa = PBXBuildFile; fileRef = 07221B6117CEC32700848E51 /* NavigatorUserMediaSuccessCallback.h */; settings = {ATTRIBUTES = (Private, ); }; };
</del><span class="cx"> 078E091E17D14D1C00420AA1 /* RTCDataChannel.h in Headers */ = {isa = PBXBuildFile; fileRef = 07221B6417CEC32700848E51 /* RTCDataChannel.h */; settings = {ATTRIBUTES = (Private, ); }; };
</span><span class="cx"> 078E091F17D14D1C00420AA1 /* RTCDataChannelEvent.h in Headers */ = {isa = PBXBuildFile; fileRef = 07221B6717CEC32700848E51 /* RTCDataChannelEvent.h */; settings = {ATTRIBUTES = (Private, ); }; };
</span><span class="cx"> 078E092017D14D1C00420AA1 /* RTCDTMFSender.h in Headers */ = {isa = PBXBuildFile; fileRef = 07221B6A17CEC32700848E51 /* RTCDTMFSender.h */; settings = {ATTRIBUTES = (Private, ); }; };
</span><span class="lines">@@ -7359,10 +7352,6 @@
</span><span class="cx"> 07221B5C17CEC32700848E51 /* NavigatorUserMedia.idl */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = NavigatorUserMedia.idl; sourceTree = "<group>"; };
</span><span class="cx"> 07221B5D17CEC32700848E51 /* NavigatorUserMediaError.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = NavigatorUserMediaError.h; sourceTree = "<group>"; };
</span><span class="cx"> 07221B5E17CEC32700848E51 /* NavigatorUserMediaError.idl */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = NavigatorUserMediaError.idl; sourceTree = "<group>"; };
</span><del>- 07221B5F17CEC32700848E51 /* NavigatorUserMediaErrorCallback.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = NavigatorUserMediaErrorCallback.h; sourceTree = "<group>"; };
- 07221B6017CEC32700848E51 /* NavigatorUserMediaErrorCallback.idl */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = NavigatorUserMediaErrorCallback.idl; sourceTree = "<group>"; };
- 07221B6117CEC32700848E51 /* NavigatorUserMediaSuccessCallback.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = NavigatorUserMediaSuccessCallback.h; sourceTree = "<group>"; };
- 07221B6217CEC32700848E51 /* NavigatorUserMediaSuccessCallback.idl */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = NavigatorUserMediaSuccessCallback.idl; sourceTree = "<group>"; };
</del><span class="cx"> 07221B6317CEC32700848E51 /* RTCDataChannel.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = RTCDataChannel.cpp; sourceTree = "<group>"; };
</span><span class="cx"> 07221B6417CEC32700848E51 /* RTCDataChannel.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = RTCDataChannel.h; sourceTree = "<group>"; };
</span><span class="cx"> 07221B6517CEC32700848E51 /* RTCDataChannel.idl */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = RTCDataChannel.idl; sourceTree = "<group>"; };
</span><span class="lines">@@ -7452,7 +7441,6 @@
</span><span class="cx"> 073794E019EE2D1B00E5A045 /* MediaConstraintsMock.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MediaConstraintsMock.h; sourceTree = "<group>"; };
</span><span class="cx"> 073794E319EE2FF200E5A045 /* JSRTCConfiguration.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = JSRTCConfiguration.cpp; sourceTree = "<group>"; };
</span><span class="cx"> 073794E419EE2FF200E5A045 /* JSRTCConfiguration.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = JSRTCConfiguration.h; sourceTree = "<group>"; };
</span><del>- 073794E719EE335C00E5A045 /* JSNavigatorCustom.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = JSNavigatorCustom.cpp; sourceTree = "<group>"; };
</del><span class="cx"> 073794E919EE341E00E5A045 /* JSRTCIceServer.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = JSRTCIceServer.cpp; sourceTree = "<group>"; };
</span><span class="cx"> 073794EA19EE341E00E5A045 /* JSRTCIceServer.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = JSRTCIceServer.h; sourceTree = "<group>"; };
</span><span class="cx"> 073794ED19EE364200E5A045 /* DOMURLMediaStream.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = DOMURLMediaStream.cpp; sourceTree = "<group>"; };
</span><span class="lines">@@ -7474,10 +7462,6 @@
</span><span class="cx"> 073BE33F17D17E01002BD431 /* JSNavigatorUserMedia.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = JSNavigatorUserMedia.h; sourceTree = "<group>"; };
</span><span class="cx"> 073BE34217D17E7A002BD431 /* JSNavigatorUserMediaError.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = JSNavigatorUserMediaError.cpp; sourceTree = "<group>"; };
</span><span class="cx"> 073BE34317D17E7A002BD431 /* JSNavigatorUserMediaError.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = JSNavigatorUserMediaError.h; sourceTree = "<group>"; };
</span><del>- 073BE34417D17E7A002BD431 /* JSNavigatorUserMediaErrorCallback.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = JSNavigatorUserMediaErrorCallback.cpp; sourceTree = "<group>"; };
- 073BE34517D17E7A002BD431 /* JSNavigatorUserMediaErrorCallback.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = JSNavigatorUserMediaErrorCallback.h; sourceTree = "<group>"; };
- 073BE34617D17E7A002BD431 /* JSNavigatorUserMediaSuccessCallback.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = JSNavigatorUserMediaSuccessCallback.cpp; sourceTree = "<group>"; };
- 073BE34717D17E7A002BD431 /* JSNavigatorUserMediaSuccessCallback.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = JSNavigatorUserMediaSuccessCallback.h; sourceTree = "<group>"; };
</del><span class="cx"> 074E82B818A69F0E007EF54C /* PlatformTimeRanges.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = PlatformTimeRanges.cpp; sourceTree = "<group>"; };
</span><span class="cx"> 074E82B918A69F0E007EF54C /* PlatformTimeRanges.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = PlatformTimeRanges.h; sourceTree = "<group>"; };
</span><span class="cx"> 0753860014489E9800B78452 /* CachedTextTrack.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = CachedTextTrack.cpp; sourceTree = "<group>"; };
</span><span class="lines">@@ -8865,6 +8849,7 @@
</span><span class="cx"> 419BE7531BC7F3DB00E1C85B /* WebCoreJSBuiltinInternals.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WebCoreJSBuiltinInternals.h; sourceTree = "<group>"; };
</span><span class="cx"> 419BE7541BC7F3DB00E1C85B /* WebCoreJSBuiltins.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = WebCoreJSBuiltins.cpp; sourceTree = "<group>"; };
</span><span class="cx"> 419BE7551BC7F3DB00E1C85B /* WebCoreJSBuiltins.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WebCoreJSBuiltins.h; sourceTree = "<group>"; };
</span><ins>+ 419BE75A1BCBD3ED00E1C85B /* NavigatorUserMedia.js */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.javascript; path = NavigatorUserMedia.js; sourceTree = "<group>"; };
</ins><span class="cx"> 419FAFAD1ABABCD5005B828B /* ReadableStreamReader.idl */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = ReadableStreamReader.idl; sourceTree = "<group>"; };
</span><span class="cx"> 41A023ED1A39DB7900F722CF /* ReadableStream.idl */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = ReadableStream.idl; sourceTree = "<group>"; };
</span><span class="cx"> 41A023ED1A39DB7900F722DF /* WritableStream.idl */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = WritableStream.idl; sourceTree = "<group>"; };
</span><span class="lines">@@ -15091,13 +15076,10 @@
</span><span class="cx"> 5EA725CB1ACABCB500EAD17B /* NavigatorMediaDevices.h */,
</span><span class="cx"> 5EA725CC1ACABCB500EAD17B /* NavigatorMediaDevices.idl */,
</span><span class="cx"> 07221B5C17CEC32700848E51 /* NavigatorUserMedia.idl */,
</span><ins>+ 419BE75A1BCBD3ED00E1C85B /* NavigatorUserMedia.js */,
</ins><span class="cx"> 070327F717EA4AAF00CE1318 /* NavigatorUserMediaError.cpp */,
</span><span class="cx"> 07221B5D17CEC32700848E51 /* NavigatorUserMediaError.h */,
</span><span class="cx"> 07221B5E17CEC32700848E51 /* NavigatorUserMediaError.idl */,
</span><del>- 07221B5F17CEC32700848E51 /* NavigatorUserMediaErrorCallback.h */,
- 07221B6017CEC32700848E51 /* NavigatorUserMediaErrorCallback.idl */,
- 07221B6117CEC32700848E51 /* NavigatorUserMediaSuccessCallback.h */,
- 07221B6217CEC32700848E51 /* NavigatorUserMediaSuccessCallback.idl */,
</del><span class="cx"> 07AB996518DA3C010018771E /* RTCConfiguration.h */,
</span><span class="cx"> 07AB996618DA3C010018771E /* RTCConfiguration.idl */,
</span><span class="cx"> 07221B6317CEC32700848E51 /* RTCDataChannel.cpp */,
</span><span class="lines">@@ -15295,10 +15277,6 @@
</span><span class="cx"> 073BE33F17D17E01002BD431 /* JSNavigatorUserMedia.h */,
</span><span class="cx"> 073BE34217D17E7A002BD431 /* JSNavigatorUserMediaError.cpp */,
</span><span class="cx"> 073BE34317D17E7A002BD431 /* JSNavigatorUserMediaError.h */,
</span><del>- 073BE34417D17E7A002BD431 /* JSNavigatorUserMediaErrorCallback.cpp */,
- 073BE34517D17E7A002BD431 /* JSNavigatorUserMediaErrorCallback.h */,
- 073BE34617D17E7A002BD431 /* JSNavigatorUserMediaSuccessCallback.cpp */,
- 073BE34717D17E7A002BD431 /* JSNavigatorUserMediaSuccessCallback.h */,
</del><span class="cx"> 073794E319EE2FF200E5A045 /* JSRTCConfiguration.cpp */,
</span><span class="cx"> 073794E419EE2FF200E5A045 /* JSRTCConfiguration.h */,
</span><span class="cx"> 07969D9117D14151007FF842 /* JSRTCDataChannel.cpp */,
</span><span class="lines">@@ -22014,7 +21992,6 @@
</span><span class="cx"> A1E5B31D1AAD1DA4006EBEFB /* JSMockContentFilterSettingsCustom.cpp */,
</span><span class="cx"> C6F0917E143A2BB900685849 /* JSMutationObserverCustom.cpp */,
</span><span class="cx"> BCD9C25F0C17AA67005C90A2 /* JSNamedNodeMapCustom.cpp */,
</span><del>- 073794E719EE335C00E5A045 /* JSNavigatorCustom.cpp */,
</del><span class="cx"> BCD9C2600C17AA67005C90A2 /* JSNodeCustom.cpp */,
</span><span class="cx"> BC9439C2116CF4940048C750 /* JSNodeCustom.h */,
</span><span class="cx"> 1A750DD30A90E729000FF215 /* JSNodeIteratorCustom.cpp */,
</span><span class="lines">@@ -26136,8 +26113,6 @@
</span><span class="cx"> A9D247F80D757E3400FDF959 /* JSNavigator.h in Headers */,
</span><span class="cx"> 073BE34117D17E01002BD431 /* JSNavigatorUserMedia.h in Headers */,
</span><span class="cx"> 073BE34917D17E7A002BD431 /* JSNavigatorUserMediaError.h in Headers */,
</span><del>- 073BE34B17D17E7A002BD431 /* JSNavigatorUserMediaErrorCallback.h in Headers */,
- 073BE34D17D17E7A002BD431 /* JSNavigatorUserMediaSuccessCallback.h in Headers */,
</del><span class="cx"> BC9439C3116CF4940048C750 /* JSNodeCustom.h in Headers */,
</span><span class="cx"> 14115B7309F84CD600CA4FC1 /* JSNodeFilter.h in Headers */,
</span><span class="cx"> 1A750D8E0A90E521000FF215 /* JSNodeIterator.h in Headers */,
</span><span class="lines">@@ -26673,8 +26648,6 @@
</span><span class="cx"> 9711460414EF009A00674FD9 /* NavigatorGeolocation.h in Headers */,
</span><span class="cx"> 5EA725D61ACABD5700EAD17B /* NavigatorMediaDevices.h in Headers */,
</span><span class="cx"> 078E091B17D14D1C00420AA1 /* NavigatorUserMediaError.h in Headers */,
</span><del>- 078E091C17D14D1C00420AA1 /* NavigatorUserMediaErrorCallback.h in Headers */,
- 078E091D17D14D1C00420AA1 /* NavigatorUserMediaSuccessCallback.h in Headers */,
</del><span class="cx"> A19D93461A9FEC7200B46C24 /* NEFilterSourceSPI.h in Headers */,
</span><span class="cx"> 8A309C9F123950BE00CB9204 /* NestingLevelIncrementer.h in Headers */,
</span><span class="cx"> 656D37430ADBA5DE00A4554D /* NetscapePlugInStreamLoader.h in Headers */,
</span><span class="lines">@@ -29799,11 +29772,8 @@
</span><span class="cx"> BCD9C2C00C17B69E005C90A2 /* JSNamedNodeMap.cpp in Sources */,
</span><span class="cx"> BCD9C2630C17AA67005C90A2 /* JSNamedNodeMapCustom.cpp in Sources */,
</span><span class="cx"> A9D247F70D757E3400FDF959 /* JSNavigator.cpp in Sources */,
</span><del>- 073794E819EE335C00E5A045 /* JSNavigatorCustom.cpp in Sources */,
</del><span class="cx"> 073BE34017D17E01002BD431 /* JSNavigatorUserMedia.cpp in Sources */,
</span><span class="cx"> 073BE34817D17E7A002BD431 /* JSNavigatorUserMediaError.cpp in Sources */,
</span><del>- 073BE34A17D17E7A002BD431 /* JSNavigatorUserMediaErrorCallback.cpp in Sources */,
- 073BE34C17D17E7A002BD431 /* JSNavigatorUserMediaSuccessCallback.cpp in Sources */,
</del><span class="cx"> 14DC0D3709FED073007B0235 /* JSNode.cpp in Sources */,
</span><span class="cx"> BCD9C2640C17AA67005C90A2 /* JSNodeCustom.cpp in Sources */,
</span><span class="cx"> 14115B7209F84CD600CA4FC1 /* JSNodeFilter.cpp in Sources */,
</span></span></pre></div>
<a id="trunkSourceWebCorebindingsjsJSDOMWindowBasecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/bindings/js/JSDOMWindowBase.cpp (191948 => 191949)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/bindings/js/JSDOMWindowBase.cpp 2015-11-03 10:43:52 UTC (rev 191948)
+++ trunk/Source/WebCore/bindings/js/JSDOMWindowBase.cpp 2015-11-03 13:43:56 UTC (rev 191949)
</span><span class="lines">@@ -3,6 +3,7 @@
</span><span class="cx"> * Copyright (C) 2006 Jon Shier (jshier@iastate.edu)
</span><span class="cx"> * Copyright (C) 2003-2009, 2014 Apple Inc. All rights reseved.
</span><span class="cx"> * Copyright (C) 2006 Alexey Proskuryakov (ap@webkit.org)
</span><ins>+ * Copyright (c) 2015 Canon Inc. All rights reserved.
</ins><span class="cx"> *
</span><span class="cx"> * This library is free software; you can redistribute it and/or
</span><span class="cx"> * modify it under the terms of the GNU Lesser General Public
</span><span class="lines">@@ -83,34 +84,35 @@
</span><span class="cx">
</span><span class="cx"> m_privateFunctions.init(*this);
</span><span class="cx">
</span><ins>+#if ENABLE(STREAMS_API)
+ JSVMClientData& clientData = *static_cast<JSVMClientData*>(vm.clientData);
+#endif
+
</ins><span class="cx"> GlobalPropertyInfo staticGlobals[] = {
</span><span class="cx"> GlobalPropertyInfo(vm.propertyNames->document, jsNull(), DontDelete | ReadOnly),
</span><span class="cx"> GlobalPropertyInfo(vm.propertyNames->window, m_shell, DontDelete | ReadOnly),
</span><span class="cx"> #if ENABLE(STREAMS_API)
</span><del>- GlobalPropertyInfo(static_cast<JSVMClientData*>(vm.clientData)->builtinNames().streamClosedPrivateName(), jsNumber(1), DontDelete | ReadOnly),
- GlobalPropertyInfo(static_cast<JSVMClientData*>(vm.clientData)->builtinNames().streamClosingPrivateName(), jsNumber(2), DontDelete | ReadOnly),
- GlobalPropertyInfo(static_cast<JSVMClientData*>(vm.clientData)->builtinNames().streamErroredPrivateName(), jsNumber(3), DontDelete | ReadOnly),
- GlobalPropertyInfo(static_cast<JSVMClientData*>(vm.clientData)->builtinNames().streamReadablePrivateName(), jsNumber(4), DontDelete | ReadOnly),
- GlobalPropertyInfo(static_cast<JSVMClientData*>(vm.clientData)->builtinNames().streamWaitingPrivateName(), jsNumber(5), DontDelete | ReadOnly),
- GlobalPropertyInfo(static_cast<JSVMClientData*>(vm.clientData)->builtinNames().streamWritablePrivateName(), jsNumber(6), DontDelete | ReadOnly),
- GlobalPropertyInfo(static_cast<JSVMClientData*>(vm.clientData)->builtinNames().ReadableStreamControllerPrivateName(), createReadableStreamControllerPrivateConstructor(vm, *this), DontDelete | ReadOnly),
- GlobalPropertyInfo(static_cast<JSVMClientData*>(vm.clientData)->builtinNames().ReadableStreamReaderPrivateName(), createReadableStreamReaderPrivateConstructor(vm, *this), DontDelete | ReadOnly),
</del><ins>+ GlobalPropertyInfo(clientData.builtinNames().streamClosedPrivateName(), jsNumber(1), DontDelete | ReadOnly),
+ GlobalPropertyInfo(clientData.builtinNames().streamClosingPrivateName(), jsNumber(2), DontDelete | ReadOnly),
+ GlobalPropertyInfo(clientData.builtinNames().streamErroredPrivateName(), jsNumber(3), DontDelete | ReadOnly),
+ GlobalPropertyInfo(clientData.builtinNames().streamReadablePrivateName(), jsNumber(4), DontDelete | ReadOnly),
+ GlobalPropertyInfo(clientData.builtinNames().streamWaitingPrivateName(), jsNumber(5), DontDelete | ReadOnly),
+ GlobalPropertyInfo(clientData.builtinNames().streamWritablePrivateName(), jsNumber(6), DontDelete | ReadOnly),
+ GlobalPropertyInfo(clientData.builtinNames().ReadableStreamControllerPrivateName(), createReadableStreamControllerPrivateConstructor(vm, *this), DontDelete | ReadOnly),
+ GlobalPropertyInfo(clientData.builtinNames().ReadableStreamReaderPrivateName(), createReadableStreamReaderPrivateConstructor(vm, *this), DontDelete | ReadOnly),
</ins><span class="cx"> #define DECLARE_GLOBAL_STATIC(name)\
</span><span class="cx"> GlobalPropertyInfo(\
</span><del>- static_cast<JSVMClientData*>(vm.clientData)->builtinFunctions().readableStreamInternalsBuiltins().name##PrivateName(), \
- m_privateFunctions.readableStreamInternals().m_##name##Function.get() , DontDelete | ReadOnly),
</del><ins>+ clientData.builtinFunctions().readableStreamInternalsBuiltins().name##PrivateName(), m_privateFunctions.readableStreamInternals().m_##name##Function.get() , DontDelete | ReadOnly),
</ins><span class="cx"> WEBCORE_FOREACH_READABLESTREAMINTERNALS_BUILTIN_FUNCTION_NAME(DECLARE_GLOBAL_STATIC)
</span><span class="cx"> #undef DECLARE_GLOBAL_STATIC
</span><span class="cx"> #define DECLARE_GLOBAL_STATIC(name)\
</span><span class="cx"> GlobalPropertyInfo(\
</span><del>- static_cast<JSVMClientData*>(vm.clientData)->builtinFunctions().streamInternalsBuiltins().name##PrivateName(), \
- m_privateFunctions.streamInternals().m_##name##Function.get() , DontDelete | ReadOnly),
</del><ins>+ clientData.builtinFunctions().streamInternalsBuiltins().name##PrivateName(), m_privateFunctions.streamInternals().m_##name##Function.get() , DontDelete | ReadOnly),
</ins><span class="cx"> WEBCORE_FOREACH_STREAMINTERNALS_BUILTIN_FUNCTION_NAME(DECLARE_GLOBAL_STATIC)
</span><span class="cx"> #undef DECLARE_GLOBAL_STATIC
</span><span class="cx"> #define DECLARE_GLOBAL_STATIC(name)\
</span><span class="cx"> GlobalPropertyInfo(\
</span><del>- static_cast<JSVMClientData*>(vm.clientData)->builtinFunctions().writableStreamInternalsBuiltins().name##PrivateName(), \
- m_privateFunctions.writableStreamInternals().m_##name##Function.get() , DontDelete | ReadOnly),
</del><ins>+ clientData.builtinFunctions().writableStreamInternalsBuiltins().name##PrivateName(), m_privateFunctions.writableStreamInternals().m_##name##Function.get() , DontDelete | ReadOnly),
</ins><span class="cx"> WEBCORE_FOREACH_WRITABLESTREAMINTERNALS_BUILTIN_FUNCTION_NAME(DECLARE_GLOBAL_STATIC)
</span><span class="cx"> #undef DECLARE_GLOBAL_STATIC
</span><span class="cx"> #endif
</span></span></pre></div>
<a id="trunkSourceWebCorebindingsjsJSNavigatorCustomcpp"></a>
<div class="delfile"><h4>Deleted: trunk/Source/WebCore/bindings/js/JSNavigatorCustom.cpp (191948 => 191949)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/bindings/js/JSNavigatorCustom.cpp 2015-11-03 10:43:52 UTC (rev 191948)
+++ trunk/Source/WebCore/bindings/js/JSNavigatorCustom.cpp 2015-11-03 13:43:56 UTC (rev 191949)
</span><span class="lines">@@ -1,103 +0,0 @@
</span><del>-/*
- * Copyright (C) 2013 Nokia Corporation and/or its subsidiary(-ies).
- * Copyright (C) 2015 Canon INC.
- *
- * 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 THE COPYRIGHT HOLDERS AND 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 THE COPYRIGHT
- * OWNER 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"
-
-#if ENABLE(MEDIA_STREAM)
-#include "JSNavigator.h"
-
-#include "Dictionary.h"
-#include "Document.h"
-#include "ExceptionCode.h"
-#include "Frame.h"
-#include "JSNavigatorUserMediaErrorCallback.h"
-#include "JSNavigatorUserMediaSuccessCallback.h"
-#include "MediaStream.h"
-#include "UserMediaRequest.h"
-
-using namespace JSC;
-
-namespace WebCore {
-
-JSValue JSNavigator::webkitGetUserMedia(ExecState& state)
-{
- if (state.argumentCount() < 3) {
- throwVMError(&state, createNotEnoughArgumentsError(&state));
- return jsUndefined();
- }
-
- Dictionary options(&state, state.argument(0));
- if (state.hadException())
- return jsUndefined();
-
- if (!options.isObject()) {
- throwVMError(&state, createTypeError(&state, "First argument of webkitGetUserMedia must be a valid Dictionary"));
- return jsUndefined();
- }
-
- if (!state.argument(1).isFunction()) {
- throwVMTypeError(&state, "Argument 2 ('successCallback') to Navigator.webkitGetUserMedia must be a function");
- return jsUndefined();
- }
-
- if (!state.argument(2).isFunction()) {
- throwVMTypeError(&state, "Argument 3 ('errorCallback') to Navigator.webkitGetUserMedia must be a function");
- return jsUndefined();
- }
-
- if (!wrapped().frame()) {
- setDOMException(&state, NOT_SUPPORTED_ERR);
- return jsUndefined();
- }
-
- // We do not need to protect the context (i.e. document) here as UserMediaRequest is observing context destruction and will check validity before resolving/rejecting promise.
- Document* document = wrapped().frame()->document();
-
- RefPtr<NavigatorUserMediaSuccessCallback> successCallback = JSNavigatorUserMediaSuccessCallback::create(asObject(state.uncheckedArgument(1)), globalObject());
- auto resolveCallback = [successCallback, document](const RefPtr<MediaStream>& stream) mutable {
- RefPtr<MediaStream> protectedStream = stream;
- document->postTask([successCallback, protectedStream](ScriptExecutionContext&) {
- successCallback->handleEvent(protectedStream.get());
- });
- };
-
- RefPtr<NavigatorUserMediaErrorCallback> errorCallback = JSNavigatorUserMediaErrorCallback::create(asObject(state.uncheckedArgument(2)), globalObject());
- auto rejectCallback = [errorCallback, document](const RefPtr<NavigatorUserMediaError>& error) mutable {
- RefPtr<NavigatorUserMediaError> protectedError = error;
- document->postTask([errorCallback, protectedError](ScriptExecutionContext&) {
- errorCallback->handleEvent(protectedError.get());
- });
- };
-
- ExceptionCode ec = 0;
- UserMediaRequest::start(document, options, MediaDevices::Promise(WTF::move(resolveCallback), WTF::move(rejectCallback)), ec);
- setDOMException(&state, ec);
- return jsUndefined();
-}
-
-} // namespace WebCore
-
-#endif // ENABLE(MEDIA_STREAM)
</del></span></pre></div>
<a id="trunkSourceWebCorebindingsjsWebCoreJSBuiltinscpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/bindings/js/WebCoreJSBuiltins.cpp (191948 => 191949)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/bindings/js/WebCoreJSBuiltins.cpp 2015-11-03 10:43:52 UTC (rev 191948)
+++ trunk/Source/WebCore/bindings/js/WebCoreJSBuiltins.cpp 2015-11-03 13:43:56 UTC (rev 191949)
</span><span class="lines">@@ -41,3 +41,6 @@
</span><span class="cx"> #include "WritableStreamBuiltins.cpp"
</span><span class="cx"> #include "WritableStreamInternalsBuiltins.cpp"
</span><span class="cx"> #endif
</span><ins>+#if ENABLE(MEDIA_STREAM)
+#include "NavigatorUserMediaBuiltins.cpp"
+#endif
</ins></span></pre></div>
<a id="trunkSourceWebCorebindingsjsWebCoreJSBuiltinsh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/bindings/js/WebCoreJSBuiltins.h (191948 => 191949)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/bindings/js/WebCoreJSBuiltins.h 2015-11-03 10:43:52 UTC (rev 191948)
+++ trunk/Source/WebCore/bindings/js/WebCoreJSBuiltins.h 2015-11-03 13:43:56 UTC (rev 191949)
</span><span class="lines">@@ -29,6 +29,7 @@
</span><span class="cx">
</span><span class="cx"> #if ENABLE(MEDIA_STREAM)
</span><span class="cx"> #include "MediaDevicesBuiltins.h"
</span><ins>+#include "NavigatorUserMediaBuiltins.h"
</ins><span class="cx"> #endif
</span><span class="cx">
</span><span class="cx"> #if ENABLE(STREAMS_API)
</span><span class="lines">@@ -64,6 +65,7 @@
</span><span class="cx"> #endif
</span><span class="cx"> #if ENABLE(MEDIA_STREAM)
</span><span class="cx"> , m_mediaDevicesBuiltins(&vm)
</span><ins>+ , m_navigatorUserMediaBuiltins(&vm)
</ins><span class="cx"> #endif
</span><span class="cx"> {
</span><span class="cx"> #if ENABLE(STREAMS_API)
</span><span class="lines">@@ -85,6 +87,7 @@
</span><span class="cx"> #endif
</span><span class="cx"> #if ENABLE(MEDIA_STREAM)
</span><span class="cx"> MediaDevicesBuiltinsWrapper& mediaDevicesBuiltins() { return m_mediaDevicesBuiltins; }
</span><ins>+ NavigatorUserMediaBuiltinsWrapper& navigatorUserMediaBuiltins() { return m_navigatorUserMediaBuiltins;}
</ins><span class="cx"> #endif
</span><span class="cx">
</span><span class="cx"> private:
</span><span class="lines">@@ -102,6 +105,7 @@
</span><span class="cx"> #endif
</span><span class="cx"> #if ENABLE(MEDIA_STREAM)
</span><span class="cx"> MediaDevicesBuiltinsWrapper m_mediaDevicesBuiltins;
</span><ins>+ NavigatorUserMediaBuiltinsWrapper m_navigatorUserMediaBuiltins;
</ins><span class="cx"> #endif
</span><span class="cx">
</span><span class="cx"> };
</span></span></pre>
</div>
</div>
</body>
</html>