Title: [158948] trunk/Source/WebKit2
- Revision
- 158948
- Author
- [email protected]
- Date
- 2013-11-08 13:22:56 -0800 (Fri, 08 Nov 2013)
Log Message
More build fixes.
* UIProcess/API/mac/WKConnection.h:
* UIProcess/API/mac/WKConnection.mm:
(didReceiveMessage):
Modified Paths
Diff
Modified: trunk/Source/WebKit2/ChangeLog (158947 => 158948)
--- trunk/Source/WebKit2/ChangeLog 2013-11-08 21:19:19 UTC (rev 158947)
+++ trunk/Source/WebKit2/ChangeLog 2013-11-08 21:22:56 UTC (rev 158948)
@@ -1,5 +1,13 @@
2013-11-08 Anders Carlsson <[email protected]>
+ More build fixes.
+
+ * UIProcess/API/mac/WKConnection.h:
+ * UIProcess/API/mac/WKConnection.mm:
+ (didReceiveMessage):
+
+2013-11-08 Anders Carlsson <[email protected]>
+
Try to fix the 32-bit build.
* Shared/API/Cocoa/WKBrowsingContextHandleInternal.h:
Modified: trunk/Source/WebKit2/UIProcess/API/mac/WKConnection.h (158947 => 158948)
--- trunk/Source/WebKit2/UIProcess/API/mac/WKConnection.h 2013-11-08 21:19:19 UTC (rev 158947)
+++ trunk/Source/WebKit2/UIProcess/API/mac/WKConnection.h 2013-11-08 21:22:56 UTC (rev 158948)
@@ -25,6 +25,7 @@
#import <Foundation/Foundation.h>
#import <WebKit2/WKDeclarationSpecifiers.h>
+#import <WebKit2/WKFoundation.h>
@class WKConnection;
@class WKConnectionData;
@@ -47,6 +48,10 @@
@property(assign) id <WKConnectionDelegate> delegate;
+#if WK_API_ENABLED
+
@property (nonatomic, readonly) WKRemoteObjectRegistry *remoteObjectRegistry;
+#endif
+
@end
Modified: trunk/Source/WebKit2/UIProcess/API/mac/WKConnection.mm (158947 => 158948)
--- trunk/Source/WebKit2/UIProcess/API/mac/WKConnection.mm 2013-11-08 21:19:19 UTC (rev 158947)
+++ trunk/Source/WebKit2/UIProcess/API/mac/WKConnection.mm 2013-11-08 21:22:56 UTC (rev 158948)
@@ -46,7 +46,9 @@
// Delegate for callbacks.
id<WKConnectionDelegate> _delegate;
+#if WK_API_ENABLED
RetainPtr<WKRemoteObjectRegistry> _remoteObjectRegistry;
+#endif
}
@end
@@ -81,6 +83,7 @@
_data->_delegate = delegate;
}
+#if WK_API_ENABLED
- (WKRemoteObjectRegistry *)remoteObjectRegistry
{
if (!_data->_remoteObjectRegistry)
@@ -88,6 +91,7 @@
return _data->_remoteObjectRegistry.get();
}
+#endif
@end
@@ -95,9 +99,11 @@
static void didReceiveMessage(WKConnectionRef, WKStringRef messageName, WKTypeRef messageBody, const void* clientInfo)
{
+#if WK_API_ENABLED
WKConnection *connection = (WKConnection *)clientInfo;
if ([connection->_data->_remoteObjectRegistry _handleMessageWithName:messageName body:messageBody])
return;
+#endif
if ([connection.delegate respondsToSelector:@selector(connection:didReceiveMessageWithName:body:)]) {
RetainPtr<CFStringRef> nsMessageName = adoptCF(WKStringCopyCFString(kCFAllocatorDefault, messageName));
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
