<!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>[165412] trunk/Source</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/165412">165412</a></dd>
<dt>Author</dt> <dd>simon.fraser@apple.com</dd>
<dt>Date</dt> <dd>2014-03-10 16:08:55 -0700 (Mon, 10 Mar 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>Fix three leaks
https://bugs.webkit.org/show_bug.cgi?id=130048
Reviewed by Anders Carlsson.
Source/WebCore:
The NSDictionary was leaked.
* page/ios/UserAgentIOS.mm:
(WebCore::osMarketingVersion):
Source/WebKit2:
* Shared/API/Cocoa/WKRemoteObjectCoder.mm:
(decodeObject): Code is simpler and less leaky without the RetainPtr.
* UIProcess/API/Cocoa/WKNavigationAction.mm: Fix _originalURL leak
by making it a RetainPtr and implementing the getter and setter.
(-[WKNavigationAction _setOriginalURL:]):
(-[WKNavigationAction _originalURL]):</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCorepageiosUserAgentIOSmm">trunk/Source/WebCore/page/ios/UserAgentIOS.mm</a></li>
<li><a href="#trunkSourceWebKit2ChangeLog">trunk/Source/WebKit2/ChangeLog</a></li>
<li><a href="#trunkSourceWebKit2SharedAPICocoaWKRemoteObjectCodermm">trunk/Source/WebKit2/Shared/API/Cocoa/WKRemoteObjectCoder.mm</a></li>
<li><a href="#trunkSourceWebKit2UIProcessAPICocoaWKNavigationActionmm">trunk/Source/WebKit2/UIProcess/API/Cocoa/WKNavigationAction.mm</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (165411 => 165412)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2014-03-10 23:01:18 UTC (rev 165411)
+++ trunk/Source/WebCore/ChangeLog 2014-03-10 23:08:55 UTC (rev 165412)
</span><span class="lines">@@ -1,3 +1,15 @@
</span><ins>+2014-03-10 Simon Fraser <simon.fraser@apple.com>
+
+ Fix three leaks
+ https://bugs.webkit.org/show_bug.cgi?id=130048
+
+ Reviewed by Anders Carlsson.
+
+ The NSDictionary was leaked.
+
+ * page/ios/UserAgentIOS.mm:
+ (WebCore::osMarketingVersion):
+
</ins><span class="cx"> 2014-03-10 Beth Dakin <bdakin@apple.com>
</span><span class="cx">
</span><span class="cx"> Set background color of WK2's UIScrollView to the pageExtendedBackgroundColor
</span></span></pre></div>
<a id="trunkSourceWebCorepageiosUserAgentIOSmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/page/ios/UserAgentIOS.mm (165411 => 165412)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/page/ios/UserAgentIOS.mm 2014-03-10 23:01:18 UTC (rev 165411)
+++ trunk/Source/WebCore/page/ios/UserAgentIOS.mm 2014-03-10 23:08:55 UTC (rev 165412)
</span><span class="lines">@@ -44,7 +44,7 @@
</span><span class="cx">
</span><span class="cx"> static NSString *osMarketingVersion()
</span><span class="cx"> {
</span><del>- RetainPtr<NSDictionary> systemInfo = [[NSDictionary alloc] initWithContentsOfFile:[platformSystemRootDirectory() stringByAppendingPathComponent:@"System/Library/CoreServices/SystemVersion.plist"]];
</del><ins>+ RetainPtr<NSDictionary> systemInfo = adoptNS([[NSDictionary alloc] initWithContentsOfFile:[platformSystemRootDirectory() stringByAppendingPathComponent:@"System/Library/CoreServices/SystemVersion.plist"]]);
</ins><span class="cx"> NSString *productVersion = [systemInfo objectForKey:@"ProductVersion"];
</span><span class="cx"> return !productVersion ? @"" : [productVersion stringByReplacingOccurrencesOfString:@"." withString:@"_"];
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebKit2ChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/ChangeLog (165411 => 165412)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/ChangeLog 2014-03-10 23:01:18 UTC (rev 165411)
+++ trunk/Source/WebKit2/ChangeLog 2014-03-10 23:08:55 UTC (rev 165412)
</span><span class="lines">@@ -1,3 +1,17 @@
</span><ins>+2014-03-10 Simon Fraser <simon.fraser@apple.com>
+
+ Fix three leaks
+ https://bugs.webkit.org/show_bug.cgi?id=130048
+
+ Reviewed by Anders Carlsson.
+
+ * Shared/API/Cocoa/WKRemoteObjectCoder.mm:
+ (decodeObject): Code is simpler and less leaky without the RetainPtr.
+ * UIProcess/API/Cocoa/WKNavigationAction.mm: Fix _originalURL leak
+ by making it a RetainPtr and implementing the getter and setter.
+ (-[WKNavigationAction _setOriginalURL:]):
+ (-[WKNavigationAction _originalURL]):
+
</ins><span class="cx"> 2014-03-10 Beth Dakin <bdakin@apple.com>
</span><span class="cx">
</span><span class="cx"> Set background color of WK2's UIScrollView to the pageExtendedBackgroundColor
</span></span></pre></div>
<a id="trunkSourceWebKit2SharedAPICocoaWKRemoteObjectCodermm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/Shared/API/Cocoa/WKRemoteObjectCoder.mm (165411 => 165412)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/Shared/API/Cocoa/WKRemoteObjectCoder.mm 2014-03-10 23:01:18 UTC (rev 165411)
+++ trunk/Source/WebKit2/Shared/API/Cocoa/WKRemoteObjectCoder.mm 2014-03-10 23:08:55 UTC (rev 165412)
</span><span class="lines">@@ -497,7 +497,7 @@
</span><span class="cx"> if (objectClass == [NSInvocation class])
</span><span class="cx"> return decodeInvocation(decoder);
</span><span class="cx">
</span><del>- RetainPtr<id> result = [objectClass allocWithZone:decoder.zone];
</del><ins>+ id result = [objectClass allocWithZone:decoder.zone];
</ins><span class="cx"> if (!result)
</span><span class="cx"> [NSException raise:NSInvalidUnarchiveOperationException format:@"Class \"%s\" returned nil from +alloc while being decoded", className.data()];
</span><span class="cx">
</span><span class="lines">@@ -509,7 +509,7 @@
</span><span class="cx"> if (!result)
</span><span class="cx"> [NSException raise:NSInvalidUnarchiveOperationException format:@"Object of class \"%s\" returned nil from -awakeAfterUsingCoder: while being decoded", className.data()];
</span><span class="cx">
</span><del>- return [result.leakRef() autorelease];
</del><ins>+ return [result autorelease];
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> static id decodeObject(WKRemoteObjectDecoder *decoder, const ImmutableDictionary* dictionary, NSSet *allowedClasses)
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessAPICocoaWKNavigationActionmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/API/Cocoa/WKNavigationAction.mm (165411 => 165412)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/API/Cocoa/WKNavigationAction.mm 2014-03-10 23:01:18 UTC (rev 165411)
+++ trunk/Source/WebKit2/UIProcess/API/Cocoa/WKNavigationAction.mm 2014-03-10 23:08:55 UTC (rev 165412)
</span><span class="lines">@@ -34,6 +34,7 @@
</span><span class="cx"> RetainPtr<WKFrameInfo> _sourceFrame;
</span><span class="cx"> RetainPtr<WKFrameInfo> _destinationFrame;
</span><span class="cx"> RetainPtr<NSURLRequest> _request;
</span><ins>+ RetainPtr<NSURL> _originalURL;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> - (NSString *)description
</span><span class="lines">@@ -72,6 +73,16 @@
</span><span class="cx"> _request = adoptNS([request copy]);
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+- (void)_setOriginalURL:(NSURL *)originalURL
+{
+ _originalURL = adoptNS([originalURL copy]);
+}
+
+- (NSURL *)_originalURL
+{
+ return _originalURL.get();
+}
+
</ins><span class="cx"> @end
</span><span class="cx">
</span><span class="cx"> #endif
</span></span></pre>
</div>
</div>
</body>
</html>