Attachment 348108 Details for Bug 188958 – Patch

[patch] Patch

bug-188958-20180826182703.patch (text/plain), 3.45 KB, created by Sam Weinig on 2018-08-26 18:27:04 PDT

(hide)

Description:

Filename:

MIME Type:

Creator: Sam Weinig

Created: 2018-08-26 18:27:04 PDT

Size: 3.45 KB

patch

obsolete

>Index: Source/WebKit/ChangeLog
>===================================================================
>--- Source/WebKit/ChangeLog	(revision 235334)
>+++ Source/WebKit/ChangeLog	(working copy)
>@@ -1,3 +1,15 @@
>+2018-08-26  Sam Weinig  <sam@webkit.org>
>+
>+        Using _WKRemoteObjectInterface with a protocol that inherits from a non-NSObject protocol crashes
>+        https://bugs.webkit.org/show_bug.cgi?id=188958
>+
>+        Reviewed by NOBODY (OOPS!).
>+
>+        * Shared/API/Cocoa/_WKRemoteObjectInterface.mm:
>+        (initializeMethods):
>+        Fix infinite recursion by using the passed in protocol rather
>+        than always using the one from the initial interface. 
>+
> 2018-08-23  Jeff Miller  <jeffm@apple.com>
> 
>         Remove -[WKNavigationDelegate _webView:decidePolicyForPluginLoadWithCurrentPolicy:pluginInfo:unavailabilityDescription:]
>Index: Source/WebKit/Shared/API/Cocoa/_WKRemoteObjectInterface.mm
>===================================================================
>--- Source/WebKit/Shared/API/Cocoa/_WKRemoteObjectInterface.mm	(revision 235334)
>+++ Source/WebKit/Shared/API/Cocoa/_WKRemoteObjectInterface.mm	(working copy)
>@@ -162,7 +162,7 @@         MethodInfo& methodInfo = interfa
> static void initializeMethods(_WKRemoteObjectInterface *interface, Protocol *protocol)
> {
>     unsigned conformingProtocolCount;
>-    auto conformingProtocols = protocol_copyProtocolList(interface->_protocol, &conformingProtocolCount);
>+    auto conformingProtocols = protocol_copyProtocolList(protocol, &conformingProtocolCount);
> 
>     for (unsigned i = 0; i < conformingProtocolCount; ++i) {
>         auto conformingProtocol = conformingProtocols[i];
>Index: Tools/ChangeLog
>===================================================================
>--- Tools/ChangeLog	(revision 235340)
>+++ Tools/ChangeLog	(working copy)
>@@ -1,3 +1,13 @@
>+2018-08-26  Sam Weinig  <sam@webkit.org>
>+
>+        Using _WKRemoteObjectInterface with a protocol that inherits from a non-NSObject protocol crashes
>+        https://bugs.webkit.org/show_bug.cgi?id=188958
>+
>+        Reviewed by NOBODY (OOPS!).
>+
>+        * TestWebKitAPI/Tests/WebKitCocoa/RemoteObjectRegistry.h:
>+        Update test protocol to have inheritance.
>+
> 2018-08-26  Lucas Forschler  <lforschler@apple.com>
> 
>         Open svn.webkit.org for commits.
>Index: Tools/TestWebKitAPI/Tests/WebKitCocoa/RemoteObjectRegistry.h
>===================================================================
>--- Tools/TestWebKitAPI/Tests/WebKitCocoa/RemoteObjectRegistry.h	(revision 235010)
>+++ Tools/TestWebKitAPI/Tests/WebKitCocoa/RemoteObjectRegistry.h	(working copy)
>@@ -29,10 +29,20 @@
> 
> #import <WebKit/_WKRemoteObjectInterface.h>
> 
>-@protocol RemoteObjectProtocol <NSObject>
>+@protocol BaseRemoteObjectProtocol <NSObject>
> 
> - (void)sayHello:(NSString *)hello;
>+
>+@end
>+
>+@protocol OtherBaseRemoteObjectProtocol <NSObject>
>+
> - (void)sayHello:(NSString *)hello completionHandler:(void (^)(NSString *))completionHandler;
>+
>+@end
>+
>+@protocol RemoteObjectProtocol <BaseRemoteObjectProtocol, OtherBaseRemoteObjectProtocol>
>+
> - (void)selectionAndClickInformationForClickAtPoint:(NSValue *)pointValue completionHandler:(void (^)(NSDictionary *))completionHandler;
> - (void)takeRange:(NSRange)range completionHandler:(void (^)(NSUInteger location, NSUInteger length))completionHandler;
> - (void)takeSize:(CGSize)size completionHandler:(void (^)(CGFloat width, CGFloat height))completionHandler;
>@@ -48,4 +58,5 @@ static inline _WKRemoteObjectInterface *
> 
>     return interface;
> }
>+
> #endif

Actions: View | Formatted Diff | Diff

Attachments on bug 188958: 348107 | 348108