<!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>[194870] 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/194870">194870</a></dd>
<dt>Author</dt> <dd>andersca@apple.com</dd>
<dt>Date</dt> <dd>2016-01-11 15:16:17 -0800 (Mon, 11 Jan 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>Get rid of CFMakeCollectable, it is a no-op
https://bugs.webkit.org/show_bug.cgi?id=152988
Reviewed by Sam Weinig.
Source/WebCore:
* platform/mac/WebCoreNSURLExtras.mm:
(WebCore::URLByTruncatingOneCharacterBeforeComponent):
(WebCore::URLByRemovingComponentAndSubsequentCharacter):
Source/WebKit/mac:
* Misc/WebNSDataExtras.m:
(-[NSString _web_capitalizeRFC822HeaderFieldName]):
(-[NSData _webkit_parseRFC822HeaderFields]):
* Plugins/WebPluginController.mm:
(-[WebPluginController initWithDocumentView:]):
Source/WebKit2:
* Shared/Cocoa/WKNSString.mm:
* Shared/Cocoa/WKNSURL.mm:
(-[WKNSURL _web_createTarget]):</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoreplatformmacWebCoreNSURLExtrasmm">trunk/Source/WebCore/platform/mac/WebCoreNSURLExtras.mm</a></li>
<li><a href="#trunkSourceWebKitmacChangeLog">trunk/Source/WebKit/mac/ChangeLog</a></li>
<li><a href="#trunkSourceWebKitmacMiscWebNSDataExtrasm">trunk/Source/WebKit/mac/Misc/WebNSDataExtras.m</a></li>
<li><a href="#trunkSourceWebKitmacPluginsWebPluginControllermm">trunk/Source/WebKit/mac/Plugins/WebPluginController.mm</a></li>
<li><a href="#trunkSourceWebKit2ChangeLog">trunk/Source/WebKit2/ChangeLog</a></li>
<li><a href="#trunkSourceWebKit2SharedCocoaWKNSStringmm">trunk/Source/WebKit2/Shared/Cocoa/WKNSString.mm</a></li>
<li><a href="#trunkSourceWebKit2SharedCocoaWKNSURLmm">trunk/Source/WebKit2/Shared/Cocoa/WKNSURL.mm</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (194869 => 194870)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2016-01-11 22:40:00 UTC (rev 194869)
+++ trunk/Source/WebCore/ChangeLog 2016-01-11 23:16:17 UTC (rev 194870)
</span><span class="lines">@@ -1,3 +1,14 @@
</span><ins>+2016-01-11 Anders Carlsson <andersca@apple.com>
+
+ Get rid of CFMakeCollectable, it is a no-op
+ https://bugs.webkit.org/show_bug.cgi?id=152988
+
+ Reviewed by Sam Weinig.
+
+ * platform/mac/WebCoreNSURLExtras.mm:
+ (WebCore::URLByTruncatingOneCharacterBeforeComponent):
+ (WebCore::URLByRemovingComponentAndSubsequentCharacter):
+
</ins><span class="cx"> 2016-01-11 Commit Queue <commit-queue@webkit.org>
</span><span class="cx">
</span><span class="cx"> Unreviewed, rolling out r194866.
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformmacWebCoreNSURLExtrasmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/mac/WebCoreNSURLExtras.mm (194869 => 194870)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/mac/WebCoreNSURLExtras.mm 2016-01-11 22:40:00 UTC (rev 194869)
+++ trunk/Source/WebCore/platform/mac/WebCoreNSURLExtras.mm 2016-01-11 23:16:17 UTC (rev 194870)
</span><span class="lines">@@ -747,9 +747,9 @@
</span><span class="cx"> } else
</span><span class="cx"> urlBytes = buffer;
</span><span class="cx">
</span><del>- NSURL *result = (NSURL *)CFMakeCollectable(CFURLCreateWithBytes(NULL, urlBytes, fragRg.location - 1, kCFStringEncodingUTF8, NULL));
</del><ins>+ NSURL *result = (NSURL *)CFURLCreateWithBytes(NULL, urlBytes, fragRg.location - 1, kCFStringEncodingUTF8, NULL);
</ins><span class="cx"> if (!result)
</span><del>- result = (NSURL *)CFMakeCollectable(CFURLCreateWithBytes(NULL, urlBytes, fragRg.location - 1, kCFStringEncodingISOLatin1, NULL));
</del><ins>+ result = (NSURL *)CFURLCreateWithBytes(NULL, urlBytes, fragRg.location - 1, kCFStringEncodingISOLatin1, NULL);
</ins><span class="cx">
</span><span class="cx"> if (urlBytes != buffer)
</span><span class="cx"> free(urlBytes);
</span><span class="lines">@@ -918,9 +918,9 @@
</span><span class="cx">
</span><span class="cx"> memmove(urlBytes + range.location, urlBytes + range.location + range.length, numBytes - range.location + range.length);
</span><span class="cx">
</span><del>- NSURL *result = (NSURL *)CFMakeCollectable(CFURLCreateWithBytes(NULL, urlBytes, numBytes - range.length, kCFStringEncodingUTF8, NULL));
</del><ins>+ NSURL *result = (NSURL *)CFURLCreateWithBytes(NULL, urlBytes, numBytes - range.length, kCFStringEncodingUTF8, NULL);
</ins><span class="cx"> if (!result)
</span><del>- result = (NSURL *)CFMakeCollectable(CFURLCreateWithBytes(NULL, urlBytes, numBytes - range.length, kCFStringEncodingISOLatin1, NULL));
</del><ins>+ result = (NSURL *)CFURLCreateWithBytes(NULL, urlBytes, numBytes - range.length, kCFStringEncodingISOLatin1, NULL);
</ins><span class="cx">
</span><span class="cx"> return result ? [result autorelease] : URL;
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebKitmacChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/mac/ChangeLog (194869 => 194870)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/mac/ChangeLog 2016-01-11 22:40:00 UTC (rev 194869)
+++ trunk/Source/WebKit/mac/ChangeLog 2016-01-11 23:16:17 UTC (rev 194870)
</span><span class="lines">@@ -1,3 +1,16 @@
</span><ins>+2016-01-11 Anders Carlsson <andersca@apple.com>
+
+ Get rid of CFMakeCollectable, it is a no-op
+ https://bugs.webkit.org/show_bug.cgi?id=152988
+
+ Reviewed by Sam Weinig.
+
+ * Misc/WebNSDataExtras.m:
+ (-[NSString _web_capitalizeRFC822HeaderFieldName]):
+ (-[NSData _webkit_parseRFC822HeaderFields]):
+ * Plugins/WebPluginController.mm:
+ (-[WebPluginController initWithDocumentView:]):
+
</ins><span class="cx"> 2016-01-10 Andreas Kling <akling@apple.com>
</span><span class="cx">
</span><span class="cx"> Use NeverDestroyed instead of DEPRECATED_DEFINE_STATIC_LOCAL cont'd
</span></span></pre></div>
<a id="trunkSourceWebKitmacMiscWebNSDataExtrasm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/mac/Misc/WebNSDataExtras.m (194869 => 194870)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/mac/Misc/WebNSDataExtras.m 2016-01-11 22:40:00 UTC (rev 194869)
+++ trunk/Source/WebKit/mac/Misc/WebNSDataExtras.m 2016-01-11 23:16:17 UTC (rev 194870)
</span><span class="lines">@@ -92,10 +92,10 @@
</span><span class="cx"> }
</span><span class="cx"> if (somethingChanged) {
</span><span class="cx"> if (useUniCharPtr) {
</span><del>- result = (NSString *)CFMakeCollectable(CFStringCreateWithCharactersNoCopy(NULL, uniCharPtr, len, NULL));
</del><ins>+ result = (NSString *)CFStringCreateWithCharactersNoCopy(NULL, uniCharPtr, len, NULL);
</ins><span class="cx"> }
</span><span class="cx"> else {
</span><del>- result = (NSString *)CFMakeCollectable(CFStringCreateWithCStringNoCopy(NULL, charPtr, kCFStringEncodingISOLatin1, NULL));
</del><ins>+ result = (NSString *)CFStringCreateWithCStringNoCopy(NULL, charPtr, kCFStringEncodingISOLatin1, NULL);
</ins><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx"> else {
</span><span class="lines">@@ -340,7 +340,7 @@
</span><span class="cx"> else {
</span><span class="cx"> // Merge the continuation of the previous header
</span><span class="cx"> NSString *currentValue = [headerFields objectForKey:lastKey];
</span><del>- NSString *newValue = (NSString *)CFMakeCollectable(CFStringCreateWithBytes(NULL, line, lineLength, kCFStringEncodingISOLatin1, FALSE));
</del><ins>+ NSString *newValue = (NSString *)CFStringCreateWithBytes(NULL, line, lineLength, kCFStringEncodingISOLatin1, FALSE);
</ins><span class="cx"> ASSERT(currentValue);
</span><span class="cx"> ASSERT(newValue);
</span><span class="cx"> NSString *mergedValue = [[NSString alloc] initWithFormat:@"%@%@", currentValue, newValue];
</span><span class="lines">@@ -361,7 +361,7 @@
</span><span class="cx"> continue;
</span><span class="cx"> }
</span><span class="cx"> else {
</span><del>- lastKey = (NSString *)CFMakeCollectable(CFStringCreateWithBytes(NULL, line, colon - line, kCFStringEncodingISOLatin1, FALSE));
</del><ins>+ lastKey = (NSString *)CFStringCreateWithBytes(NULL, line, colon - line, kCFStringEncodingISOLatin1, FALSE);
</ins><span class="cx"> [lastKey autorelease];
</span><span class="cx"> NSString *value = [lastKey _web_capitalizeRFC822HeaderFieldName];
</span><span class="cx"> lastKey = value;
</span><span class="lines">@@ -375,7 +375,7 @@
</span><span class="cx"> [value autorelease];
</span><span class="cx"> }
</span><span class="cx"> else {
</span><del>- value = (NSString *)CFMakeCollectable(CFStringCreateWithBytes(NULL, colon, eol-colon, kCFStringEncodingISOLatin1, FALSE));
</del><ins>+ value = (NSString *)CFStringCreateWithBytes(NULL, colon, eol-colon, kCFStringEncodingISOLatin1, FALSE);
</ins><span class="cx"> [value autorelease];
</span><span class="cx"> }
</span><span class="cx"> NSString *oldValue = [headerFields objectForKey:lastKey];
</span></span></pre></div>
<a id="trunkSourceWebKitmacPluginsWebPluginControllermm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/mac/Plugins/WebPluginController.mm (194869 => 194870)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/mac/Plugins/WebPluginController.mm 2016-01-11 22:40:00 UTC (rev 194869)
+++ trunk/Source/WebKit/mac/Plugins/WebPluginController.mm 2016-01-11 23:16:17 UTC (rev 194870)
</span><span class="lines">@@ -182,7 +182,7 @@
</span><span class="cx"> return nil;
</span><span class="cx"> _documentView = view;
</span><span class="cx"> _views = [[NSMutableArray alloc] init];
</span><del>- _checksInProgress = (NSMutableSet *)CFMakeCollectable(CFSetCreateMutable(NULL, 0, NULL));
</del><ins>+ _checksInProgress = (NSMutableSet *)CFSetCreateMutable(NULL, 0, NULL);
</ins><span class="cx"> return self;
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebKit2ChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/ChangeLog (194869 => 194870)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/ChangeLog 2016-01-11 22:40:00 UTC (rev 194869)
+++ trunk/Source/WebKit2/ChangeLog 2016-01-11 23:16:17 UTC (rev 194870)
</span><span class="lines">@@ -1,3 +1,14 @@
</span><ins>+2016-01-11 Anders Carlsson <andersca@apple.com>
+
+ Get rid of CFMakeCollectable, it is a no-op
+ https://bugs.webkit.org/show_bug.cgi?id=152988
+
+ Reviewed by Sam Weinig.
+
+ * Shared/Cocoa/WKNSString.mm:
+ * Shared/Cocoa/WKNSURL.mm:
+ (-[WKNSURL _web_createTarget]):
+
</ins><span class="cx"> 2016-01-11 Commit Queue <commit-queue@webkit.org>
</span><span class="cx">
</span><span class="cx"> Unreviewed, rolling out r194866.
</span></span></pre></div>
<a id="trunkSourceWebKit2SharedCocoaWKNSStringmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/Shared/Cocoa/WKNSString.mm (194869 => 194870)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/Shared/Cocoa/WKNSString.mm 2016-01-11 22:40:00 UTC (rev 194869)
+++ trunk/Source/WebKit2/Shared/Cocoa/WKNSString.mm 2016-01-11 23:16:17 UTC (rev 194870)
</span><span class="lines">@@ -38,7 +38,7 @@
</span><span class="cx"> - (NSObject *)_web_createTarget
</span><span class="cx"> {
</span><span class="cx"> const String& string = static_cast<API::String*>(&self._apiObject)->string();
</span><del>- return (NSString *)CFMakeCollectable(string.createCFString().leakRef());
</del><ins>+ return (NSString *)string.createCFString().leakRef();
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> #pragma mark NSCopying protocol implementation
</span></span></pre></div>
<a id="trunkSourceWebKit2SharedCocoaWKNSURLmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/Shared/Cocoa/WKNSURL.mm (194869 => 194870)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/Shared/Cocoa/WKNSURL.mm 2016-01-11 22:40:00 UTC (rev 194869)
+++ trunk/Source/WebKit2/Shared/Cocoa/WKNSURL.mm 2016-01-11 23:16:17 UTC (rev 194870)
</span><span class="lines">@@ -36,7 +36,7 @@
</span><span class="cx">
</span><span class="cx"> - (NSObject *)_web_createTarget
</span><span class="cx"> {
</span><del>- return (NSURL *)CFMakeCollectable(WKURLCopyCFURL(kCFAllocatorDefault, WebKit::toAPI(reinterpret_cast<API::URL*>(&self._apiObject))));
</del><ins>+ return (NSURL *)WKURLCopyCFURL(kCFAllocatorDefault, WebKit::toAPI(reinterpret_cast<API::URL*>(&self._apiObject)));
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> #pragma mark NSCopying protocol implementation
</span></span></pre>
</div>
</div>
</body>
</html>