Changeset 211117 in webkit

Timestamp:

Jan 24, 2017, 3:29:33 PM (10 years ago)

Author:

matthew_hanson@apple.com

Message:

Merge r211086. rdar://problem/29948645

Location:

branches/safari-603-branch

Files:

• Source/WebKit2/ChangeLog (modified) (1 diff)
• Source/WebKit2/Shared/Cocoa/WKObject.mm (modified) (1 diff)
• Tools/ChangeLog (modified) (1 diff)
• Tools/TestWebKitAPI/Tests/WebKit2Cocoa/WKObject.mm (modified) (1 diff)

branches/safari-603-branch/Source/WebKit2/ChangeLog

@@ +1 @@
+2017-01-24  Matthew Hanson  <matthew_hanson@apple.com>
+
+        Merge r211086. rdar://problem/29948645
+
+    2017-01-23  Anders Carlsson  <andersca@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_hanson@apple.com>
 

branches/safari-603-branch/Source/WebKit2/Shared/Cocoa/WKObject.mm

@@ -154 +154 @@
 }
 
++ (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
 {

branches/safari-603-branch/Tools/ChangeLog

@@ +1 @@
+2017-01-24  Matthew Hanson  <matthew_hanson@apple.com>
+
+        Merge r211086. rdar://problem/29948645
+
+    2017-01-23  Anders Carlsson  <andersca@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_hanson@apple.com>
 

branches/safari-603-branch/Tools/TestWebKitAPI/Tests/WebKit2Cocoa/WKObject.mm

@@ -49 +49 @@
 }
 
+TEST(WebKit2, WKObject_classMethods)
+{
+    Class wkObjectClass = NSClassFromString(@"WKObject");
+    ASSERT_NE((Class)0, wkObjectClass);
+
+    ASSERT_TRUE([wkObjectClass conformsToProtocol:@protocol(NSObject)]);
+}
+
 } // namespace TestWebKitAPI