Title: [211117] branches/safari-603-branch
- Revision
- 211117
- Author
- matthew_han...@apple.com
- Date
- 2017-01-24 15:29:33 -0800 (Tue, 24 Jan 2017)
Log Message
Merge r211086. rdar://problem/29948645
Modified Paths
Diff
Modified: branches/safari-603-branch/Source/WebKit2/ChangeLog (211116 => 211117)
--- branches/safari-603-branch/Source/WebKit2/ChangeLog 2017-01-24 23:29:30 UTC (rev 211116)
+++ branches/safari-603-branch/Source/WebKit2/ChangeLog 2017-01-24 23:29:33 UTC (rev 211117)
@@ -1,5 +1,21 @@
2017-01-24 Matthew Hanson <matthew_han...@apple.com>
+ Merge r211086. rdar://problem/29948645
+
+ 2017-01-23 Anders Carlsson <ander...@apple.com>
+
+ The Score Esports crashes on launch
+ https://bugs.webkit.org/show_bug.cgi?id=167338
+ rdar://problem/29948645
+
+ Reviewed by Dan Bernstein.
+
+ * Shared/Cocoa/WKObject.mm:
+ (+[WKObject conformsToProtocol:]):
+ Add a class method implementation in case an app ends up calling +[WKObject conformsToProtocol:] for some reason.
+
+2017-01-24 Matthew Hanson <matthew_han...@apple.com>
+
Merge r211054. rdar://problem/28891161
2017-01-23 Joseph Pecoraro <pecor...@apple.com>
Modified: branches/safari-603-branch/Source/WebKit2/Shared/Cocoa/WKObject.mm (211116 => 211117)
--- branches/safari-603-branch/Source/WebKit2/Shared/Cocoa/WKObject.mm 2017-01-24 23:29:30 UTC (rev 211116)
+++ branches/safari-603-branch/Source/WebKit2/Shared/Cocoa/WKObject.mm 2017-01-24 23:29:33 UTC (rev 211117)
@@ -153,6 +153,19 @@
return [_target respondsToSelector:selector] || (selector && class_respondsToSelector(object_getClass(self), selector));
}
++ (BOOL)conformsToProtocol:(Protocol *)protocol
+{
+ if (!protocol)
+ return NO;
+
+ for (Class cls = self; cls; cls = class_getSuperclass(cls)) {
+ if (class_conformsToProtocol(cls, protocol))
+ return YES;
+ }
+
+ return NO;
+}
+
- (BOOL)conformsToProtocol:(Protocol *)protocol
{
initializeTargetIfNeeded(self);
Modified: branches/safari-603-branch/Tools/ChangeLog (211116 => 211117)
--- branches/safari-603-branch/Tools/ChangeLog 2017-01-24 23:29:30 UTC (rev 211116)
+++ branches/safari-603-branch/Tools/ChangeLog 2017-01-24 23:29:33 UTC (rev 211117)
@@ -1,5 +1,21 @@
2017-01-24 Matthew Hanson <matthew_han...@apple.com>
+ Merge r211086. rdar://problem/29948645
+
+ 2017-01-23 Anders Carlsson <ander...@apple.com>
+
+ The Score Esports crashes on launch
+ https://bugs.webkit.org/show_bug.cgi?id=167338
+ rdar://problem/29948645
+
+ Reviewed by Dan Bernstein.
+
+ * TestWebKitAPI/Tests/WebKit2Cocoa/WKObject.mm:
+ (TestWebKitAPI::TEST):
+ Add a test.
+
+2017-01-24 Matthew Hanson <matthew_han...@apple.com>
+
Merge r211067. rdar://problem/29319962
2017-01-23 Alex Christensen <achristen...@webkit.org>
Modified: branches/safari-603-branch/Tools/TestWebKitAPI/Tests/WebKit2Cocoa/WKObject.mm (211116 => 211117)
--- branches/safari-603-branch/Tools/TestWebKitAPI/Tests/WebKit2Cocoa/WKObject.mm 2017-01-24 23:29:30 UTC (rev 211116)
+++ branches/safari-603-branch/Tools/TestWebKitAPI/Tests/WebKit2Cocoa/WKObject.mm 2017-01-24 23:29:33 UTC (rev 211117)
@@ -48,6 +48,14 @@
ASSERT_EQ((id)0, weakString);
}
+TEST(WebKit2, WKObject_classMethods)
+{
+ Class wkObjectClass = NSClassFromString(@"WKObject");
+ ASSERT_NE((Class)0, wkObjectClass);
+
+ ASSERT_TRUE([wkObjectClass conformsToProtocol:@protocol(NSObject)]);
+}
+
} // namespace TestWebKitAPI
#endif
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
