Title: [211086] trunk
Revision
211086
Author
ander...@apple.com
Date
2017-01-24 09:29:13 -0800 (Tue, 24 Jan 2017)

Log Message

The Score Esports crashes on launch
https://bugs.webkit.org/show_bug.cgi?id=167338
rdar://problem/29948645

Reviewed by Dan Bernstein.

Source/WebKit2:

* Shared/Cocoa/WKObject.mm:
(+[WKObject conformsToProtocol:]):
Add a class method implementation in case an app ends up calling +[WKObject conformsToProtocol:] for some reason.

Tools:

* TestWebKitAPI/Tests/WebKit2Cocoa/WKObject.mm:
(TestWebKitAPI::TEST):
Add a test.

Modified Paths

Diff

Modified: trunk/Source/WebKit2/ChangeLog (211085 => 211086)


--- trunk/Source/WebKit2/ChangeLog	2017-01-24 17:01:44 UTC (rev 211085)
+++ trunk/Source/WebKit2/ChangeLog	2017-01-24 17:29:13 UTC (rev 211086)
@@ -1,3 +1,15 @@
+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  Miguel Gomez  <mago...@igalia.com>
 
         [Coordinated Graphics] Ensure that we're in AC mode before trying to create GraphicsLayers

Modified: trunk/Source/WebKit2/Shared/Cocoa/WKObject.mm (211085 => 211086)


--- trunk/Source/WebKit2/Shared/Cocoa/WKObject.mm	2017-01-24 17:01:44 UTC (rev 211085)
+++ trunk/Source/WebKit2/Shared/Cocoa/WKObject.mm	2017-01-24 17:29:13 UTC (rev 211086)
@@ -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: trunk/Tools/ChangeLog (211085 => 211086)


--- trunk/Tools/ChangeLog	2017-01-24 17:01:44 UTC (rev 211085)
+++ trunk/Tools/ChangeLog	2017-01-24 17:29:13 UTC (rev 211086)
@@ -1,3 +1,15 @@
+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-23  Carlos Garcia Campos  <cgar...@igalia.com>
 
         [GTK] Add API to WebKitWebsiteDataManager to handle website data

Modified: trunk/Tools/TestWebKitAPI/Tests/WebKit2Cocoa/WKObject.mm (211085 => 211086)


--- trunk/Tools/TestWebKitAPI/Tests/WebKit2Cocoa/WKObject.mm	2017-01-24 17:01:44 UTC (rev 211085)
+++ trunk/Tools/TestWebKitAPI/Tests/WebKit2Cocoa/WKObject.mm	2017-01-24 17:29:13 UTC (rev 211086)
@@ -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

Reply via email to