<!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>[198160] 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/198160">198160</a></dd>
<dt>Author</dt> <dd>bfulgham@apple.com</dd>
<dt>Date</dt> <dd>2016-03-14 14:53:10 -0700 (Mon, 14 Mar 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>REGRESSION (<a href="http://trac.webkit.org/projects/webkit/changeset/197114">r197114</a>): Crash in WebCore::MediaDevicesRequest::didCompletePermissionCheck
https://bugs.webkit.org/show_bug.cgi?id=155453
<rdar://problem/24879447>
Reviewed by Daniel Bates.
Source/WebCore:
Tested by fast/mediastream/enumerating-crash.html.
* Modules/mediastream/MediaDevicesRequest.cpp:
(WebCore::MediaDevicesRequest::didCompletePermissionCheck): Prevent UserMediaPermissionCheck object from being
destroyed before the method completes.
LayoutTests:
* fast/mediastream/enumerating-crash-expected.txt: Added.
* fast/mediastream/enumerating-crash.html: Added.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsChangeLog">trunk/LayoutTests/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoreModulesmediastreamMediaDevicesRequestcpp">trunk/Source/WebCore/Modules/mediastream/MediaDevicesRequest.cpp</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsfastmediastreamenumeratingcrashexpectedtxt">trunk/LayoutTests/fast/mediastream/enumerating-crash-expected.txt</a></li>
<li><a href="#trunkLayoutTestsfastmediastreamenumeratingcrashhtml">trunk/LayoutTests/fast/mediastream/enumerating-crash.html</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkLayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/ChangeLog (198159 => 198160)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/ChangeLog 2016-03-14 21:50:20 UTC (rev 198159)
+++ trunk/LayoutTests/ChangeLog 2016-03-14 21:53:10 UTC (rev 198160)
</span><span class="lines">@@ -1,3 +1,14 @@
</span><ins>+2016-03-14 Brent Fulgham <bfulgham@apple.com>
+
+ REGRESSION (r197114): Crash in WebCore::MediaDevicesRequest::didCompletePermissionCheck
+ https://bugs.webkit.org/show_bug.cgi?id=155453
+ <rdar://problem/24879447>
+
+ Reviewed by Daniel Bates.
+
+ * fast/mediastream/enumerating-crash-expected.txt: Added.
+ * fast/mediastream/enumerating-crash.html: Added.
+
</ins><span class="cx"> 2016-03-14 Saam barati <sbarati@apple.com>
</span><span class="cx">
</span><span class="cx"> [ES6] Disallow var assignments in for-in loops
</span></span></pre></div>
<a id="trunkLayoutTestsfastmediastreamenumeratingcrashexpectedtxt"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/fast/mediastream/enumerating-crash-expected.txt (0 => 198160)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/mediastream/enumerating-crash-expected.txt (rev 0)
+++ trunk/LayoutTests/fast/mediastream/enumerating-crash-expected.txt 2016-03-14 21:53:10 UTC (rev 198160)
</span><span class="lines">@@ -0,0 +1 @@
</span><ins>+Test to ensure we don't crash when enumerating media devices. The test passes if it does not crash.
</ins></span></pre></div>
<a id="trunkLayoutTestsfastmediastreamenumeratingcrashhtml"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/fast/mediastream/enumerating-crash.html (0 => 198160)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/mediastream/enumerating-crash.html (rev 0)
+++ trunk/LayoutTests/fast/mediastream/enumerating-crash.html 2016-03-14 21:53:10 UTC (rev 198160)
</span><span class="lines">@@ -0,0 +1,33 @@
</span><ins>+<html>
+<head>
+</head>
+<body>
+<p>Test to ensure we don't crash when enumerating media devices. The test passes if it does not crash.</p>
+<script>
+ if (window.testRunner)
+ testRunner.dumpAsText();
+</script>
+</body>
+<script>
+function shouldNotCrash() {
+ try {
+ document.addEventListener("webglcontextlost", function () {
+ var x = window.navigator.mediaDevices;
+ x.enumerateDevices();
+ x.getUserMediaFromJS(123456789.);
+ }, true);
+
+ var dispatch_fn = function() {
+ var evt = document.createEvent("Event");
+ evt.initEvent("webglcontextlost", false, false);
+ document.dispatchEvent(evt);
+ }
+ window.setInterval(dispatch_fn, 202);
+ } catch(e) {
+ document.write("Errlog shouldNotCrash: " + e.name + ": " + e.message + "<br>");
+ }
+}
+shouldNotCrash();
+</script>
+</html>
+
</ins></span></pre></div>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (198159 => 198160)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2016-03-14 21:50:20 UTC (rev 198159)
+++ trunk/Source/WebCore/ChangeLog 2016-03-14 21:53:10 UTC (rev 198160)
</span><span class="lines">@@ -1,3 +1,17 @@
</span><ins>+2016-03-14 Brent Fulgham <bfulgham@apple.com>
+
+ REGRESSION (r197114): Crash in WebCore::MediaDevicesRequest::didCompletePermissionCheck
+ https://bugs.webkit.org/show_bug.cgi?id=155453
+ <rdar://problem/24879447>
+
+ Reviewed by Daniel Bates.
+
+ Tested by fast/mediastream/enumerating-crash.html.
+
+ * Modules/mediastream/MediaDevicesRequest.cpp:
+ (WebCore::MediaDevicesRequest::didCompletePermissionCheck): Prevent UserMediaPermissionCheck object from being
+ destroyed before the method completes.
+
</ins><span class="cx"> 2016-03-14 Simon Fraser <simon.fraser@apple.com>
</span><span class="cx">
</span><span class="cx"> Fix crash when reloading a page using requestAnimationFrame on iOS
</span></span></pre></div>
<a id="trunkSourceWebCoreModulesmediastreamMediaDevicesRequestcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/mediastream/MediaDevicesRequest.cpp (198159 => 198160)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/mediastream/MediaDevicesRequest.cpp 2016-03-14 21:50:20 UTC (rev 198159)
+++ trunk/Source/WebCore/Modules/mediastream/MediaDevicesRequest.cpp 2016-03-14 21:53:10 UTC (rev 198160)
</span><span class="lines">@@ -85,13 +85,14 @@
</span><span class="cx">
</span><span class="cx"> void MediaDevicesRequest::didCompletePermissionCheck(const String& salt, bool canAccess)
</span><span class="cx"> {
</span><ins>+ RefPtr<UserMediaPermissionCheck> permissionCheckProtector = m_permissionCheck;
</ins><span class="cx"> m_permissionCheck->setClient(nullptr);
</span><span class="cx"> m_permissionCheck = nullptr;
</span><span class="cx">
</span><span class="cx"> m_idHashSalt = salt;
</span><span class="cx"> m_havePersistentPermission = canAccess;
</span><span class="cx">
</span><del>- callOnMainThread([this] {
</del><ins>+ callOnMainThread([this, permissionCheckProtector] {
</ins><span class="cx"> RealtimeMediaSourceCenter::singleton().getMediaStreamTrackSources(this);
</span><span class="cx"> });
</span><span class="cx"> }
</span></span></pre>
</div>
</div>
</body>
</html>