<!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>[244703] 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/244703">244703</a></dd>
<dt>Author</dt> <dd>ddkilzer@apple.com</dd>
<dt>Date</dt> <dd>2019-04-26 11:32:46 -0700 (Fri, 26 Apr 2019)</dd>
</dl>

<h3>Log Message</h3>
<pre>WebKitTestRunner leaks an NSDictionary and multiple JSStringRef objects
<https://webkit.org/b/197314>
<rdar://problem/50245252>

Reviewed by Simon Fraser.

* WebKitTestRunner/UIScriptControllerCocoa.mm:
(WTR::UIScriptController::lastUndoLabel const):
(WTR::UIScriptController::firstRedoLabel const):
- Use adopt(JSStringCreateWithCFString(...)) to fix leaks.

* WebKitTestRunner/ios/HIDEventGenerator.mm:
(-[HIDEventGenerator sendEventStream:completionBlock:]):
- Call -autorelease to fix leak of NSDictionary.

* WebKitTestRunner/ios/UIScriptControllerIOS.mm:
(WTR::UIScriptController::accessibilitySpeakSelectionContent const):
(WTR::UIScriptController::selectFormPopoverTitle const):
(WTR::UIScriptController::textContentType const):
(WTR::UIScriptController::formInputLabel const):
(WTR::UIScriptController::scrollingTreeAsText const):
- Use adopt(JSStringCreateWithCFString(...)) to fix leaks.</pre>

<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkToolsChangeLog">trunk/Tools/ChangeLog</a></li>
<li><a href="#trunkToolsWebKitTestRunnerUIScriptControllerCocoamm">trunk/Tools/WebKitTestRunner/UIScriptControllerCocoa.mm</a></li>
<li><a href="#trunkToolsWebKitTestRunneriosHIDEventGeneratormm">trunk/Tools/WebKitTestRunner/ios/HIDEventGenerator.mm</a></li>
<li><a href="#trunkToolsWebKitTestRunneriosUIScriptControllerIOSmm">trunk/Tools/WebKitTestRunner/ios/UIScriptControllerIOS.mm</a></li>
</ul>

