Changeset 293290 in webkit

Timestamp:

Apr 23, 2022, 8:09:11 AM (4 years ago)

Author:

Devin Rousso

Message:

fix a few ObjC memory management issues after r291361
​https://bugs.webkit.org/show_bug.cgi?id=239686
<rdar://problem/91008058>

Reviewed by Eric Carlson.

• platform/ios/PlaybackSessionInterfaceAVKit.mm:

(WebCore::mediaSelectionOptions):

• platform/ios/WebAVPlayerController.h:
• platform/ios/WebAVPlayerController.mm:

(-[WebAVMediaSelectionOption localizedDisplayName]): Added.
(-[WebAVMediaSelectionOption dealloc]): Deleted.

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• platform/ios/PlaybackSessionInterfaceAVKit.mm (modified) (1 diff)
• platform/ios/WebAVPlayerController.h (modified) (1 diff)
• platform/ios/WebAVPlayerController.mm (modified) (2 diffs)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2022-04-23  Devin Rousso  <drousso@apple.com>
+
+        fix a few ObjC memory management issues after r291361
+        https://bugs.webkit.org/show_bug.cgi?id=239686
+        <rdar://problem/91008058>
+
+        Reviewed by Eric Carlson.
+
+        * platform/ios/PlaybackSessionInterfaceAVKit.mm:
+        (WebCore::mediaSelectionOptions):
+        * platform/ios/WebAVPlayerController.h:
+        * platform/ios/WebAVPlayerController.mm:
+        (-[WebAVMediaSelectionOption localizedDisplayName]): Added.
+        (-[WebAVMediaSelectionOption dealloc]): Deleted.
+
 2022-04-22  Cathie Chen  <cathiechen@igalia.com>
 

trunk/Source/WebCore/platform/ios/PlaybackSessionInterfaceAVKit.mm

@@ -189 +189 @@
 {
     return createNSArray(options, [] (auto& option) {
-        return [[WebAVMediaSelectionOption alloc] initWithMediaType:toAVMediaType(option.mediaType) displayName:option.displayName];
+        return adoptNS([[WebAVMediaSelectionOption alloc] initWithMediaType:toAVMediaType(option.mediaType) displayName:option.displayName]);
     });
 }

trunk/Source/WebCore/platform/ios/WebAVPlayerController.h

@@ -36 +36 @@
 - (instancetype)initWithMediaType:(AVMediaType)type displayName:(NSString *)displayName;
 
-@property (retain) NSString *localizedDisplayName;
+@property (nonatomic, readonly) NSString *localizedDisplayName;
 @property (nonatomic, readonly) AVMediaType mediaType;
 

trunk/Source/WebCore/platform/ios/WebAVPlayerController.mm

@@ -777 +777 @@
 @end
 
-@implementation WebAVMediaSelectionOption
+@implementation WebAVMediaSelectionOption {
+    RetainPtr<NSString> _localizedDisplayName;
+}
 
 - (instancetype)initWithMediaType:(AVMediaType)mediaType displayName:(NSString *)displayName
@@ -791 +793 @@
 }
 
-- (void)dealloc
-{
-    [_localizedDisplayName release];
-    [super dealloc];
+- (NSString *)localizedDisplayName
+{
+    return _localizedDisplayName.get();
 }