<!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>[173141] 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/173141">173141</a></dd>
<dt>Author</dt> <dd>mjs@apple.com</dd>
<dt>Date</dt> <dd>2014-08-30 15:43:33 -0700 (Sat, 30 Aug 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>Use RetainPtr::autorelease in some places where it seems appropriate
https://bugs.webkit.org/show_bug.cgi?id=136280
Reviewed by Darin Adler.
Source/JavaScriptCore:
* API/JSContext.mm:
(-[JSContext name]): Use RetainPtr::autorelease() in place of ObjC autorelease.
* API/JSValue.mm:
(valueToString): Make appropriate use of RetainPtr
Source/WebCore:
* platform/mac/URLMac.mm:
(WebCore::URL::operator NSURL *): Use autorelease() instead of
CFBridgingRelease(leakRef())
Source/WebKit/mac:
* WebView/WebHTMLView.mm:
(imageFromRect): Use RetainPtr in this function.
* WebView/WebPDFRepresentation.mm:
(-[WebPDFRepresentation convertPostScriptDataSourceToPDF:]): Use RetainPtr
in this method.
Source/WebKit2:
* Shared/Cocoa/WKNSURLExtras.mm:
(urlWithWTFString): Use autorelease() instead of CFBridgingRelease(leakRef())
Source/WTF:
* wtf/text/mac/StringImplMac.mm:
(WTF::StringImpl::operator NSString *): Use autorelease() instead of
CFBridgingRelease(leakRef())</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceJavaScriptCoreAPIJSContextmm">trunk/Source/JavaScriptCore/API/JSContext.mm</a></li>
<li><a href="#trunkSourceJavaScriptCoreAPIJSValuemm">trunk/Source/JavaScriptCore/API/JSValue.mm</a></li>
<li><a href="#trunkSourceJavaScriptCoreChangeLog">trunk/Source/JavaScriptCore/ChangeLog</a></li>
<li><a href="#trunkSourceWTFChangeLog">trunk/Source/WTF/ChangeLog</a></li>
<li><a href="#trunkSourceWTFwtftextmacStringImplMacmm">trunk/Source/WTF/wtf/text/mac/StringImplMac.mm</a></li>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoreplatformmacURLMacmm">trunk/Source/WebCore/platform/mac/URLMac.mm</a></li>
<li><a href="#trunkSourceWebKitmacChangeLog">trunk/Source/WebKit/mac/ChangeLog</a></li>
<li><a href="#trunkSourceWebKitmacWebViewWebHTMLViewmm">trunk/Source/WebKit/mac/WebView/WebHTMLView.mm</a></li>
<li><a href="#trunkSourceWebKitmacWebViewWebPDFRepresentationmm">trunk/Source/WebKit/mac/WebView/WebPDFRepresentation.mm</a></li>
<li><a href="#trunkSourceWebKit2ChangeLog">trunk/Source/WebKit2/ChangeLog</a></li>
<li><a href="#trunkSourceWebKit2SharedCocoaWKNSURLExtrasmm">trunk/Source/WebKit2/Shared/Cocoa/WKNSURLExtras.mm</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceJavaScriptCoreAPIJSContextmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/API/JSContext.mm (173140 => 173141)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/API/JSContext.mm 2014-08-30 18:22:11 UTC (rev 173140)
+++ trunk/Source/JavaScriptCore/API/JSContext.mm 2014-08-30 22:43:33 UTC (rev 173141)
</span><span class="lines">@@ -192,7 +192,7 @@
</span><span class="cx"> if (!name)
</span><span class="cx"> return nil;
</span><span class="cx">
</span><del>- return [(NSString *)JSStringCopyCFString(kCFAllocatorDefault, name) autorelease];
</del><ins>+ return (NSString *)adoptCF(JSStringCopyCFString(kCFAllocatorDefault, name)).autorelease();
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> - (void)setName:(NSString *)name
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreAPIJSValuemm"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/API/JSValue.mm (173140 => 173141)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/API/JSValue.mm 2014-08-30 18:22:11 UTC (rev 173140)
+++ trunk/Source/JavaScriptCore/API/JSValue.mm 2014-08-30 22:43:33 UTC (rev 173141)
</span><span class="lines">@@ -767,9 +767,9 @@
</span><span class="cx"> return nil;
</span><span class="cx"> }
</span><span class="cx">
</span><del>- NSString *stringNS = CFBridgingRelease(JSStringCopyCFString(kCFAllocatorDefault, jsstring));
</del><ins>+ RetainPtr<CFStringRef> stringCF = adoptCF(JSStringCopyCFString(kCFAllocatorDefault, jsstring));
</ins><span class="cx"> JSStringRelease(jsstring);
</span><del>- return stringNS;
</del><ins>+ return (NSString *)stringCF.autorelease();
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> id valueToDate(JSGlobalContextRef context, JSValueRef value, JSValueRef* exception)
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/ChangeLog (173140 => 173141)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/ChangeLog 2014-08-30 18:22:11 UTC (rev 173140)
+++ trunk/Source/JavaScriptCore/ChangeLog 2014-08-30 22:43:33 UTC (rev 173141)
</span><span class="lines">@@ -1,3 +1,15 @@
</span><ins>+2014-08-26 Maciej Stachowiak <mjs@apple.com>
+
+ Use RetainPtr::autorelease in some places where it seems appropriate
+ https://bugs.webkit.org/show_bug.cgi?id=136280
+
+ Reviewed by Darin Adler.
+
+ * API/JSContext.mm:
+ (-[JSContext name]): Use RetainPtr::autorelease() in place of ObjC autorelease.
+ * API/JSValue.mm:
+ (valueToString): Make appropriate use of RetainPtr
+
</ins><span class="cx"> 2014-08-29 Akos Kiss <akiss@inf.u-szeged.hu>
</span><span class="cx">
</span><span class="cx"> Ensure that the call frame passed from doVMEntry to the called function always contains the valid scope chain.
</span></span></pre></div>
<a id="trunkSourceWTFChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WTF/ChangeLog (173140 => 173141)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WTF/ChangeLog 2014-08-30 18:22:11 UTC (rev 173140)
+++ trunk/Source/WTF/ChangeLog 2014-08-30 22:43:33 UTC (rev 173141)
</span><span class="lines">@@ -1,3 +1,14 @@
</span><ins>+2014-08-26 Maciej Stachowiak <mjs@apple.com>
+
+ Use RetainPtr::autorelease in some places where it seems appropriate
+ https://bugs.webkit.org/show_bug.cgi?id=136280
+
+ Reviewed by Darin Adler.
+
+ * wtf/text/mac/StringImplMac.mm:
+ (WTF::StringImpl::operator NSString *): Use autorelease() instead of
+ CFBridgingRelease(leakRef())
+
</ins><span class="cx"> 2014-08-29 Joseph Pecoraro <pecoraro@apple.com>
</span><span class="cx">
</span><span class="cx"> JavaScriptCore: Use ASCIILiteral where possible
</span></span></pre></div>
<a id="trunkSourceWTFwtftextmacStringImplMacmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WTF/wtf/text/mac/StringImplMac.mm (173140 => 173141)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WTF/wtf/text/mac/StringImplMac.mm 2014-08-30 18:22:11 UTC (rev 173140)
+++ trunk/Source/WTF/wtf/text/mac/StringImplMac.mm 2014-08-30 22:43:33 UTC (rev 173141)
</span><span class="lines">@@ -28,7 +28,7 @@
</span><span class="cx">
</span><span class="cx"> StringImpl::operator NSString *()
</span><span class="cx"> {
</span><del>- return CFBridgingRelease(createCFString().leakRef());
</del><ins>+ return (NSString *)createCFString().autorelease();
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (173140 => 173141)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2014-08-30 18:22:11 UTC (rev 173140)
+++ trunk/Source/WebCore/ChangeLog 2014-08-30 22:43:33 UTC (rev 173141)
</span><span class="lines">@@ -1,3 +1,14 @@
</span><ins>+2014-08-26 Maciej Stachowiak <mjs@apple.com>
+
+ Use RetainPtr::autorelease in some places where it seems appropriate
+ https://bugs.webkit.org/show_bug.cgi?id=136280
+
+ Reviewed by Darin Adler.
+
+ * platform/mac/URLMac.mm:
+ (WebCore::URL::operator NSURL *): Use autorelease() instead of
+ CFBridgingRelease(leakRef())
+
</ins><span class="cx"> 2014-08-30 Yusuke Suzuki <utatane.tea@gmail.com>
</span><span class="cx">
</span><span class="cx"> CSS: Refactor :visited handling in SelectorChecker
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformmacURLMacmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/mac/URLMac.mm (173140 => 173141)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/mac/URLMac.mm 2014-08-30 18:22:11 UTC (rev 173140)
+++ trunk/Source/WebCore/platform/mac/URLMac.mm 2014-08-30 22:43:33 UTC (rev 173141)
</span><span class="lines">@@ -49,7 +49,7 @@
</span><span class="cx"> {
</span><span class="cx"> // Creating a toll-free bridged CFURL, because a real NSURL would not preserve the original string.
</span><span class="cx"> // We'll need fidelity when round-tripping via CFURLGetBytes().
</span><del>- return CFBridgingRelease(createCFURL().leakRef());
</del><ins>+ return (NSURL *)createCFURL().autorelease();
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> RetainPtr<CFURLRef> URL::createCFURL() const
</span></span></pre></div>
<a id="trunkSourceWebKitmacChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/mac/ChangeLog (173140 => 173141)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/mac/ChangeLog 2014-08-30 18:22:11 UTC (rev 173140)
+++ trunk/Source/WebKit/mac/ChangeLog 2014-08-30 22:43:33 UTC (rev 173141)
</span><span class="lines">@@ -1,3 +1,16 @@
</span><ins>+2014-08-26 Maciej Stachowiak <mjs@apple.com>
+
+ Use RetainPtr::autorelease in some places where it seems appropriate
+ https://bugs.webkit.org/show_bug.cgi?id=136280
+
+ Reviewed by Darin Adler.
+
+ * WebView/WebHTMLView.mm:
+ (imageFromRect): Use RetainPtr in this function.
+ * WebView/WebPDFRepresentation.mm:
+ (-[WebPDFRepresentation convertPostScriptDataSourceToPDF:]): Use RetainPtr
+ in this method.
+
</ins><span class="cx"> 2014-08-29 Csaba Osztrogonác <ossy@webkit.org>
</span><span class="cx">
</span><span class="cx"> Unreviwed, remove empty directories.
</span></span></pre></div>
<a id="trunkSourceWebKitmacWebViewWebHTMLViewmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/mac/WebView/WebHTMLView.mm (173140 => 173141)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/mac/WebView/WebHTMLView.mm 2014-08-30 18:22:11 UTC (rev 173140)
+++ trunk/Source/WebKit/mac/WebView/WebHTMLView.mm 2014-08-30 22:43:33 UTC (rev 173141)
</span><span class="lines">@@ -6631,12 +6631,12 @@
</span><span class="cx">
</span><span class="cx"> CGContextRestoreGState(contextRef);
</span><span class="cx">
</span><del>- CGImageRef resultImage = CGBitmapContextCreateImage(contextRef);
</del><ins>+ RetainPtr<CGImageRef> resultImage = adoptCF(CGBitmapContextCreateImage(contextRef));
</ins><span class="cx">
</span><span class="cx"> WKSetCurrentGraphicsContext(oldContext);
</span><span class="cx"> frame->view()->setPaintBehavior(oldPaintBehavior);
</span><span class="cx">
</span><del>- return (CGImageRef)CFBridgingRelease(resultImage);
</del><ins>+ return resultImage.autorelease();
</ins><span class="cx">
</span><span class="cx"> END_BLOCK_OBJC_EXCEPTIONS;
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebKitmacWebViewWebPDFRepresentationmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/mac/WebView/WebPDFRepresentation.mm (173140 => 173141)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/mac/WebView/WebPDFRepresentation.mm 2014-08-30 18:22:11 UTC (rev 173140)
+++ trunk/Source/WebKit/mac/WebView/WebPDFRepresentation.mm 2014-08-30 22:43:33 UTC (rev 173141)
</span><span class="lines">@@ -36,11 +36,12 @@
</span><span class="cx"> #import "WebPDFDocumentExtras.h"
</span><span class="cx"> #import "WebPDFView.h"
</span><span class="cx"> #import "WebTypesInternal.h"
</span><del>-#import <wtf/Assertions.h>
-#import <wtf/ObjcRuntimeExtras.h>
</del><span class="cx"> #import <JavaScriptCore/JSContextRef.h>
</span><span class="cx"> #import <JavaScriptCore/JSStringRef.h>
</span><span class="cx"> #import <JavaScriptCore/JSStringRefCF.h>
</span><ins>+#import <wtf/Assertions.h>
+#import <wtf/ObjcRuntimeExtras.h>
+#import <wtf/RetainPtr.h>
</ins><span class="cx">
</span><span class="cx"> @implementation WebPDFRepresentation
</span><span class="cx">
</span><span class="lines">@@ -90,26 +91,22 @@
</span><span class="cx"> // http://developer.apple.com/documentation/GraphicsImaging/Conceptual/drawingwithquartz2d/dq_ps_convert/chapter_16_section_1.html
</span><span class="cx">
</span><span class="cx"> CGPSConverterCallbacks callbacks = { 0, 0, 0, 0, 0, 0, 0, 0 };
</span><del>- CGPSConverterRef converter = CGPSConverterCreate(0, &callbacks, 0);
- ASSERT(converter);
</del><ins>+ RetainPtr<CGPSConverterRef> converter = adoptCF(CGPSConverterCreate(0, &callbacks, 0));
+ ASSERT(converter.get());
</ins><span class="cx">
</span><del>- CGDataProviderRef provider = CGDataProviderCreateWithCFData((CFDataRef)data);
- ASSERT(provider);
</del><ins>+ RetainPtr<CGDataProviderRef> provider = adoptCF(CGDataProviderCreateWithCFData((CFDataRef)data));
+ ASSERT(provider.get());
</ins><span class="cx">
</span><del>- CFMutableDataRef result = CFDataCreateMutable(kCFAllocatorDefault, 0);
- ASSERT(result);
</del><ins>+ RetainPtr<CFMutableDataRef> result = adoptCF(CFDataCreateMutable(kCFAllocatorDefault, 0));
+ ASSERT(result.get());
</ins><span class="cx">
</span><del>- CGDataConsumerRef consumer = CGDataConsumerCreateWithCFData(result);
- ASSERT(consumer);
</del><ins>+ RetainPtr<CGDataConsumerRef> consumer = adoptCF(CGDataConsumerCreateWithCFData(result.get()));
+ ASSERT(consumer.get());
</ins><span class="cx">
</span><span class="cx"> // Error handled by detecting zero-length 'result' in caller
</span><del>- CGPSConverterConvert(converter, provider, consumer, 0);
</del><ins>+ CGPSConverterConvert(converter.get(), provider.get(), consumer.get(), 0);
</ins><span class="cx">
</span><del>- CFRelease(converter);
- CFRelease(provider);
- CFRelease(consumer);
-
- return CFBridgingRelease(result);
</del><ins>+ return (NSData *)result.autorelease();
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> - (void)finishedLoadingWithDataSource:(WebDataSource *)dataSource
</span></span></pre></div>
<a id="trunkSourceWebKit2ChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/ChangeLog (173140 => 173141)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/ChangeLog 2014-08-30 18:22:11 UTC (rev 173140)
+++ trunk/Source/WebKit2/ChangeLog 2014-08-30 22:43:33 UTC (rev 173141)
</span><span class="lines">@@ -1,3 +1,13 @@
</span><ins>+2014-08-26 Maciej Stachowiak <mjs@apple.com>
+
+ Use RetainPtr::autorelease in some places where it seems appropriate
+ https://bugs.webkit.org/show_bug.cgi?id=136280
+
+ Reviewed by Darin Adler.
+
+ * Shared/Cocoa/WKNSURLExtras.mm:
+ (urlWithWTFString): Use autorelease() instead of CFBridgingRelease(leakRef())
+
</ins><span class="cx"> 2014-08-29 Tim Horton <timothy_horton@apple.com>
</span><span class="cx">
</span><span class="cx"> More occasional crashes in ServicesController::resfreshExistingServices
</span></span></pre></div>
<a id="trunkSourceWebKit2SharedCocoaWKNSURLExtrasmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/Shared/Cocoa/WKNSURLExtras.mm (173140 => 173141)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/Shared/Cocoa/WKNSURLExtras.mm 2014-08-30 18:22:11 UTC (rev 173140)
+++ trunk/Source/WebKit2/Shared/Cocoa/WKNSURLExtras.mm 2014-08-30 22:43:33 UTC (rev 173141)
</span><span class="lines">@@ -40,7 +40,7 @@
</span><span class="cx"> return nil;
</span><span class="cx">
</span><span class="cx"> CString buffer = string.utf8();
</span><del>- return CFBridgingRelease(createCFURLFromBuffer(buffer.data(), buffer.length(), (CFURLRef)baseURL).leakRef());
</del><ins>+ return (NSURL *)createCFURLFromBuffer(buffer.data(), buffer.length(), (CFURLRef)baseURL).autorelease();
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> + (instancetype)_web_URLWithWTFString:(const String&)string
</span></span></pre>
</div>
</div>
</body>
</html>