Title: [273119] trunk/Source/WebKit
- Revision
- 273119
- Author
- megan_gard...@apple.com
- Date
- 2021-02-18 18:16:26 -0800 (Thu, 18 Feb 2021)
Log Message
Correctly retain properties in _WKAppHighlight
https://bugs.webkit.org/show_bug.cgi?id=222151
Reviewed by Wenson Hsieh.
* UIProcess/API/Cocoa/_WKAppHighlight.h:
* UIProcess/API/Cocoa/_WKAppHighlight.mm:
(-[_WKAppHighlight initWithHighlight:text:image:]):
(-[_WKAppHighlight highlight]):
(-[_WKAppHighlight text]):
(-[_WKAppHighlight image]):
Modified Paths
Diff
Modified: trunk/Source/WebKit/ChangeLog (273118 => 273119)
--- trunk/Source/WebKit/ChangeLog 2021-02-19 02:10:28 UTC (rev 273118)
+++ trunk/Source/WebKit/ChangeLog 2021-02-19 02:16:26 UTC (rev 273119)
@@ -1,3 +1,17 @@
+2021-02-18 Megan Gardner <megan_gard...@apple.com>
+
+ Correctly retain properties in _WKAppHighlight
+ https://bugs.webkit.org/show_bug.cgi?id=222151
+
+ Reviewed by Wenson Hsieh.
+
+ * UIProcess/API/Cocoa/_WKAppHighlight.h:
+ * UIProcess/API/Cocoa/_WKAppHighlight.mm:
+ (-[_WKAppHighlight initWithHighlight:text:image:]):
+ (-[_WKAppHighlight highlight]):
+ (-[_WKAppHighlight text]):
+ (-[_WKAppHighlight image]):
+
2021-02-18 Julian Gonzalez <julian_a_gonza...@apple.com>
Crash in IPC::decode(Decoder& decoder, RetainPtr<SecKeychainItemRef>& result)
Modified: trunk/Source/WebKit/UIProcess/API/Cocoa/_WKAppHighlight.h (273118 => 273119)
--- trunk/Source/WebKit/UIProcess/API/Cocoa/_WKAppHighlight.h 2021-02-19 02:10:28 UTC (rev 273118)
+++ trunk/Source/WebKit/UIProcess/API/Cocoa/_WKAppHighlight.h 2021-02-19 02:16:26 UTC (rev 273119)
@@ -36,14 +36,14 @@
- (instancetype)init NS_UNAVAILABLE;
-@property (nonatomic, readonly, copy) NSData *highlight;
+@property (nonatomic, readonly, strong) NSData *highlight;
-@property (nonatomic, readonly, copy) NSString *text;
+@property (nonatomic, readonly, strong) NSString *text;
#if TARGET_OS_IPHONE
-@property (nonatomic, readonly, copy) UIImage *image;
+@property (nonatomic, readonly, strong) UIImage *image;
#else
-@property (nonatomic, readonly, copy) NSImage *image;
+@property (nonatomic, readonly, strong) NSImage *image;
#endif
Modified: trunk/Source/WebKit/UIProcess/API/Cocoa/_WKAppHighlight.mm (273118 => 273119)
--- trunk/Source/WebKit/UIProcess/API/Cocoa/_WKAppHighlight.mm 2021-02-19 02:10:28 UTC (rev 273118)
+++ trunk/Source/WebKit/UIProcess/API/Cocoa/_WKAppHighlight.mm 2021-02-19 02:16:26 UTC (rev 273119)
@@ -27,8 +27,13 @@
#import "_WKAppHighlight.h"
#import "CocoaImage.h"
+#import <wtf/RetainPtr.h>
-@implementation _WKAppHighlight
+@implementation _WKAppHighlight {
+ RetainPtr<NSData> _highlight;
+ RetainPtr<NSString> _text;
+ RetainPtr<CocoaImage> _image;
+}
- (instancetype)initWithHighlight:(NSData *)highlight text:(NSString *)text image:(CocoaImage *)image
{
@@ -42,4 +47,19 @@
return self;
}
+- (NSData *)highlight
+{
+ return _highlight.get();
+}
+
+- (NSString *)text
+{
+ return _text.get();
+}
+
+- (CocoaImage *)image
+{
+ return _image.get();
+}
+
@end
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