</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkToolsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Tools/ChangeLog (244702 => 244703)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/ChangeLog    2019-04-26 18:32:41 UTC (rev 244702)
+++ trunk/Tools/ChangeLog       2019-04-26 18:32:46 UTC (rev 244703)
</span><span class="lines">@@ -1,3 +1,28 @@
</span><ins>+2019-04-26  David Kilzer  <ddkilzer@apple.com>
+
+        WebKitTestRunner leaks an NSDictionary and multiple JSStringRef objects
+        <https://webkit.org/b/197314>
+        <rdar://problem/50245252>
+
+        Reviewed by Simon Fraser.
+
+        * WebKitTestRunner/UIScriptControllerCocoa.mm:
+        (WTR::UIScriptController::lastUndoLabel const):
+        (WTR::UIScriptController::firstRedoLabel const):
+        - Use adopt(JSStringCreateWithCFString(...)) to fix leaks.
+
+        * WebKitTestRunner/ios/HIDEventGenerator.mm:
+        (-[HIDEventGenerator sendEventStream:completionBlock:]):
+        - Call -autorelease to fix leak of NSDictionary.
+
+        * WebKitTestRunner/ios/UIScriptControllerIOS.mm:
+        (WTR::UIScriptController::accessibilitySpeakSelectionContent const):
+        (WTR::UIScriptController::selectFormPopoverTitle const):
+        (WTR::UIScriptController::textContentType const):
+        (WTR::UIScriptController::formInputLabel const):
+        (WTR::UIScriptController::scrollingTreeAsText const):
+        - Use adopt(JSStringCreateWithCFString(...)) to fix leaks.
+
</ins><span class="cx"> 2019-04-26  Jonathan Bedard  <jbedard@apple.com>
</span><span class="cx"> 
</span><span class="cx">         webkitpy: Running a single test will always use the default device
</span></span></pre></div>
<a id="trunkToolsWebKitTestRunnerUIScriptControllerCocoamm"></a>
<div class="modfile"><h4>Modified: trunk/Tools/WebKitTestRunner/UIScriptControllerCocoa.mm (244702 => 244703)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/WebKitTestRunner/UIScriptControllerCocoa.mm  2019-04-26 18:32:41 UTC (rev 244702)
+++ trunk/Tools/WebKitTestRunner/UIScriptControllerCocoa.mm     2019-04-26 18:32:46 UTC (rev 244703)
</span><span class="lines">@@ -151,12 +151,12 @@
</span><span class="cx"> 
</span><span class="cx"> JSRetainPtr<JSStringRef> UIScriptController::lastUndoLabel() const
</span><span class="cx"> {
</span><del>-    return JSStringCreateWithCFString((__bridge CFStringRef)platformUndoManager().undoActionName);
</del><ins>+    return adopt(JSStringCreateWithCFString((__bridge CFStringRef)platformUndoManager().undoActionName));
</ins><span class="cx"> }
</span><span class="cx"> 
</span><span class="cx"> JSRetainPtr<JSStringRef> UIScriptController::firstRedoLabel() const
</span><span class="cx"> {
</span><del>-    return JSStringCreateWithCFString((__bridge CFStringRef)platformUndoManager().redoActionName);
</del><ins>+    return adopt(JSStringCreateWithCFString((__bridge CFStringRef)platformUndoManager().redoActionName));
</ins><span class="cx"> }
</span><span class="cx"> 
</span><span class="cx"> NSUndoManager *UIScriptController::platformUndoManager() const
</span></span></pre></div>
<a id="trunkToolsWebKitTestRunneriosHIDEventGeneratormm"></a>
<div class="modfile"><h4>Modified: trunk/Tools/WebKitTestRunner/ios/HIDEventGenerator.mm (244702 => 244703)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/WebKitTestRunner/ios/HIDEventGenerator.mm    2019-04-26 18:32:41 UTC (rev 244702)
+++ trunk/Tools/WebKitTestRunner/ios/HIDEventGenerator.mm       2019-04-26 18:32:46 UTC (rev 244703)
</span><span class="lines">@@ -1138,7 +1138,7 @@
</span><span class="cx">     }
</span><span class="cx">     
</span><span class="cx">     NSDictionary* threadData = @{
</span><del>-        @"eventInfo": [eventInfo copy],
</del><ins>+        @"eventInfo": [[eventInfo copy] autorelease],
</ins><span class="cx">         @"completionBlock": [[completionBlock copy] autorelease]
</span><span class="cx">     };
</span><span class="cx">     
</span></span></pre></div>
<a id="trunkToolsWebKitTestRunneriosUIScriptControllerIOSmm"></a>
<div class="modfile"><h4>Modified: trunk/Tools/WebKitTestRunner/ios/UIScriptControllerIOS.mm (244702 => 244703)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/WebKitTestRunner/ios/UIScriptControllerIOS.mm        2019-04-26 18:32:41 UTC (rev 244702)
+++ trunk/Tools/WebKitTestRunner/ios/UIScriptControllerIOS.mm   2019-04-26 18:32:46 UTC (rev 244703)
</span><span class="lines">@@ -198,7 +198,7 @@
</span><span class="cx"> JSRetainPtr<JSStringRef> UIScriptController::accessibilitySpeakSelectionContent() const
</span><span class="cx"> {
</span><span class="cx">     TestRunnerWKWebView *webView = TestController::singleton().mainWebView()->platformView();
</span><del>-    return JSStringCreateWithCFString((CFStringRef)webView.accessibilitySpeakSelectionContent);
</del><ins>+    return adopt(JSStringCreateWithCFString((CFStringRef)webView.accessibilitySpeakSelectionContent));
</ins><span class="cx"> }
</span><span class="cx"> 
</span><span class="cx"> void UIScriptController::simulateAccessibilitySettingsChangeNotification(JSValueRef callback)
</span><span class="lines">@@ -499,19 +499,19 @@
</span><span class="cx"> JSRetainPtr<JSStringRef> UIScriptController::selectFormPopoverTitle() const
</span><span class="cx"> {
</span><span class="cx">     TestRunnerWKWebView *webView = TestController::singleton().mainWebView()->platformView();
</span><del>-    return JSStringCreateWithCFString((CFStringRef)webView.selectFormPopoverTitle);
</del><ins>+    return adopt(JSStringCreateWithCFString((CFStringRef)webView.selectFormPopoverTitle));
</ins><span class="cx"> }
</span><span class="cx"> 
</span><span class="cx"> JSRetainPtr<JSStringRef> UIScriptController::textContentType() const
</span><span class="cx"> {
</span><span class="cx">     TestRunnerWKWebView *webView = TestController::singleton().mainWebView()->platformView();
</span><del>-    return JSStringCreateWithCFString((CFStringRef)(webView.textContentTypeForTesting ?: @""));
</del><ins>+    return adopt(JSStringCreateWithCFString((CFStringRef)(webView.textContentTypeForTesting ?: @"")));
</ins><span class="cx"> }
</span><span class="cx"> 
</span><span class="cx"> JSRetainPtr<JSStringRef> UIScriptController::formInputLabel() const
</span><span class="cx"> {
</span><span class="cx">     TestRunnerWKWebView *webView = TestController::singleton().mainWebView()->platformView();
</span><del>-    return JSStringCreateWithCFString((CFStringRef)webView.formInputLabel);
</del><ins>+    return adopt(JSStringCreateWithCFString((CFStringRef)webView.formInputLabel));
</ins><span class="cx"> }
</span><span class="cx"> 
</span><span class="cx"> void UIScriptController::selectFormAccessoryPickerRow(long rowIndex)
</span><span class="lines">@@ -751,7 +751,7 @@
</span><span class="cx"> JSRetainPtr<JSStringRef> UIScriptController::scrollingTreeAsText() const
</span><span class="cx"> {
</span><span class="cx">     TestRunnerWKWebView *webView = TestController::singleton().mainWebView()->platformView();
</span><del>-    return JSStringCreateWithCFString((CFStringRef)[webView _scrollingTreeAsText]);
</del><ins>+    return adopt(JSStringCreateWithCFString((CFStringRef)[webView _scrollingTreeAsText]));
</ins><span class="cx"> }
</span><span class="cx"> 
</span><span class="cx"> JSObjectRef UIScriptController::propertiesOfLayerWithID(uint64_t layerID) const
</span></span></pre>
</div>
</div>

</body>
</html>