<!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>[211674] trunk/Tools</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/211674">211674</a></dd>
<dt>Author</dt> <dd>akling@apple.com</dd>
<dt>Date</dt> <dd>2017-02-04 13:46:21 -0800 (Sat, 04 Feb 2017)</dd>
</dl>
<h3>Log Message</h3>
<pre>Plug some leaks in TestController and UIScriptContext.
<https://webkit.org/b/167839>
Reviewed by Alexey Proskuryakov.
Fix a couple of the leaks seen on the leaks bot.
* TestRunnerShared/UIScriptContext/UIScriptContext.cpp:
(UIScriptContext::runUIScript):
* WebKitTestRunner/TestController.cpp:
(WTR::TestController::handleCheckOfUserMediaPermissionForOrigin):
(WTR::TestController::decidePolicyForUserMediaPermissionRequestIfPossible):</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkToolsChangeLog">trunk/Tools/ChangeLog</a></li>
<li><a href="#trunkToolsTestRunnerSharedUIScriptContextUIScriptContextcpp">trunk/Tools/TestRunnerShared/UIScriptContext/UIScriptContext.cpp</a></li>
<li><a href="#trunkToolsWebKitTestRunnerTestControllercpp">trunk/Tools/WebKitTestRunner/TestController.cpp</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkToolsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Tools/ChangeLog (211673 => 211674)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/ChangeLog 2017-02-04 21:40:33 UTC (rev 211673)
+++ trunk/Tools/ChangeLog 2017-02-04 21:46:21 UTC (rev 211674)
</span><span class="lines">@@ -1,3 +1,18 @@
</span><ins>+2017-02-04 Andreas Kling <akling@apple.com>
+
+ Plug some leaks in TestController and UIScriptContext.
+ <https://webkit.org/b/167839>
+
+ Reviewed by Alexey Proskuryakov.
+
+ Fix a couple of the leaks seen on the leaks bot.
+
+ * TestRunnerShared/UIScriptContext/UIScriptContext.cpp:
+ (UIScriptContext::runUIScript):
+ * WebKitTestRunner/TestController.cpp:
+ (WTR::TestController::handleCheckOfUserMediaPermissionForOrigin):
+ (WTR::TestController::decidePolicyForUserMediaPermissionRequestIfPossible):
+
</ins><span class="cx"> 2017-02-03 Jeremy Jones <jeremyj@apple.com>
</span><span class="cx">
</span><span class="cx"> WK1 mouse events are missing movementX and movementY for pointerlock.
</span></span></pre></div>
<a id="trunkToolsTestRunnerSharedUIScriptContextUIScriptContextcpp"></a>
<div class="modfile"><h4>Modified: trunk/Tools/TestRunnerShared/UIScriptContext/UIScriptContext.cpp (211673 => 211674)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/TestRunnerShared/UIScriptContext/UIScriptContext.cpp 2017-02-04 21:40:33 UTC (rev 211673)
+++ trunk/Tools/TestRunnerShared/UIScriptContext/UIScriptContext.cpp 2017-02-04 21:46:21 UTC (rev 211674)
</span><span class="lines">@@ -67,7 +67,8 @@
</span><span class="cx">
</span><span class="cx"> if (!hasOutstandingAsyncTasks()) {
</span><span class="cx"> JSValueRef stringifyException = nullptr;
</span><del>- requestUIScriptCompletion(JSValueToStringCopy(m_context.get(), result, &stringifyException));
</del><ins>+ JSRetainPtr<JSStringRef> stringified(Adopt, JSValueToStringCopy(m_context.get(), result, &stringifyException));
+ requestUIScriptCompletion(stringified.get());
</ins><span class="cx"> tryToCompleteUIScriptForCurrentParentCallback();
</span><span class="cx"> }
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkToolsWebKitTestRunnerTestControllercpp"></a>
<div class="modfile"><h4>Modified: trunk/Tools/WebKitTestRunner/TestController.cpp (211673 => 211674)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/WebKitTestRunner/TestController.cpp 2017-02-04 21:40:33 UTC (rev 211673)
+++ trunk/Tools/WebKitTestRunner/TestController.cpp 2017-02-04 21:46:21 UTC (rev 211674)
</span><span class="lines">@@ -1959,8 +1959,9 @@
</span><span class="cx"> {
</span><span class="cx"> auto originHash = userMediaOriginHash(userMediaDocumentOrigin, topLevelDocumentOrigin);
</span><span class="cx"> auto salt = saltForOrigin(frame, originHash);
</span><ins>+ WKRetainPtr<WKStringRef> saltString = adoptWK(WKStringCreateWithUTF8CString(salt.utf8().data()));
</ins><span class="cx">
</span><del>- WKUserMediaPermissionCheckSetUserMediaAccessInfo(checkRequest, WKStringCreateWithUTF8CString(salt.utf8().data()), settingsForOrigin(originHash).persistentPermission());
</del><ins>+ WKUserMediaPermissionCheckSetUserMediaAccessInfo(checkRequest, saltString.get(), settingsForOrigin(originHash).persistentPermission());
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void TestController::handleUserMediaPermissionRequest(WKFrameRef frame, WKSecurityOriginRef userMediaDocumentOrigin, WKSecurityOriginRef topLevelDocumentOrigin, WKUserMediaPermissionRequestRef request)
</span><span class="lines">@@ -2010,8 +2011,8 @@
</span><span class="cx"> continue;
</span><span class="cx"> }
</span><span class="cx">
</span><del>- WKRetainPtr<WKArrayRef> audioDeviceUIDs = WKUserMediaPermissionRequestAudioDeviceUIDs(request);
- WKRetainPtr<WKArrayRef> videoDeviceUIDs = WKUserMediaPermissionRequestVideoDeviceUIDs(request);
</del><ins>+ WKRetainPtr<WKArrayRef> audioDeviceUIDs = adoptWK(WKUserMediaPermissionRequestAudioDeviceUIDs(request));
+ WKRetainPtr<WKArrayRef> videoDeviceUIDs = adoptWK(WKUserMediaPermissionRequestVideoDeviceUIDs(request));
</ins><span class="cx">
</span><span class="cx"> if (!WKArrayGetSize(videoDeviceUIDs.get()) && !WKArrayGetSize(audioDeviceUIDs.get())) {
</span><span class="cx"> WKUserMediaPermissionRequestDeny(request, kWKNoConstraints);
</span><span class="lines">@@ -2022,13 +2023,13 @@
</span><span class="cx"> if (WKArrayGetSize(videoDeviceUIDs.get()))
</span><span class="cx"> videoDeviceUID = reinterpret_cast<WKStringRef>(WKArrayGetItemAtIndex(videoDeviceUIDs.get(), 0));
</span><span class="cx"> else
</span><del>- videoDeviceUID = WKStringCreateWithUTF8CString("");
</del><ins>+ videoDeviceUID = adoptWK(WKStringCreateWithUTF8CString(""));
</ins><span class="cx">
</span><span class="cx"> WKRetainPtr<WKStringRef> audioDeviceUID;
</span><span class="cx"> if (WKArrayGetSize(audioDeviceUIDs.get()))
</span><span class="cx"> audioDeviceUID = reinterpret_cast<WKStringRef>(WKArrayGetItemAtIndex(audioDeviceUIDs.get(), 0));
</span><span class="cx"> else
</span><del>- audioDeviceUID = WKStringCreateWithUTF8CString("");
</del><ins>+ audioDeviceUID = adoptWK(WKStringCreateWithUTF8CString(""));
</ins><span class="cx">
</span><span class="cx"> WKUserMediaPermissionRequestAllow(request, audioDeviceUID.get(), videoDeviceUID.get());
</span><span class="cx"> }
</span></span></pre>
</div>
</div>
</body>
</html>