Title: [293290] trunk/Source/WebCore
- Revision
- 293290
- Author
- drou...@apple.com
- Date
- 2022-04-23 08:09:11 -0700 (Sat, 23 Apr 2022)
Log 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.
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (293289 => 293290)
--- trunk/Source/WebCore/ChangeLog 2022-04-23 08:10:09 UTC (rev 293289)
+++ trunk/Source/WebCore/ChangeLog 2022-04-23 15:09:11 UTC (rev 293290)
@@ -1,3 +1,18 @@
+2022-04-23 Devin Rousso <drou...@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 <cathiec...@igalia.com>
The layout is not updated when style.contain is changed from "size"/"inline-size" to empty string
Modified: trunk/Source/WebCore/platform/ios/PlaybackSessionInterfaceAVKit.mm (293289 => 293290)
--- trunk/Source/WebCore/platform/ios/PlaybackSessionInterfaceAVKit.mm 2022-04-23 08:10:09 UTC (rev 293289)
+++ trunk/Source/WebCore/platform/ios/PlaybackSessionInterfaceAVKit.mm 2022-04-23 15:09:11 UTC (rev 293290)
@@ -188,7 +188,7 @@
static RetainPtr<NSArray> mediaSelectionOptions(const Vector<MediaSelectionOption>& options)
{
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]);
});
}
Modified: trunk/Source/WebCore/platform/ios/WebAVPlayerController.h (293289 => 293290)
--- trunk/Source/WebCore/platform/ios/WebAVPlayerController.h 2022-04-23 08:10:09 UTC (rev 293289)
+++ trunk/Source/WebCore/platform/ios/WebAVPlayerController.h 2022-04-23 15:09:11 UTC (rev 293290)
@@ -35,7 +35,7 @@
@interface WebAVMediaSelectionOption : NSObject
- (instancetype)initWithMediaType:(AVMediaType)type displayName:(NSString *)displayName;
-@property (retain) NSString *localizedDisplayName;
+@property (nonatomic, readonly) NSString *localizedDisplayName;
@property (nonatomic, readonly) AVMediaType mediaType;
@end
Modified: trunk/Source/WebCore/platform/ios/WebAVPlayerController.mm (293289 => 293290)
--- trunk/Source/WebCore/platform/ios/WebAVPlayerController.mm 2022-04-23 08:10:09 UTC (rev 293289)
+++ trunk/Source/WebCore/platform/ios/WebAVPlayerController.mm 2022-04-23 15:09:11 UTC (rev 293290)
@@ -776,7 +776,9 @@
@end
-@implementation WebAVMediaSelectionOption
+@implementation WebAVMediaSelectionOption {
+ RetainPtr<NSString> _localizedDisplayName;
+}
- (instancetype)initWithMediaType:(AVMediaType)mediaType displayName:(NSString *)displayName
{
@@ -790,10 +792,9 @@
return self;
}
-- (void)dealloc
+- (NSString *)localizedDisplayName
{
- [_localizedDisplayName release];
- [super dealloc];
+ return _localizedDisplayName.get();
}
- (NSArray<NSNumber *> *)mediaSubTypes
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
