Attachment 348729 Details for Bug 189228 – Patch

[patch] Patch

bug-189228-20180902003254.patch (text/plain), 32.58 KB, created by Darin Adler on 2018-09-02 00:32:55 PDT

(hide)

Description:

Filename:

MIME Type:

Creator: Darin Adler

Created: 2018-09-02 00:32:55 PDT

Size: 32.58 KB

patch

obsolete

>Subversion Revision: 235583
>diff --git a/Tools/ChangeLog b/Tools/ChangeLog
>index 7d898d414ce68f81a23e3bd2156f75d3e230e938..371c5b3f8320e4a1e522fffd25cd9b8d9a95397b 100644
>--- a/Tools/ChangeLog
>+++ b/Tools/ChangeLog
>@@ -1,3 +1,95 @@
>+2018-09-02  Darin Adler  <darin@apple.com>
>+
>+        [Cocoa] Turn on ARC for WebKitTestRunner
>+        https://bugs.webkit.org/show_bug.cgi?id=189228
>+
>+        Reviewed by NOBODY (OOPS!).
>+
>+        * TestRunnerShared/EventSerialization/mac/EventSerializerMac.mm:
>+        (+[EventSerializer dictionaryForEvent:relativeToTime:]): Removed autorelease.
>+
>+        * TestRunnerShared/cocoa/LayoutTestSpellChecker.mm:
>+        (-[LayoutTestSpellChecker setResultsFromJSObject:inContext:]): Removed autorelease.
>+
>+        * WebKitTestRunner/Configurations/Base.xcconfig: Added CLANG_ENABLE_OBJC_ARC.
>+
>+        * WebKitTestRunner/InjectedBundle/ios/AccessibilityControllerIOS.mm:
>+        (WTR::AccessibilityController::accessibleElementById): Use a __bridge cast.
>+        * WebKitTestRunner/InjectedBundle/ios/AccessibilityTextMarkerIOS.mm:
>+        (WTR::AccessibilityTextMarker::isEqual): Ditto.
>+
>+        * WebKitTestRunner/InjectedBundle/ios/AccessibilityUIElementIOS.mm:
>+        (WTR::AccessibilityUIElement::AccessibilityUIElement): Removed retain.
>+        (WTR::AccessibilityUIElement::~AccessibilityUIElement): Removed release.
>+        (WTR::AccessibilityUIElement::removeNotificationListener): Removed release.
>+        (WTR::AccessibilityUIElement::lineTextMarkerRangeForTextMarker): Use a __bridge cast.
>+        (WTR::AccessibilityUIElement::textMarkerRangeForElement): Ditto.
>+        (WTR::AccessibilityUIElement::textMarkerRangeLength): Ditto.
>+        (WTR::AccessibilityUIElement::previousTextMarker): Ditto.
>+        (WTR::AccessibilityUIElement::nextTextMarker): Ditto.
>+        (WTR::AccessibilityUIElement::stringForTextMarkerRange): Ditto.
>+        (WTR::AccessibilityUIElement::textMarkerRangeForMarkers): Ditto.
>+        (WTR::AccessibilityUIElement::startTextMarkerForTextMarkerRange): Ditto.
>+        (WTR::AccessibilityUIElement::endTextMarkerForTextMarkerRange): Ditto.
>+        (WTR::AccessibilityUIElement::accessibilityElementForTextMarker): Ditto.
>+        (WTR::AccessibilityUIElement::textMarkerRangeMatchesTextNearMarkers): Ditto.
>+        (WTR::_CGPathEnumerationIteration): Ditto.
>+        (WTR::AccessibilityUIElement::pathDescription const): Ditto.
>+
>+        * WebKitTestRunner/InjectedBundle/mac/AccessibilityNotificationHandler.mm:
>+        (-[AccessibilityNotificationHandler dealloc]): Removed [super dealloc].
>+
>+        * WebKitTestRunner/InjectedBundle/mac/AccessibilityUIElementMac.mm:
>+        (WTR::AccessibilityUIElement::AccessibilityUIElement): Removed retain.
>+        (WTR::AccessibilityUIElement::~AccessibilityUIElement): Removed release.
>+        (WTR::AccessibilityUIElement::removeNotificationListener): Removed release.
>+        (WTR::createJSStringRef): Removed autorelease.
>+
>+        * WebKitTestRunner/cocoa/TestControllerCocoa.mm:
>+        (WTR::initializeWebViewConfiguration): Removed release.
>+        (WTR::TestController::cocoaPlatformInitialize): Removed release.
>+        (WTR::TestController::platformCreateOtherPage): Removed autorelease.
>+
>+        * WebKitTestRunner/cocoa/TestRunnerWKWebView.mm:
>+        (-[TestRunnerWKWebView dealloc]): Removed [super dealloc] and also many
>+        cases of setting properties to nil that were only present for memory
>+        management reasons.
>+
>+        * WebKitTestRunner/ios/UIScriptControllerIOS.mm:
>+        (WTR::UIScriptController::accessibilitySpeakSelectionContent const):
>+        Use __bridge cast.
>+        (WTR::UIScriptController::enterText): Ditto.
>+        (WTR::UIScriptController::selectFormPopoverTitle const): Ditto.
>+        (WTR::UIScriptController::textContentType const): Ditto.
>+        (WTR::UIScriptController::formInputLabel const): Ditto.
>+        (WTR::UIScriptController::scrollingTreeAsText const): Ditto.
>+
>+        * WebKitTestRunner/mac/PlatformWebViewMac.mm:
>+        (WTR::PlatformWebView::~PlatformWebView): Removed release.
>+        (WTR::PlatformWebView::addChromeInputField): Removed release.
>+
>+        * WebKitTestRunner/mac/TestControllerMac.mm:
>+        (WTR::allowedFontFamilySet): Removed retain.
>+        (WTR::systemHiddenFontFamilySet): Removed retain.
>+
>+        * WebKitTestRunner/mac/WebKitTestRunnerDraggingInfo.mm:
>+        (-[WebKitTestRunnerDraggingInfo draggingDestinationWindow]): Removed retain.
>+        (-[WebKitTestRunnerDraggingInfo dealloc]): Deleted.
>+
>+        * WebKitTestRunner/mac/WebKitTestRunnerPasteboard.mm:
>+        (+[WebKitTestRunnerPasteboard _pasteboardWithName:]): Removed release.
>+        (+[WebKitTestRunnerPasteboard releaseLocalPasteboards]): Removed release.
>+        Method name is still OK because setting localPasteboards to nil will
>+        still release them.
>+        (-[LocalPasteboard dealloc]): Deleted.
>+        (-[LocalPasteboard addTypes:owner:]): Removed release.
>+
>+        * WebKitTestRunner/mac/WebKitTestRunnerWindow.mm:
>+        (-[WebKitTestRunnerWindow dealloc]): Removed [super dealloc].
>+
>+        * WebKitTestRunner/mac/main.mm:
>+        (disableAppNapInUIProcess): Removed retain.
>+
> 2018-08-31  Aditya Keerthi  <akeerthi@apple.com>
> 
>         Unreviewed, add an alternate email for Aditya Keerthi.
>diff --git a/Tools/TestRunnerShared/EventSerialization/mac/EventSerializerMac.mm b/Tools/TestRunnerShared/EventSerialization/mac/EventSerializerMac.mm
>index 23aeb15b4d6d9e4b981cc465e835eaa43b805720..7bb62b4d6fdaa6614c531f8bb10f0de4f6c3fc31 100644
>--- a/Tools/TestRunnerShared/EventSerialization/mac/EventSerializerMac.mm
>+++ b/Tools/TestRunnerShared/EventSerialization/mac/EventSerializerMac.mm
>@@ -198,7 +198,7 @@ + (NSDictionary *)dictionaryForEvent:(CGEventRef)rawEvent relativeToTime:(CGEven
>     RetainPtr<CGEventRef> plainEvent = adoptCF(CGEventCreate(NULL));
>     CGEventRef rawPlainEvent = plainEvent.get();
> 
>-    NSMutableDictionary *dict = [[[NSMutableDictionary alloc] init] autorelease];
>+    NSMutableDictionary *dict = [[NSMutableDictionary alloc] init];
> 
>     FOR_EACH_CGEVENT_INTEGER_FIELD(LOAD_INTEGER_FIELD_FROM_EVENT);
>     FOR_EACH_CGEVENT_DOUBLE_FIELD(LOAD_DOUBLE_FIELD_FROM_EVENT);
>diff --git a/Tools/TestRunnerShared/cocoa/LayoutTestSpellChecker.mm b/Tools/TestRunnerShared/cocoa/LayoutTestSpellChecker.mm
>index 231ab5528e4d95526f71acbac6e892e1c7ab7e43..f9131af212898b538b17b9ffc0711a7d54ec8cca 100644
>--- a/Tools/TestRunnerShared/cocoa/LayoutTestSpellChecker.mm
>+++ b/Tools/TestRunnerShared/cocoa/LayoutTestSpellChecker.mm
>@@ -251,7 +251,7 @@ - (void)setResultsFromJSObject:(JSObjectRef)resultsObject inContext:(JSContextRe
>                 }
>                 JSPropertyNameArrayRelease(detailsObjectProperties);
>             }
>-            [resultsForWord addObject:[[[LayoutTestTextCheckingResult alloc] initWithType:nsTextCheckingType(WTFMove(typeValue)) range:NSMakeRange(fromValue, toValue - fromValue) replacement:(__bridge NSString *)replacementText.get() details:details.get()] autorelease]];
>+            [resultsForWord addObject:[[LayoutTestTextCheckingResult alloc] initWithType:nsTextCheckingType(WTFMove(typeValue)) range:NSMakeRange(fromValue, toValue - fromValue) replacement:(__bridge NSString *)replacementText.get() details:details.get()]];
>         }
>         auto cfTextToCheck = adoptCF(JSStringCopyCFString(kCFAllocatorDefault, textToCheck));
>         [results setObject:resultsForWord.get() forKey:(__bridge NSString *)cfTextToCheck.get()];
>diff --git a/Tools/WebKitTestRunner/Configurations/Base.xcconfig b/Tools/WebKitTestRunner/Configurations/Base.xcconfig
>index 6efeda752da3824bc1e77cb9ff90f963a492db56..f1896d8ee41d2bf5779590fc9d4c9992067465d8 100644
>--- a/Tools/WebKitTestRunner/Configurations/Base.xcconfig
>+++ b/Tools/WebKitTestRunner/Configurations/Base.xcconfig
>@@ -30,6 +30,7 @@ USE_INTERNAL_SDK_Release = $(HAVE_INTERNAL_SDK);
> 
> CLANG_CXX_LANGUAGE_STANDARD = gnu++14;
> CLANG_CXX_LIBRARY = libc++;
>+CLANG_ENABLE_OBJC_ARC = YES;
> CLANG_ENABLE_OBJC_WEAK = YES;
> CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES;
> CLANG_WARN_CXX0X_EXTENSIONS = NO;
>diff --git a/Tools/WebKitTestRunner/InjectedBundle/ios/AccessibilityControllerIOS.mm b/Tools/WebKitTestRunner/InjectedBundle/ios/AccessibilityControllerIOS.mm
>index 09fa2bceb9ac4abc17c3df55fbf696945cba821a..f1796f2a50751c73453e15c799e1706ba9e28b62 100644
>--- a/Tools/WebKitTestRunner/InjectedBundle/ios/AccessibilityControllerIOS.mm
>+++ b/Tools/WebKitTestRunner/InjectedBundle/ios/AccessibilityControllerIOS.mm
>@@ -93,7 +93,7 @@ static id findAccessibleObjectById(id obj, NSString *idAttribute)
> RefPtr<AccessibilityUIElement> AccessibilityController::accessibleElementById(JSStringRef idAttribute)
> {
>     WKBundlePageRef page = InjectedBundle::singleton().page()->page();
>-    id root = static_cast<PlatformUIElement>(WKAccessibilityRootObject(page));
>+    id root = (__bridge PlatformUIElement)WKAccessibilityRootObject(page);
> 
>     id result = findAccessibleObjectById(root, [NSString stringWithJSStringRef:idAttribute]);
>     if (result)
>diff --git a/Tools/WebKitTestRunner/InjectedBundle/ios/AccessibilityTextMarkerIOS.mm b/Tools/WebKitTestRunner/InjectedBundle/ios/AccessibilityTextMarkerIOS.mm
>index 1f107ce79d7e43b8d830808d311dfc7ab68a4015..f7581e53e9d54605b030a433b7b4e65851c57e6a 100644
>--- a/Tools/WebKitTestRunner/InjectedBundle/ios/AccessibilityTextMarkerIOS.mm
>+++ b/Tools/WebKitTestRunner/InjectedBundle/ios/AccessibilityTextMarkerIOS.mm
>@@ -29,7 +29,7 @@ namespace WTR {
> 
> bool AccessibilityTextMarker::isEqual(AccessibilityTextMarker* other)
> {
>-    return [(id)platformTextMarker() isEqual:(id)other->platformTextMarker()];
>+    return [(__bridge id)platformTextMarker() isEqual:(__bridge id)other->platformTextMarker()];
> }
> 
> } // namespace WTR
>diff --git a/Tools/WebKitTestRunner/InjectedBundle/ios/AccessibilityUIElementIOS.mm b/Tools/WebKitTestRunner/InjectedBundle/ios/AccessibilityUIElementIOS.mm
>index c5e5e6c032e29c4cf1c4282d4e4969820a1d2ce7..b6afc854cdbf80ba6c2d1c77cbcbd1100421937d 100644
>--- a/Tools/WebKitTestRunner/InjectedBundle/ios/AccessibilityUIElementIOS.mm
>+++ b/Tools/WebKitTestRunner/InjectedBundle/ios/AccessibilityUIElementIOS.mm
>@@ -146,8 +146,6 @@ AccessibilityUIElement::AccessibilityUIElement(PlatformUIElement element)
>     : m_element(element)
>     , m_notificationHandler(0)
> {
>-    // FIXME: ap@webkit.org says ObjC objects need to be CFRetained/CFRelease to be GC-compliant on the mac.
>-    [m_element retain];
> }
> 
> AccessibilityUIElement::AccessibilityUIElement(const AccessibilityUIElement& other)
>@@ -155,12 +153,10 @@ AccessibilityUIElement::AccessibilityUIElement(const AccessibilityUIElement& oth
>     , m_element(other.m_element)
>     , m_notificationHandler(0)
> {
>-    [m_element retain];
> }
> 
> AccessibilityUIElement::~AccessibilityUIElement()
> {
>-    [m_element release];
> }
> 
> bool AccessibilityUIElement::isEqual(AccessibilityUIElement* otherElement)
>@@ -976,7 +972,6 @@ bool AccessibilityUIElement::removeNotificationListener()
>     ASSERT(m_notificationHandler);
>     
>     [m_notificationHandler stopObserving];
>-    [m_notificationHandler release];
>     m_notificationHandler = nil;
>     
>     return true;
>@@ -1063,41 +1058,41 @@ void AccessibilityUIElement::removeSelection()
> // Text markers
> RefPtr<AccessibilityTextMarkerRange> AccessibilityUIElement::lineTextMarkerRangeForTextMarker(AccessibilityTextMarker* textMarker)
> {
>-    id startTextMarker = [m_element lineStartMarkerForMarker:(id)textMarker->platformTextMarker()];
>-    id endTextMarker = [m_element lineEndMarkerForMarker:(id)textMarker->platformTextMarker()];
>+    id startTextMarker = [m_element lineStartMarkerForMarker:(__bridge id)textMarker->platformTextMarker()];
>+    id endTextMarker = [m_element lineEndMarkerForMarker:(__bridge id)textMarker->platformTextMarker()];
>     NSArray *textMarkers = [NSArray arrayWithObjects:startTextMarker, endTextMarker, nil];
>     
>     id textMarkerRange = [m_element textMarkerRangeForMarkers:textMarkers];
>-    return AccessibilityTextMarkerRange::create(textMarkerRange);
>+    return AccessibilityTextMarkerRange::create((__bridge PlatformTextMarkerRange)textMarkerRange);
> }
> 
> RefPtr<AccessibilityTextMarkerRange> AccessibilityUIElement::textMarkerRangeForElement(AccessibilityUIElement* element)
> {
>     id textMarkerRange = [element->platformUIElement() textMarkerRange];
>-    return AccessibilityTextMarkerRange::create(textMarkerRange);
>+    return AccessibilityTextMarkerRange::create((__bridge PlatformTextMarkerRange)textMarkerRange);
> }
> 
> int AccessibilityUIElement::textMarkerRangeLength(AccessibilityTextMarkerRange* range)
> {
>-    id textMarkers = (id)range->platformTextMarkerRange();    
>+    id textMarkers = (__bridge id)range->platformTextMarkerRange();
>     return [m_element lengthForTextMarkers:textMarkers];
> }
> 
> RefPtr<AccessibilityTextMarker> AccessibilityUIElement::previousTextMarker(AccessibilityTextMarker* textMarker)
> {
>-    id previousMarker = [m_element previousMarkerForMarker:(id)textMarker->platformTextMarker()];
>-    return AccessibilityTextMarker::create(previousMarker);
>+    id previousMarker = [m_element previousMarkerForMarker:(__bridge id)textMarker->platformTextMarker()];
>+    return AccessibilityTextMarker::create((__bridge PlatformTextMarker)previousMarker);
> }
> 
> RefPtr<AccessibilityTextMarker> AccessibilityUIElement::nextTextMarker(AccessibilityTextMarker* textMarker)
> {
>-    id nextMarker = [m_element nextMarkerForMarker:(id)textMarker->platformTextMarker()];
>-    return AccessibilityTextMarker::create(nextMarker);
>+    id nextMarker = [m_element nextMarkerForMarker:(__bridge id)textMarker->platformTextMarker()];
>+    return AccessibilityTextMarker::create((__bridge PlatformTextMarker)nextMarker);
> }
> 
> JSRetainPtr<JSStringRef> AccessibilityUIElement::stringForTextMarkerRange(AccessibilityTextMarkerRange* markerRange)
> {
>-    id textMarkers = (id)markerRange->platformTextMarkerRange();
>+    id textMarkers = (__bridge id)markerRange->platformTextMarkerRange();
>     if (!textMarkers || ![textMarkers isKindOfClass:[NSArray class]])
>         return JSStringCreateWithCharacters(0, 0);
>     return [[m_element stringForTextMarkers:textMarkers] createJSStringRef];
>@@ -1105,23 +1100,23 @@ JSRetainPtr<JSStringRef> AccessibilityUIElement::stringForTextMarkerRange(Access
> 
> RefPtr<AccessibilityTextMarkerRange> AccessibilityUIElement::textMarkerRangeForMarkers(AccessibilityTextMarker* startMarker, AccessibilityTextMarker* endMarker)
> {
>-    NSArray *textMarkers = [NSArray arrayWithObjects:(id)startMarker->platformTextMarker(), (id)endMarker->platformTextMarker(), nil];
>+    NSArray *textMarkers = [NSArray arrayWithObjects:(__bridge id)startMarker->platformTextMarker(), (__bridge id)endMarker->platformTextMarker(), nil];
>     id textMarkerRange = [m_element textMarkerRangeForMarkers:textMarkers];
>-    return AccessibilityTextMarkerRange::create(textMarkerRange);
>+    return AccessibilityTextMarkerRange::create((__bridge PlatformTextMarkerRange)textMarkerRange);
> }
> 
> RefPtr<AccessibilityTextMarker> AccessibilityUIElement::startTextMarkerForTextMarkerRange(AccessibilityTextMarkerRange* range)
> {
>-    id textMarkers = (id)range->platformTextMarkerRange();
>+    id textMarkers = (__bridge id)range->platformTextMarkerRange();
>     id textMarker = [m_element startOrEndTextMarkerForTextMarkers:textMarkers isStart:YES];
>-    return AccessibilityTextMarker::create(textMarker);
>+    return AccessibilityTextMarker::create((__bridge PlatformTextMarker)textMarker);
> }
> 
> RefPtr<AccessibilityTextMarker> AccessibilityUIElement::endTextMarkerForTextMarkerRange(AccessibilityTextMarkerRange* range)
> {
>-    id textMarkers = (id)range->platformTextMarkerRange();
>+    id textMarkers = (__bridge id)range->platformTextMarkerRange();
>     id textMarker = [m_element startOrEndTextMarkerForTextMarkers:textMarkers isStart:NO];
>-    return AccessibilityTextMarker::create(textMarker);
>+    return AccessibilityTextMarker::create((__bridge PlatformTextMarker)textMarker);
> }
> 
> RefPtr<AccessibilityTextMarker> AccessibilityUIElement::endTextMarkerForBounds(int x, int y, int width, int height)
>@@ -1141,7 +1136,7 @@ RefPtr<AccessibilityTextMarker> AccessibilityUIElement::textMarkerForPoint(int x
> 
> RefPtr<AccessibilityUIElement> AccessibilityUIElement::accessibilityElementForTextMarker(AccessibilityTextMarker* marker)
> {
>-    id obj = [m_element accessibilityObjectForTextMarker:(id)marker->platformTextMarker()];
>+    id obj = [m_element accessibilityObjectForTextMarker:(__bridge id)marker->platformTextMarker()];
>     if (obj)
>         return AccessibilityUIElement::create(obj);
>     return nullptr;
>@@ -1241,9 +1236,9 @@ RefPtr<AccessibilityTextMarkerRange> AccessibilityUIElement::textMarkerRangeMatc
> {
>     NSArray *textMarkers = nil;
>     if (startMarker->platformTextMarker() && endMarker->platformTextMarker())
>-        textMarkers = [NSArray arrayWithObjects:(id)startMarker->platformTextMarker(), (id)endMarker->platformTextMarker(), nil];
>+        textMarkers = [NSArray arrayWithObjects:(__bridge id)startMarker->platformTextMarker(), (__bridge id)endMarker->platformTextMarker(), nil];
>     id textMarkerRange = [m_element textMarkerRangeFromMarkers:textMarkers withText:[NSString stringWithJSStringRef:text]];
>-    return AccessibilityTextMarkerRange::create(textMarkerRange);
>+    return AccessibilityTextMarkerRange::create((__bridge PlatformTextMarkerRange)textMarkerRange);
> }
> 
> JSRetainPtr<JSStringRef> AccessibilityUIElement::mathPostscriptsDescription() const
>@@ -1258,7 +1253,7 @@ JSRetainPtr<JSStringRef> AccessibilityUIElement::mathPrescriptsDescription() con
> 
> static void _CGPathEnumerationIteration(void *info, const CGPathElement *element)
> {
>-    NSMutableString *result = (NSMutableString *)info;
>+    NSMutableString *result = (__bridge NSMutableString *)info;
>     switch (element->type) {
>     case kCGPathElementMoveToPoint:
>         [result appendString:@"\tMove to point\n"];
>@@ -1282,9 +1277,7 @@ JSRetainPtr<JSStringRef> AccessibilityUIElement::pathDescription() const
> {
>     NSMutableString *result = [NSMutableString stringWithString:@"\nStart Path\n"];
>     CGPathRef pathRef = [m_element _accessibilityPath];
>-    
>-    CGPathApply(pathRef, result, _CGPathEnumerationIteration);
>-    
>+    CGPathApply(pathRef, (__bridge void*)result, _CGPathEnumerationIteration);
>     return [result createJSStringRef];
> }
> 
>diff --git a/Tools/WebKitTestRunner/InjectedBundle/mac/AccessibilityNotificationHandler.mm b/Tools/WebKitTestRunner/InjectedBundle/mac/AccessibilityNotificationHandler.mm
>index f3ecb3b460de67940b3696bedd4d595c0bf5e2db..5dd02f7f409bc8d2658904b8e8efc9ddfeab95b6 100644
>--- a/Tools/WebKitTestRunner/InjectedBundle/mac/AccessibilityNotificationHandler.mm
>+++ b/Tools/WebKitTestRunner/InjectedBundle/mac/AccessibilityNotificationHandler.mm
>@@ -83,8 +83,6 @@ - (void)dealloc
> 
>     JSValueUnprotect(context, m_notificationFunctionCallback);
>     m_notificationFunctionCallback = 0;
>-
>-    [super dealloc];
> }
> 
> - (void)setCallback:(JSValueRef)callback
>diff --git a/Tools/WebKitTestRunner/InjectedBundle/mac/AccessibilityUIElementMac.mm b/Tools/WebKitTestRunner/InjectedBundle/mac/AccessibilityUIElementMac.mm
>index 77dffb306a4813eea698ca09fa1c13b71b3aa4d0..cd6e96a4815aaa5759ccdea720735cd039504e2d 100644
>--- a/Tools/WebKitTestRunner/InjectedBundle/mac/AccessibilityUIElementMac.mm
>+++ b/Tools/WebKitTestRunner/InjectedBundle/mac/AccessibilityUIElementMac.mm
>@@ -91,8 +91,6 @@ AccessibilityUIElement::AccessibilityUIElement(PlatformUIElement element)
>     : m_element(element)
>     , m_notificationHandler(0)
> {
>-    // FIXME: ap@webkit.org says ObjC objects need to be CFRetained/CFRelease to be GC-compliant on the mac.
>-    [m_element retain];
> }
> 
> AccessibilityUIElement::AccessibilityUIElement(const AccessibilityUIElement& other)
>@@ -100,14 +98,12 @@ AccessibilityUIElement::AccessibilityUIElement(const AccessibilityUIElement& oth
>     , m_element(other.m_element)
>     , m_notificationHandler(0)
> {
>-    [m_element retain];
> }
> 
> AccessibilityUIElement::~AccessibilityUIElement()
> {
>     // The notification handler should be nil because removeNotificationListener() should have been called in the test.
>     ASSERT(!m_notificationHandler);
>-    [m_element release];
> }
> 
> bool AccessibilityUIElement::isEqual(AccessibilityUIElement* otherElement)
>@@ -1558,7 +1554,6 @@ bool AccessibilityUIElement::removeNotificationListener()
>     ASSERT(m_notificationHandler);
> 
>     [m_notificationHandler stopObserving];
>-    [m_notificationHandler release];
>     m_notificationHandler = nil;
>     
>     return true;
>@@ -1827,7 +1822,7 @@ RefPtr<AccessibilityUIElement> AccessibilityUIElement::accessibilityElementForTe
> 
> static JSStringRef createJSStringRef(id string)
> {
>-    id mutableString = [[[NSMutableString alloc] init] autorelease];
>+    id mutableString = [[NSMutableString alloc] init];
>     id attributes = [string attributesAtIndex:0 effectiveRange:nil];
>     id attributeEnumerationBlock = ^(NSDictionary<NSString *, id> *attrs, NSRange range, BOOL *stop) {
>         BOOL misspelled = [[attrs objectForKey:NSAccessibilityMisspelledTextAttribute] boolValue];
>diff --git a/Tools/WebKitTestRunner/cocoa/TestControllerCocoa.mm b/Tools/WebKitTestRunner/cocoa/TestControllerCocoa.mm
>index 240eeb52f306784117ca5b8a96d8e3fc9307179e..bcf0c637bb01602e7329a96684f3068439baa1de 100644
>--- a/Tools/WebKitTestRunner/cocoa/TestControllerCocoa.mm
>+++ b/Tools/WebKitTestRunner/cocoa/TestControllerCocoa.mm
>@@ -57,7 +57,6 @@ static WKWebViewConfiguration *globalWebViewConfiguration;
> void initializeWebViewConfiguration(const char* libraryPath, WKStringRef injectedBundlePath, WKContextRef context, WKContextConfigurationRef contextConfiguration)
> {
> #if WK_API_ENABLED
>-    [globalWebViewConfiguration release];
>     globalWebViewConfiguration = [[WKWebViewConfiguration alloc] init];
> 
>     globalWebViewConfiguration.processPool = (__bridge WKProcessPool *)context;
>@@ -109,7 +108,6 @@ void TestController::cocoaPlatformInitialize()
>     NSDictionary *resourceLogPlist = [[NSDictionary alloc] initWithObjectsAndKeys: [NSNumber numberWithInt:1], @"version", nil];
>     if (![resourceLogPlist writeToFile:fullBrowsingSessionResourceLog atomically:YES])
>         WTFCrash();
>-    [resourceLogPlist release];
> }
> 
> WKContextRef TestController::platformContext()
>@@ -178,7 +176,7 @@ void TestController::platformCreateWebView(WKPageConfigurationRef, const TestOpt
> PlatformWebView* TestController::platformCreateOtherPage(PlatformWebView* parentView, WKPageConfigurationRef, const TestOptions& options)
> {
> #if WK_API_ENABLED
>-    WKWebViewConfiguration *newConfiguration = [[globalWebViewConfiguration copy] autorelease];
>+    WKWebViewConfiguration *newConfiguration = [globalWebViewConfiguration copy];
>     newConfiguration._relatedWebView = static_cast<WKWebView*>(parentView->platformView());
>     return new PlatformWebView(newConfiguration, options);
> #else
>diff --git a/Tools/WebKitTestRunner/cocoa/TestRunnerWKWebView.mm b/Tools/WebKitTestRunner/cocoa/TestRunnerWKWebView.mm
>index 9bb53cd9cf853fcef570a17f9a2b8aaaa6ac4595..86a6282686c27f6997a7e4de2480186917209660 100644
>--- a/Tools/WebKitTestRunner/cocoa/TestRunnerWKWebView.mm
>+++ b/Tools/WebKitTestRunner/cocoa/TestRunnerWKWebView.mm
>@@ -84,22 +84,6 @@ - (instancetype)initWithFrame:(CGRect)frame configuration:(WKWebViewConfiguratio
> - (void)dealloc
> {
>     [[NSNotificationCenter defaultCenter] removeObserver:self];
>-
>-    self.didStartFormControlInteractionCallback = nil;
>-    self.didEndFormControlInteractionCallback = nil;
>-    self.didShowForcePressPreviewCallback = nil;
>-    self.didDismissForcePressPreviewCallback = nil;
>-    self.willBeginZoomingCallback = nil;
>-    self.didEndZoomingCallback = nil;
>-    self.didShowKeyboardCallback = nil;
>-    self.didHideKeyboardCallback = nil;
>-    self.didEndScrollingCallback = nil;
>-    self.rotationDidEndCallback = nil;
>-
>-    self.zoomToScaleCompletionHandler = nil;
>-    self.retrieveSpeakSelectionContentCompletionHandler = nil;
>-
>-    [super dealloc];
> }
> 
> - (void)didStartFormControlInteraction
>diff --git a/Tools/WebKitTestRunner/ios/UIScriptControllerIOS.mm b/Tools/WebKitTestRunner/ios/UIScriptControllerIOS.mm
>index 593afc035a3ccc24be70e88aff107a7d1a2267a7..a6aa98c8e69e1f0209b72e0db28412fddfe3b0d8 100644
>--- a/Tools/WebKitTestRunner/ios/UIScriptControllerIOS.mm
>+++ b/Tools/WebKitTestRunner/ios/UIScriptControllerIOS.mm
>@@ -135,7 +135,7 @@ void UIScriptController::retrieveSpeakSelectionContent(JSValueRef callback)
> JSRetainPtr<JSStringRef> UIScriptController::accessibilitySpeakSelectionContent() const
> {
>     TestRunnerWKWebView *webView = TestController::singleton().mainWebView()->platformView();
>-    return JSStringCreateWithCFString((CFStringRef)webView.accessibilitySpeakSelectionContent);
>+    return JSStringCreateWithCFString((__bridge CFStringRef)webView.accessibilitySpeakSelectionContent);
> }
> 
> void UIScriptController::simulateAccessibilitySettingsChangeNotification(JSValueRef callback)
>@@ -335,7 +335,7 @@ void UIScriptController::enterText(JSStringRef text)
> {
>     TestRunnerWKWebView *webView = TestController::singleton().mainWebView()->platformView();
>     auto textAsCFString = adoptCF(JSStringCopyCFString(kCFAllocatorDefault, text));
>-    [webView _simulateTextEntered:(NSString *)textAsCFString.get()];
>+    [webView _simulateTextEntered:(__bridge NSString *)textAsCFString.get()];
> }
> 
> void UIScriptController::typeCharacterUsingHardwareKeyboard(JSStringRef character, JSValueRef callback)
>@@ -383,19 +383,19 @@ void UIScriptController::dismissFormAccessoryView()
> JSRetainPtr<JSStringRef> UIScriptController::selectFormPopoverTitle() const
> {
>     TestRunnerWKWebView *webView = TestController::singleton().mainWebView()->platformView();
>-    return JSStringCreateWithCFString((CFStringRef)webView.selectFormPopoverTitle);
>+    return JSStringCreateWithCFString((__bridge CFStringRef)webView.selectFormPopoverTitle);
> }
> 
> JSRetainPtr<JSStringRef> UIScriptController::textContentType() const
> {
>     TestRunnerWKWebView *webView = TestController::singleton().mainWebView()->platformView();
>-    return JSStringCreateWithCFString((CFStringRef)(webView.textContentTypeForTesting ?: @""));
>+    return JSStringCreateWithCFString((__bridge CFStringRef)(webView.textContentTypeForTesting ?: @""));
> }
> 
> JSRetainPtr<JSStringRef> UIScriptController::formInputLabel() const
> {
>     TestRunnerWKWebView *webView = TestController::singleton().mainWebView()->platformView();
>-    return JSStringCreateWithCFString((CFStringRef)webView.formInputLabel);
>+    return JSStringCreateWithCFString((__bridge CFStringRef)webView.formInputLabel);
> }
> 
> void UIScriptController::selectFormAccessoryPickerRow(long rowIndex)
>@@ -573,7 +573,7 @@ void UIScriptController::removeAllDynamicDictionaries()
> JSRetainPtr<JSStringRef> UIScriptController::scrollingTreeAsText() const
> {
>     TestRunnerWKWebView *webView = TestController::singleton().mainWebView()->platformView();
>-    return JSStringCreateWithCFString((CFStringRef)[webView _scrollingTreeAsText]);
>+    return JSStringCreateWithCFString((__bridge CFStringRef)[webView _scrollingTreeAsText]);
> }
> 
> JSObjectRef UIScriptController::propertiesOfLayerWithID(uint64_t layerID) const
>diff --git a/Tools/WebKitTestRunner/mac/PlatformWebViewMac.mm b/Tools/WebKitTestRunner/mac/PlatformWebViewMac.mm
>index f6cb2a08d64579cd444f820a30a6149f380dfa65..da13e534a347c03b9d70fc8eddd0dcc415984ffe 100644
>--- a/Tools/WebKitTestRunner/mac/PlatformWebViewMac.mm
>+++ b/Tools/WebKitTestRunner/mac/PlatformWebViewMac.mm
>@@ -110,8 +110,6 @@ PlatformWebView::~PlatformWebView()
> {
>     m_window.platformWebView = nullptr;
>     [m_window close];
>-    [m_window release];
>-    [m_view release];
> }
> 
> PlatformWindow PlatformWebView::keyWindow()
>@@ -163,7 +161,6 @@ void PlatformWebView::addChromeInputField()
>     NSTextField *textField = [[NSTextField alloc] initWithFrame:NSMakeRect(0, 0, 100, 20)];
>     textField.tag = 1;
>     [[m_window contentView] addSubview:textField];
>-    [textField release];
> 
>     NSView *view = platformView();
>     [textField setNextKeyView:view];
>diff --git a/Tools/WebKitTestRunner/mac/TestControllerMac.mm b/Tools/WebKitTestRunner/mac/TestControllerMac.mm
>index f9dd39d9b75b82408781f5945a0b79f43b262ee7..83c4c81939cd2f57a5e8f58f18e6928d3ad85209 100644
>--- a/Tools/WebKitTestRunner/mac/TestControllerMac.mm
>+++ b/Tools/WebKitTestRunner/mac/TestControllerMac.mm
>@@ -155,7 +155,7 @@ void TestController::platformConfigureViewForTest(const TestInvocation& test)
> 
> static NSSet *allowedFontFamilySet()
> {
>-    static NSSet *fontFamilySet = [[NSSet setWithObjects:
>+    static NSSet *fontFamilySet = [NSSet setWithObjects:
>         @"Ahem",
>         @"Al Bayan",
>         @"American Typewriter",
>@@ -277,16 +277,16 @@ static NSSet *allowedFontFamilySet()
>         @"Wingdings",
>         @"Zapf Dingbats",
>         @"Zapfino",
>-        nil] retain];
>+        nil];
> 
>     return fontFamilySet;
> }
> 
> static NSSet *systemHiddenFontFamilySet()
> {
>-    static NSSet *fontFamilySet = [[NSSet setWithObjects:
>+    static NSSet *fontFamilySet = [NSSet setWithObjects:
>         @".LucidaGrandeUI",
>-        nil] retain];
>+        nil];
> 
>     return fontFamilySet;
> }
>diff --git a/Tools/WebKitTestRunner/mac/WebKitTestRunnerDraggingInfo.mm b/Tools/WebKitTestRunner/mac/WebKitTestRunnerDraggingInfo.mm
>index 565db2f124f8f2c3248e9c321bcc8e9c8ddcb8e2..bceebece1bf467805ab73ac1e5566e4224b4002e 100644
>--- a/Tools/WebKitTestRunner/mac/WebKitTestRunnerDraggingInfo.mm
>+++ b/Tools/WebKitTestRunner/mac/WebKitTestRunnerDraggingInfo.mm
>@@ -41,23 +41,15 @@ - (id)initWithImage:(NSImage *)image offset:(NSSize)offset pasteboard:(NSPastebo
>     if (!self)
>         return nil;
> 
>-    _draggedImage = [image retain];
>-    _draggingPasteboard = [pasteboard retain];
>-    _draggingSource = [source retain];
>+    _draggedImage = image;
>+    _draggingPasteboard = pasteboard;
>+    _draggingSource = source;
>     _offset = offset;
>     
>     return self;
> }
> 
>-- (void)dealloc
>-{
>-    [_draggedImage release];
>-    [_draggingPasteboard release];
>-    [_draggingSource release];
>-    [super dealloc];
>-}
>-
>-- (NSWindow *)draggingDestinationWindow 
>+- (NSWindow *)draggingDestinationWindow
> {
>     return [TestController::singleton().mainWebView()->platformView() window];
> }
>diff --git a/Tools/WebKitTestRunner/mac/WebKitTestRunnerPasteboard.mm b/Tools/WebKitTestRunner/mac/WebKitTestRunnerPasteboard.mm
>index abcdf4147517ecbe5fc5dbf57c65ab1d4affb84b..1ba19186c989073845d8f98125ec35bce76efe39 100644
>--- a/Tools/WebKitTestRunner/mac/WebKitTestRunnerPasteboard.mm
>+++ b/Tools/WebKitTestRunner/mac/WebKitTestRunnerPasteboard.mm
>@@ -59,7 +59,6 @@ + (NSPasteboard *)_pasteboardWithName:(NSString *)name
>         return pasteboard;
>     pasteboard = [[LocalPasteboard alloc] initWithName:name];
>     [localPasteboards setObject:pasteboard forKey:name];
>-    [pasteboard release];
>     return pasteboard;
> }
> 
>@@ -71,7 +70,6 @@ - (void)_updateTypeCacheIfNeeded
> 
> + (void)releaseLocalPasteboards
> {
>-    [localPasteboards release];
>     localPasteboards = nil;
> }
> 
>@@ -104,15 +102,6 @@ - (id)initWithName:(NSString *)name
>     return self;
> }
> 
>-- (void)dealloc
>-{
>-    [typesArray release];
>-    [typesSet release];
>-    [dataByType release];
>-    [pasteboardName release];
>-    [super dealloc];
>-}
>-
> - (NSString *)name
> {
>     return pasteboardName;
>@@ -141,7 +130,6 @@ - (NSInteger)addTypes:(NSArray *)newTypes owner:(id)newOwner
>             setType = [type copy];
>             [typesArray addObject:setType];
>             [typesSet addObject:setType];
>-            [setType release];
>         }
>         if (newOwner && [newOwner respondsToSelector:@selector(pasteboard:provideDataForType:)])
>             [newOwner pasteboard:self provideDataForType:setType];
>diff --git a/Tools/WebKitTestRunner/mac/WebKitTestRunnerWindow.mm b/Tools/WebKitTestRunner/mac/WebKitTestRunnerWindow.mm
>index b45995a1aec261265d5fc8f93ab33433041a4171..a5a184336e69fae67b4b5ef5f26e7baae6d5a51b 100644
>--- a/Tools/WebKitTestRunner/mac/WebKitTestRunnerWindow.mm
>+++ b/Tools/WebKitTestRunner/mac/WebKitTestRunnerWindow.mm
>@@ -54,7 +54,6 @@ - (void)dealloc
> {
>     allWindows.removeFirst(self);
>     ASSERT(!allWindows.contains(self));
>-    [super dealloc];
> }
> 
> - (BOOL)isKeyWindow
>diff --git a/Tools/WebKitTestRunner/mac/main.mm b/Tools/WebKitTestRunner/mac/main.mm
>index c112cb11c03594195b8eff5e79e355a0ee632faf..9b5a9f93ac73d8ddc3cc41a0e8ab5f7a856da65c 100644
>--- a/Tools/WebKitTestRunner/mac/main.mm
>+++ b/Tools/WebKitTestRunner/mac/main.mm
>@@ -53,7 +53,7 @@ static void setDefaultsToConsistentValuesForTesting()
> static void disableAppNapInUIProcess()
> {
>     NSActivityOptions options = (NSActivityUserInitiatedAllowingIdleSystemSleep | NSActivityLatencyCritical) & ~(NSActivitySuddenTerminationDisabled | NSActivityAutomaticTerminationDisabled);
>-    static id assertion = [[[NSProcessInfo processInfo] beginActivityWithOptions:options reason:@"WebKitTestRunner should not be subject to process suppression"] retain];
>+    static id assertion = [[NSProcessInfo processInfo] beginActivityWithOptions:options reason:@"WebKitTestRunner should not be subject to process suppression"];
>     ASSERT_UNUSED(assertion, assertion);
> }
>

Actions: View | Formatted Diff | Diff

Attachments on bug 189228: 348729 | 348746 | 348777