<!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>[202810] 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/202810">202810</a></dd>
<dt>Author</dt> <dd>commit-queue@webkit.org</dd>
<dt>Date</dt> <dd>2016-07-04 11:31:37 -0700 (Mon, 04 Jul 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>Shield WebRTC JS built-ins from user scripts
https://bugs.webkit.org/show_bug.cgi?id=155964
Patch by Youenn Fablet <youenn@apple.com> on 2016-07-04
Reviewed by Sam Weinig.
Source/WebCore:
Making use of Promise.prototype.@then instead of Promise.prototype.then.
Covered by updated tests.
* Modules/mediastream/RTCPeerConnection.js:
(createOffer):
(createAnswer):
(setLocalDescription):
(setRemoteDescription):
(addIceCandidate):
(getStats):
* Modules/mediastream/RTCPeerConnectionInternals.js:
(enqueueOperation):
LayoutTests:
* fast/mediastream/RTCPeerConnection-createOffer.html:
* fast/mediastream/RTCPeerConnection-stable.html:</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsChangeLog">trunk/LayoutTests/ChangeLog</a></li>
<li><a href="#trunkLayoutTestsfastmediastreamRTCPeerConnectioncreateOfferhtml">trunk/LayoutTests/fast/mediastream/RTCPeerConnection-createOffer.html</a></li>
<li><a href="#trunkLayoutTestsfastmediastreamRTCPeerConnectionstablehtml">trunk/LayoutTests/fast/mediastream/RTCPeerConnection-stable.html</a></li>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoreModulesmediastreamRTCPeerConnectionjs">trunk/Source/WebCore/Modules/mediastream/RTCPeerConnection.js</a></li>
<li><a href="#trunkSourceWebCoreModulesmediastreamRTCPeerConnectionInternalsjs">trunk/Source/WebCore/Modules/mediastream/RTCPeerConnectionInternals.js</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkLayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/ChangeLog (202809 => 202810)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/ChangeLog 2016-07-04 15:30:50 UTC (rev 202809)
+++ trunk/LayoutTests/ChangeLog 2016-07-04 18:31:37 UTC (rev 202810)
</span><span class="lines">@@ -1,3 +1,13 @@
</span><ins>+2016-07-04 Youenn Fablet <youenn@apple.com>
+
+ Shield WebRTC JS built-ins from user scripts
+ https://bugs.webkit.org/show_bug.cgi?id=155964
+
+ Reviewed by Sam Weinig.
+
+ * fast/mediastream/RTCPeerConnection-createOffer.html:
+ * fast/mediastream/RTCPeerConnection-stable.html:
+
</ins><span class="cx"> 2016-07-04 Yusuke Suzuki <utatane.tea@gmail.com>
</span><span class="cx">
</span><span class="cx"> Unreviewed, skip misc-bugs-847389-jpeg2000.js in jsc stress tests
</span></span></pre></div>
<a id="trunkLayoutTestsfastmediastreamRTCPeerConnectioncreateOfferhtml"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/fast/mediastream/RTCPeerConnection-createOffer.html (202809 => 202810)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/mediastream/RTCPeerConnection-createOffer.html 2016-07-04 15:30:50 UTC (rev 202809)
+++ trunk/LayoutTests/fast/mediastream/RTCPeerConnection-createOffer.html 2016-07-04 18:31:37 UTC (rev 202810)
</span><span class="lines">@@ -7,6 +7,13 @@
</span><span class="cx"> <script>
</span><span class="cx"> description("Tests RTCPeerConnection createOffer.");
</span><span class="cx">
</span><ins>+ // Let's ensure built-ins are shielded from user scripts
+ var thenPromise = Promise.prototype.then;
+ Promise.prototype.then = function() {
+ console.log("Promise.prototype.then is called internally");
+ return thenPromise.apply(this, arguments);
+ }
+
</ins><span class="cx"> var pc = null;
</span><span class="cx">
</span><span class="cx"> function requestSucceeded3(sd)
</span></span></pre></div>
<a id="trunkLayoutTestsfastmediastreamRTCPeerConnectionstablehtml"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/fast/mediastream/RTCPeerConnection-stable.html (202809 => 202810)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/mediastream/RTCPeerConnection-stable.html 2016-07-04 15:30:50 UTC (rev 202809)
+++ trunk/LayoutTests/fast/mediastream/RTCPeerConnection-stable.html 2016-07-04 18:31:37 UTC (rev 202810)
</span><span class="lines">@@ -9,6 +9,13 @@
</span><span class="cx">
</span><span class="cx"> var pc = null;
</span><span class="cx">
</span><ins>+ // Let's ensure built-ins are shielded from user scripts
+ var thenPromise = Promise.prototype.then;
+ Promise.prototype.then = function() {
+ console.log("Promise.prototype.then is called internally");
+ return thenPromise.apply(this, arguments);
+ }
+
</ins><span class="cx"> function requestSucceeded2()
</span><span class="cx"> {
</span><span class="cx"> testPassed('setRemoteDescription succeeded.');
</span></span></pre></div>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (202809 => 202810)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2016-07-04 15:30:50 UTC (rev 202809)
+++ trunk/Source/WebCore/ChangeLog 2016-07-04 18:31:37 UTC (rev 202810)
</span><span class="lines">@@ -1,3 +1,23 @@
</span><ins>+2016-07-04 Youenn Fablet <youenn@apple.com>
+
+ Shield WebRTC JS built-ins from user scripts
+ https://bugs.webkit.org/show_bug.cgi?id=155964
+
+ Reviewed by Sam Weinig.
+
+ Making use of Promise.prototype.@then instead of Promise.prototype.then.
+ Covered by updated tests.
+
+ * Modules/mediastream/RTCPeerConnection.js:
+ (createOffer):
+ (createAnswer):
+ (setLocalDescription):
+ (setRemoteDescription):
+ (addIceCandidate):
+ (getStats):
+ * Modules/mediastream/RTCPeerConnectionInternals.js:
+ (enqueueOperation):
+
</ins><span class="cx"> 2016-07-04 Brady Eidson <beidson@apple.com>
</span><span class="cx">
</span><span class="cx"> WebProcesses don't handle DatabaseProcess going away uncleanly..
</span></span></pre></div>
<a id="trunkSourceWebCoreModulesmediastreamRTCPeerConnectionjs"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/mediastream/RTCPeerConnection.js (202809 => 202810)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/mediastream/RTCPeerConnection.js 2016-07-04 15:30:50 UTC (rev 202809)
+++ trunk/Source/WebCore/Modules/mediastream/RTCPeerConnection.js 2016-07-04 18:31:37 UTC (rev 202810)
</span><span class="lines">@@ -146,7 +146,7 @@
</span><span class="cx"> }, function (successCallback, errorCallback, options) {
</span><span class="cx"> // Legacy callbacks mode
</span><span class="cx"> @enqueueOperation(peerConnection, function () {
</span><del>- return peerConnection.@queuedCreateOffer(options).then(successCallback, errorCallback);
</del><ins>+ return peerConnection.@queuedCreateOffer(options).@then(successCallback, errorCallback);
</ins><span class="cx"> });
</span><span class="cx">
</span><span class="cx"> return @Promise.@resolve(@undefined);
</span><span class="lines">@@ -170,7 +170,7 @@
</span><span class="cx"> }, function (successCallback, errorCallback, options) {
</span><span class="cx"> // Legacy callbacks mode
</span><span class="cx"> @enqueueOperation(peerConnection, function () {
</span><del>- return peerConnection.@queuedCreateAnswer(options).then(successCallback, errorCallback);
</del><ins>+ return peerConnection.@queuedCreateAnswer(options).@then(successCallback, errorCallback);
</ins><span class="cx"> });
</span><span class="cx">
</span><span class="cx"> return @Promise.@resolve(@undefined);
</span><span class="lines">@@ -199,7 +199,7 @@
</span><span class="cx"> }, function (description, successCallback, errorCallback) {
</span><span class="cx"> // Legacy callbacks mode
</span><span class="cx"> @enqueueOperation(peerConnection, function () {
</span><del>- return peerConnection.@queuedSetLocalDescription(description).then(successCallback, errorCallback);
</del><ins>+ return peerConnection.@queuedSetLocalDescription(description).@then(successCallback, errorCallback);
</ins><span class="cx"> });
</span><span class="cx">
</span><span class="cx"> return @Promise.@resolve(@undefined);
</span><span class="lines">@@ -228,7 +228,7 @@
</span><span class="cx"> }, function (description, successCallback, errorCallback) {
</span><span class="cx"> // Legacy callbacks mode
</span><span class="cx"> @enqueueOperation(peerConnection, function () {
</span><del>- return peerConnection.@queuedSetRemoteDescription(description).then(successCallback, errorCallback);
</del><ins>+ return peerConnection.@queuedSetRemoteDescription(description).@then(successCallback, errorCallback);
</ins><span class="cx"> });
</span><span class="cx">
</span><span class="cx"> return @Promise.@resolve(@undefined);
</span><span class="lines">@@ -257,7 +257,7 @@
</span><span class="cx"> }, function (candidate, successCallback, errorCallback) {
</span><span class="cx"> // Legacy callbacks mode
</span><span class="cx"> @enqueueOperation(peerConnection, function () {
</span><del>- return peerConnection.@queuedAddIceCandidate(candidate).then(successCallback, errorCallback);
</del><ins>+ return peerConnection.@queuedAddIceCandidate(candidate).@then(successCallback, errorCallback);
</ins><span class="cx"> });
</span><span class="cx">
</span><span class="cx"> return @Promise.@resolve(@undefined);
</span><span class="lines">@@ -284,7 +284,7 @@
</span><span class="cx"> return peerConnection.@privateGetStats(selector);
</span><span class="cx"> }, function (selector, successCallback, errorCallback) {
</span><span class="cx"> // Legacy callbacks mode
</span><del>- peerConnection.@privateGetStats(selector).then(successCallback, errorCallback);
</del><ins>+ peerConnection.@privateGetStats(selector).@then(successCallback, errorCallback);
</ins><span class="cx">
</span><span class="cx"> return @Promise.@resolve(@undefined);
</span><span class="cx"> });
</span></span></pre></div>
<a id="trunkSourceWebCoreModulesmediastreamRTCPeerConnectionInternalsjs"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/mediastream/RTCPeerConnectionInternals.js (202809 => 202810)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/mediastream/RTCPeerConnectionInternals.js 2016-07-04 15:30:50 UTC (rev 202809)
+++ trunk/Source/WebCore/Modules/mediastream/RTCPeerConnectionInternals.js 2016-07-04 18:31:37 UTC (rev 202810)
</span><span class="lines">@@ -46,7 +46,7 @@
</span><span class="cx">
</span><span class="cx"> return new @Promise(function (resolve, reject) {
</span><span class="cx"> operations.@push(function() {
</span><del>- operation().then(resolve, reject).then(runNext, runNext);
</del><ins>+ operation().@then(resolve, reject).@then(runNext, runNext);
</ins><span class="cx"> });
</span><span class="cx">
</span><span class="cx"> if (operations.length == 1)
</span></span></pre>
</div>
</div>
</body>
</html>