Attachment 342550 Details for Bug 186526 – Patch

[patch] Patch

bug-186526-20180612092539.patch (text/plain), 15.25 KB, created by Darin Adler on 2018-06-12 09:25:40 PDT

(hide)

Description:

Filename:

MIME Type:

Creator: Darin Adler

Created: 2018-06-12 09:25:40 PDT

Size: 15.25 KB

patch

obsolete

>Subversion Revision: 232754
>diff --git a/Source/WTF/ChangeLog b/Source/WTF/ChangeLog
>index c2c83cfbe4108647f6a4147c6c78e57d3c82fad0..e29237228838990b2ef784060bd53a2fe5043289 100644
>--- a/Source/WTF/ChangeLog
>+++ b/Source/WTF/ChangeLog
>@@ -1,3 +1,20 @@
>+2018-06-12  Darin Adler  <darin@apple.com>
>+
>+        [Cocoa] Make some RetainPtr refinements to get more ready for ARC
>+        https://bugs.webkit.org/show_bug.cgi?id=186526
>+
>+        Reviewed by NOBODY (OOPS!).
>+
>+        * wtf/RetainPtr.h: Added autoreleaseCF and bridgingAutorelease.
>+        The existing autorelease is for autorelease of an Objective-C type.
>+        The two new ones are for autorelease of CF types: We can use
>+        autoreleaseCF when we want an autoreleased CF type, and we can
>+        use bridgingAutorelease when we want to autorelease as part of
>+        converting from a CF type to an Objective-C type.
>+
>+        * wtf/text/mac/StringImplMac.mm:
>+        (WTF::StringImpl::operator NSString *): Use bridgingAutorelease.
>+
> 2018-06-11  Saam Barati  <sbarati@apple.com>
> 
>         The NaturalLoops algorithm only works when the list of blocks in a loop is de-duplicated
>diff --git a/Source/WebCore/ChangeLog b/Source/WebCore/ChangeLog
>index 796f80f19c232bdb13a4b64916ec62e1831b34ce..7a1b4da8686680d2c35786c629210411b8600f6e 100644
>--- a/Source/WebCore/ChangeLog
>+++ b/Source/WebCore/ChangeLog
>@@ -1,3 +1,13 @@
>+2018-06-12  Darin Adler  <darin@apple.com>
>+
>+        [Cocoa] Make some RetainPtr refinements to get more ready for ARC
>+        https://bugs.webkit.org/show_bug.cgi?id=186526
>+
>+        Reviewed by NOBODY (OOPS!).
>+
>+        * platform/mac/URLMac.mm:
>+        (WebCore::URL::operator NSURL * const): Use bridgingAutorelease.
>+
> 2018-06-12  Jianjun Zhu  <jianjun.zhu@intel.com>
> 
>         Hash deviceId and groupId of MediaTrackCapabilities.
>diff --git a/Source/WebKit/ChangeLog b/Source/WebKit/ChangeLog
>index 517b87c29b3dd61271bfcf3ef1e959a2518a551d..c62bb89238b379bddd7284e703666fcb4187a967 100644
>--- a/Source/WebKit/ChangeLog
>+++ b/Source/WebKit/ChangeLog
>@@ -1,3 +1,18 @@
>+2018-06-12  Darin Adler  <darin@apple.com>
>+
>+        [Cocoa] Make some RetainPtr refinements to get more ready for ARC
>+        https://bugs.webkit.org/show_bug.cgi?id=186526
>+
>+        Reviewed by NOBODY (OOPS!).
>+
>+        * Platform/cf/ModuleCF.cpp:
>+        (WebKit::Module::load): Use move assignment instead of adoptCF/leakRef.
>+
>+        * Shared/Cocoa/WKNSURLExtras.mm:
>+        (+[NSURL _web_URLWithWTFString:]): Cast to NSURL * instead of doing the autorelease
>+        here, since the NSURL * operator already does what we want.
>+        (+[NSURL _web_URLWithWTFString:relativeToURL:]): Ditto.
>+
> 2018-06-11  Carlos Garcia Campos  <cgarcia@igalia.com>
> 
>         Unreviewed. Update OptionsGTK.cmake and NEWS for 2.21.4 release.
>diff --git a/Source/WebKitLegacy/mac/ChangeLog b/Source/WebKitLegacy/mac/ChangeLog
>index 9ca66687eba9b173c9910e7adfe3074f4a80b82f..8910280d6fec43a1a15177ca6706f287d8740a8d 100644
>--- a/Source/WebKitLegacy/mac/ChangeLog
>+++ b/Source/WebKitLegacy/mac/ChangeLog
>@@ -1,3 +1,26 @@
>+2018-06-12  Darin Adler  <darin@apple.com>
>+
>+        [Cocoa] Make some RetainPtr refinements to get more ready for ARC
>+        https://bugs.webkit.org/show_bug.cgi?id=186526
>+
>+        Reviewed by NOBODY (OOPS!).
>+
>+        * DOM/DOM.mm:
>+        (-[DOMNode getPreviewSnapshotImage:andRects:]): Use autoreleaseCF.
>+        (-[DOMRange renderedImageForcingBlackText:]): Ditto.
>+
>+        * Plugins/Hosted/NetscapePluginHostManager.mm:
>+        (WebKit::preferredBundleLocalizationName): Use bridgingAutorelease.
>+
>+        * Plugins/Hosted/WebHostedNetscapePluginView.mm:
>+        (-[WebHostedNetscapePluginView createPluginLayer]): Use move
>+        assignment rather than adoptNS/leakRef.
>+        * Plugins/WebNetscapePluginView.mm:
>+        (-[WebNetscapePluginView createPlugin]): Ditto.
>+
>+        * WebView/WebPDFRepresentation.mm:
>+        (-[WebPDFRepresentation convertPostScriptDataSourceToPDF:]): Use bridgingAutorelease.
>+
> 2018-06-11  Tim Horton  <timothy_horton@apple.com>
> 
>         Link drag image is inconsistently unreadable in dark mode
>diff --git a/Source/WTF/wtf/RetainPtr.h b/Source/WTF/wtf/RetainPtr.h
>index 545ec398ac0ad28e152a3f917ce21a3913022d2f..fc6ed7404c2d80ca32f6ab2af113cf22cebe12b7 100644
>--- a/Source/WTF/wtf/RetainPtr.h
>+++ b/Source/WTF/wtf/RetainPtr.h
>@@ -83,7 +83,11 @@ public:
> 
>     void clear();
>     PtrType leakRef() WARN_UNUSED_RETURN;
>+    PtrType autoreleaseCF();
>+#ifdef __OBJC__
>     PtrType autorelease();
>+    id bridgingAutorelease();
>+#endif
> 
>     PtrType get() const { return fromStorageType(m_ptr); }
>     PtrType operator->() const { return fromStorageType(m_ptr); }
>@@ -115,7 +119,7 @@ private:
> 
>     static PtrType hashTableDeletedValue() { return reinterpret_cast<PtrType>(-1); }
> 
>-#if defined (__OBJC__) && __has_feature(objc_arc)
>+#if defined(__OBJC__) && __has_feature(objc_arc)
>     template<typename U>
>     typename std::enable_if<std::is_convertible<U, id>::value, PtrType>::type
>     fromStorageTypeHelper(StorageType ptr) const
>@@ -144,15 +148,15 @@ private:
>     StorageType m_ptr;
> };
> 
>+// Helper function for creating a RetainPtr using template argument deduction.
>+template<typename T> RetainPtr<T> retainPtr(T) WARN_UNUSED_RETURN;
>+
> template<typename T> inline RetainPtr<T>::~RetainPtr()
> {
>     if (StorageType ptr = std::exchange(m_ptr, nullptr))
>         CFRelease(ptr);
> }
> 
>-// Helper function for creating a RetainPtr using template argument deduction.
>-template<typename T> inline RetainPtr<T> retainPtr(T) WARN_UNUSED_RETURN;
>-
> template<typename T> template<typename U> inline RetainPtr<T>::RetainPtr(const RetainPtr<U>& o)
>     : m_ptr(toStorageType(o.get()))
> {
>@@ -166,16 +170,36 @@ template<typename T> inline void RetainPtr<T>::clear()
>         CFRelease(ptr);
> }
> 
>-template<typename T> inline typename RetainPtr<T>::PtrType RetainPtr<T>::leakRef()
>+template<typename T> inline auto RetainPtr<T>::leakRef() -> PtrType
> {
>     return fromStorageType(std::exchange(m_ptr, nullptr));
> }
> 
>+template<typename T> inline auto RetainPtr<T>::autoreleaseCF() -> PtrType
>+{
>+#ifdef __OBJC__
>+    static_assert((!std::is_convertible<PtrType, id>::value), "Don't use autoreleaseCF for Objective-C pointer types.");
>+#endif
>+    if (m_ptr)
>+        CFAutorelease(m_ptr);
>+    return leakRef();
>+}
>+
> #ifdef __OBJC__
>+
> template<typename T> inline auto RetainPtr<T>::autorelease() -> PtrType
> {
>-    return (__bridge PtrType)CFBridgingRelease(leakRef());
>+    static_assert((std::is_convertible<PtrType, id>::value), "Don't use autorelease for non-Objective-C pointer types.");
>+    return CFBridgingRelease(std::exchange(m_ptr, nullptr));
> }
>+
>+// FIXME: It would be nice if we could base the return type on the type that is toll-free bridged with T rather than using id.
>+template<typename T> inline id RetainPtr<T>::bridgingAutorelease()
>+{
>+    static_assert((!std::is_convertible<PtrType, id>::value), "Don't use bridgingAutorelease for Objective-C pointer types.");
>+    return CFBridgingRelease(leakRef());
>+}
>+
> #endif
> 
> template<typename T> inline RetainPtr<T>& RetainPtr<T>::operator=(const RetainPtr& o)
>diff --git a/Source/WTF/wtf/text/mac/StringImplMac.mm b/Source/WTF/wtf/text/mac/StringImplMac.mm
>index a00ec0d120ba102e374fe1e23bba74ad4b8a0a61..7e1e4ff418720d17600bc6b74575ac0dad81051e 100644
>--- a/Source/WTF/wtf/text/mac/StringImplMac.mm
>+++ b/Source/WTF/wtf/text/mac/StringImplMac.mm
>@@ -28,7 +28,7 @@ namespace WTF {
> 
> StringImpl::operator NSString *()
> {
>-    return (NSString *)createCFString().autorelease();
>+    return createCFString().bridgingAutorelease();
> }
> 
> }
>diff --git a/Source/WebCore/platform/mac/URLMac.mm b/Source/WebCore/platform/mac/URLMac.mm
>index bbbf9a2f7869a02f80f65280d2f11f057e7af9a6..025c1de7b0283cd0dbdba56ca16fafc5f39c58b6 100644
>--- a/Source/WebCore/platform/mac/URLMac.mm
>+++ b/Source/WebCore/platform/mac/URLMac.mm
>@@ -56,7 +56,7 @@ URL::operator NSURL *() const
> {
>     // Creating a toll-free bridged CFURL because creation with NSURL methods would not preserve the original string.
>     // We'll need fidelity when round-tripping via CFURLGetBytes().
>-    return (NSURL *)createCFURL().autorelease();
>+    return createCFURL().bridgingAutorelease();
> }
> 
> RetainPtr<CFURLRef> URL::createCFURL() const
>diff --git a/Source/WebKit/Platform/cf/ModuleCF.cpp b/Source/WebKit/Platform/cf/ModuleCF.cpp
>index 78dbfb74bd15c961b1223a0325a8e5b012647668..058bcfd43c49ecdbf455f168afee5e64084f1a7c 100644
>--- a/Source/WebKit/Platform/cf/ModuleCF.cpp
>+++ b/Source/WebKit/Platform/cf/ModuleCF.cpp
>@@ -41,7 +41,7 @@ bool Module::load()
>     if (!CFBundleLoadExecutable(bundle.get()))
>         return false;
> 
>-    m_bundle = adoptCF(bundle.leakRef());
>+    m_bundle = WTFMove(bundle);
>     return true;
> }
> 
>diff --git a/Source/WebKit/Shared/Cocoa/WKNSURLExtras.mm b/Source/WebKit/Shared/Cocoa/WKNSURLExtras.mm
>index 1a8363e8f8848bd5df3e3425f1b1db7b237266bf..0188f747982a940a48ab86f8288aab006dfd11d7 100644
>--- a/Source/WebKit/Shared/Cocoa/WKNSURLExtras.mm
>+++ b/Source/WebKit/Shared/Cocoa/WKNSURLExtras.mm
>@@ -38,13 +38,13 @@ @implementation NSURL (WKExtras)
> + (instancetype)_web_URLWithWTFString:(const String&)string
> {
>     URL url { URL { }, string };
>-    return (__bridge NSURL*) url.createCFURL().autorelease();
>+    return (NSURL *)url;
> }
> 
> + (instancetype)_web_URLWithWTFString:(const String&)string relativeToURL:(NSURL *)baseURL
> {
>     URL url { URL { baseURL }, string };
>-    return (__bridge NSURL*) url.createCFURL().autorelease();
>+    return (NSURL *)url;
> }
> 
> - (String)_web_originalDataAsWTFString
>diff --git a/Source/WebKitLegacy/mac/DOM/DOM.mm b/Source/WebKitLegacy/mac/DOM/DOM.mm
>index 83d56d0448655f76a8c76b9b93ceeefb8a7dd81a..78cfcb39479e3ddb45cc9a24ee81251df5c53459 100644
>--- a/Source/WebKitLegacy/mac/DOM/DOM.mm
>+++ b/Source/WebKitLegacy/mac/DOM/DOM.mm
>@@ -557,7 +557,7 @@ - (void)getPreviewSnapshotImage:(CGImageRef*)cgImage andRects:(NSArray **)rects
> 
>     if (textIndicator) {
>         if (Image* image = textIndicator->contentImage())
>-            *cgImage = image->nativeImage().autorelease();
>+            *cgImage = image->nativeImage().autoreleaseCF();
>     }
> 
>     RetainPtr<NSMutableArray> rectArray = adoptNS([[NSMutableArray alloc] init]);
>@@ -629,7 +629,7 @@ - (CGImageRef)renderedImageForcingBlackText:(BOOL)forceBlackText
> 
>     return renderedImage.autorelease();
> #else
>-    return createDragImageForRange(*frame, range, forceBlackText).autorelease();
>+    return createDragImageForRange(*frame, range, forceBlackText).autoreleaseCF();
> #endif
> }
> 
>diff --git a/Source/WebKitLegacy/mac/Plugins/Hosted/NetscapePluginHostManager.mm b/Source/WebKitLegacy/mac/Plugins/Hosted/NetscapePluginHostManager.mm
>index d328862a6c2204289aa9698bf20adc74584c8b67..703c5462c8ef22a37b1dd86048e3ba161ab5f5b2 100644
>--- a/Source/WebKitLegacy/mac/Plugins/Hosted/NetscapePluginHostManager.mm
>+++ b/Source/WebKitLegacy/mac/Plugins/Hosted/NetscapePluginHostManager.mm
>@@ -121,8 +121,7 @@ static NSString *preferredBundleLocalizationName()
>     if (!success)
>         return @"en_US";
> 
>-    auto code = adoptCF(CFLocaleCreateCanonicalLocaleIdentifierFromScriptManagerCodes(0, languageCode, regionCode));
>-    return (NSString *)code.autorelease();
>+    return adoptCF(CFLocaleCreateCanonicalLocaleIdentifierFromScriptManagerCodes(0, languageCode, regionCode)).bridgingAutorelease();
> }
> 
> bool NetscapePluginHostManager::spawnPluginHost(const String& pluginPath, cpu_type_t pluginArchitecture, mach_port_t clientPort, mach_port_t& pluginHostPort, ProcessSerialNumber& pluginHostPSN)
>diff --git a/Source/WebKitLegacy/mac/Plugins/Hosted/WebHostedNetscapePluginView.mm b/Source/WebKitLegacy/mac/Plugins/Hosted/WebHostedNetscapePluginView.mm
>index 9f12122cc07a619ca45c4fb574ffedfe0e14849f..f3e04b4f558061191c86fd6775515914863d1194 100644
>--- a/Source/WebKitLegacy/mac/Plugins/Hosted/WebHostedNetscapePluginView.mm
>+++ b/Source/WebKitLegacy/mac/Plugins/Hosted/WebHostedNetscapePluginView.mm
>@@ -189,7 +189,7 @@ - (void)createPluginLayer
>         // FIXME: This code can be shared between WebHostedNetscapePluginView and WebNetscapePluginView.
>         // Since this layer isn't going to be inserted into a view, we need to create another layer and flip its geometry
>         // in order to get the coordinate system right.
>-        RetainPtr<CALayer> realPluginLayer = adoptNS(_pluginLayer.leakRef());
>+        RetainPtr<CALayer> realPluginLayer = WTFMove(_pluginLayer);
> 
>         _pluginLayer = adoptNS([[CALayer alloc] init]);
>         _pluginLayer.get().bounds = realPluginLayer.get().bounds;
>diff --git a/Source/WebKitLegacy/mac/Plugins/WebNetscapePluginView.mm b/Source/WebKitLegacy/mac/Plugins/WebNetscapePluginView.mm
>index 4b14b6dcbe8350982112c1c234fba70c2f7fa9cd..b2b11d34cff57ec00406acff7c0e258ffb0357c8 100644
>--- a/Source/WebKitLegacy/mac/Plugins/WebNetscapePluginView.mm
>+++ b/Source/WebKitLegacy/mac/Plugins/WebNetscapePluginView.mm
>@@ -1098,7 +1098,7 @@ - (BOOL)createPlugin
>                 // FIXME: This code can be shared between WebHostedNetscapePluginView and WebNetscapePluginView.
>                 // Since this layer isn't going to be inserted into a view, we need to create another layer and flip its geometry
>                 // in order to get the coordinate system right.
>-                RetainPtr<CALayer> realPluginLayer = adoptNS(_pluginLayer.leakRef());
>+                RetainPtr<CALayer> realPluginLayer = WTFMove(_pluginLayer);
>                 
>                 _pluginLayer = adoptNS([[CALayer alloc] init]);
>                 _pluginLayer.get().bounds = realPluginLayer.get().bounds;
>diff --git a/Source/WebKitLegacy/mac/WebView/WebPDFRepresentation.mm b/Source/WebKitLegacy/mac/WebView/WebPDFRepresentation.mm
>index cbd6679baff28e62e9e30575ebc34d780ae67c14..79db38a6660bad06b8825bb53cb04d2df6f56408 100644
>--- a/Source/WebKitLegacy/mac/WebView/WebPDFRepresentation.mm
>+++ b/Source/WebKitLegacy/mac/WebView/WebPDFRepresentation.mm
>@@ -106,7 +106,7 @@ - (NSData *)convertPostScriptDataSourceToPDF:(NSData *)data
>     // Error handled by detecting zero-length 'result' in caller
>     CGPSConverterConvert(converter.get(), provider.get(), consumer.get(), 0);
> 
>-    return (NSData *)result.autorelease();
>+    return result.bridgingAutorelease();
> }
> 
> - (void)finishedLoadingWithDataSource:(WebDataSource *)dataSource
>diff --git a/Tools/ChangeLog b/Tools/ChangeLog
>index fcb676ba14799927a2c2c033ead6f5bc9766c5a6..fa781492071873158ac86cbee001ba8acec839ef 100644
>--- a/Tools/ChangeLog
>+++ b/Tools/ChangeLog
>@@ -1,3 +1,14 @@
>+2018-06-12  Darin Adler  <darin@apple.com>
>+
>+        [Cocoa] Make some RetainPtr refinements to get more ready for ARC
>+        https://bugs.webkit.org/show_bug.cgi?id=186526
>+
>+        Reviewed by NOBODY (OOPS!).
>+
>+        * DumpRenderTree/mac/LayoutTestHelper.m:
>+        (colorProfileURLForDisplay): Use CFBridgingRelease instead of using
>+        CFAutorelease for a bridging use case.
>+
> 2018-06-11  Carlos Alberto Lopez Perez  <clopez@igalia.com>
> 
>         [JSCOnly] Add a MIPS32el JSCOnly EWS
>diff --git a/Tools/DumpRenderTree/mac/LayoutTestHelper.m b/Tools/DumpRenderTree/mac/LayoutTestHelper.m
>index 330f27ef0beb497a493872afa38c7aaaf7b36d4e..1b5750403fd0ae72ead2d52019e3d083bc89573a 100644
>--- a/Tools/DumpRenderTree/mac/LayoutTestHelper.m
>+++ b/Tools/DumpRenderTree/mac/LayoutTestHelper.m
>@@ -95,7 +95,7 @@
>         return nil;
>     }
> 
>-    NSURL *url = (NSURL *)CFAutorelease(CFRetain(profileURL));
>+    NSURL *url = CFBridgingRelease(CFRetain(profileURL));
>     CFRelease(deviceInfo);
>     return url;
> }

Flags:

ews-watchlist: commit-queue-

Actions: View | Formatted Diff | Diff

Attachments on bug 186526: 342440 | 342548 | 342550 | 342579 | 342632 | 342720