Title: [204432] trunk/Source/WebKit2
- Revision
- 204432
- Author
- [email protected]
- Date
- 2016-08-12 16:34:27 -0700 (Fri, 12 Aug 2016)
Log Message
[Cocoa] Instances of WKObject subclasses don’t work correctly with CFGetTypeID()
https://bugs.webkit.org/show_bug.cgi?id=160820
<rdar://problem/27825875>
Reviewed by Anders Carlsson.
* Shared/Cocoa/WKObject.mm:
(-[WKObject _cfTypeID]): Override this internal method and forward to the target object.
Modified Paths
Diff
Modified: trunk/Source/WebKit2/ChangeLog (204431 => 204432)
--- trunk/Source/WebKit2/ChangeLog 2016-08-12 23:12:46 UTC (rev 204431)
+++ trunk/Source/WebKit2/ChangeLog 2016-08-12 23:34:27 UTC (rev 204432)
@@ -1,3 +1,14 @@
+2016-08-12 Dan Bernstein <[email protected]>
+
+ [Cocoa] Instances of WKObject subclasses don’t work correctly with CFGetTypeID()
+ https://bugs.webkit.org/show_bug.cgi?id=160820
+ <rdar://problem/27825875>
+
+ Reviewed by Anders Carlsson.
+
+ * Shared/Cocoa/WKObject.mm:
+ (-[WKObject _cfTypeID]): Override this internal method and forward to the target object.
+
2016-08-12 Johan K. Jensen <[email protected]>
Rename DocumentLoadTiming and ResourceLoadTiming
Modified: trunk/Source/WebKit2/Shared/Cocoa/WKObject.mm (204431 => 204432)
--- trunk/Source/WebKit2/Shared/Cocoa/WKObject.mm 2016-08-12 23:12:46 UTC (rev 204431)
+++ trunk/Source/WebKit2/Shared/Cocoa/WKObject.mm 2016-08-12 23:34:27 UTC (rev 204432)
@@ -30,6 +30,10 @@
#import "APIObject.h"
+@interface NSObject ()
+- (CFTypeID)_cfTypeID;
+@end
+
@implementation WKObject {
BOOL _hasInitializedTarget;
NSObject *_target;
@@ -128,6 +132,11 @@
return [_target classForKeyedArchiver];
}
+- (CFTypeID)_cfTypeID
+{
+ return _target ? [_target _cfTypeID] : [super _cfTypeID];
+}
+
- (NSObject *)_web_createTarget
{
return nil;
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
