Title: [158410] trunk/Source/WebKit2
- Revision
- 158410
- Author
- [email protected]
- Date
- 2013-10-31 17:31:27 -0700 (Thu, 31 Oct 2013)
Log Message
Address review comments.
* Shared/API/Cocoa/WKRemoteObject.h:
* Shared/API/Cocoa/WKRemoteObject.mm:
(-[WKRemoteObject conformsToProtocol:]):
Modified Paths
Diff
Modified: trunk/Source/WebKit2/ChangeLog (158409 => 158410)
--- trunk/Source/WebKit2/ChangeLog 2013-11-01 00:05:53 UTC (rev 158409)
+++ trunk/Source/WebKit2/ChangeLog 2013-11-01 00:31:27 UTC (rev 158410)
@@ -1,5 +1,13 @@
2013-10-31 Anders Carlsson <[email protected]>
+ Address review comments.
+
+ * Shared/API/Cocoa/WKRemoteObject.h:
+ * Shared/API/Cocoa/WKRemoteObject.mm:
+ (-[WKRemoteObject conformsToProtocol:]):
+
+2013-10-31 Anders Carlsson <[email protected]>
+
Add a WKRemoteObject class
https://bugs.webkit.org/show_bug.cgi?id=123586
Modified: trunk/Source/WebKit2/Shared/API/Cocoa/WKRemoteObject.h (158409 => 158410)
--- trunk/Source/WebKit2/Shared/API/Cocoa/WKRemoteObject.h 2013-11-01 00:05:53 UTC (rev 158409)
+++ trunk/Source/WebKit2/Shared/API/Cocoa/WKRemoteObject.h 2013-11-01 00:31:27 UTC (rev 158410)
@@ -23,7 +23,7 @@
* THE POSSIBILITY OF SUCH DAMAGE.
*/
-#import <WebKit2/WKFoundation.h>
+#import "WKFoundation.h"
#if WK_API_ENABLED
Modified: trunk/Source/WebKit2/Shared/API/Cocoa/WKRemoteObject.mm (158409 => 158410)
--- trunk/Source/WebKit2/Shared/API/Cocoa/WKRemoteObject.mm 2013-11-01 00:05:53 UTC (rev 158409)
+++ trunk/Source/WebKit2/Shared/API/Cocoa/WKRemoteObject.mm 2013-11-01 00:31:27 UTC (rev 158410)
@@ -26,12 +26,12 @@
#import "config.h"
#import "WKRemoteObject.h"
+#if WK_API_ENABLED
+
#import "WKRemoteObjectInterface.h"
#import <objc/runtime.h>
#import <wtf/RetainPtr.h>
-#if WK_API_ENABLED
-
@implementation WKRemoteObject {
RetainPtr<WKRemoteObjectRegistry> _objectRegistry;
RetainPtr<WKRemoteObjectInterface> _interface;
@@ -50,10 +50,7 @@
- (BOOL)conformsToProtocol:(Protocol *)protocol
{
- if ([super conformsToProtocol:protocol])
- return true;
-
- return protocol_conformsToProtocol([_interface protocol], protocol);
+ return [super conformsToProtocol:protocol] || protocol_conformsToProtocol([_interface protocol], protocol);
}
static const char* methodArgumentTypeEncodingForSelector(Protocol *protocol, SEL selector)
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
