More build fixes.
authorandersca@apple.com <andersca@apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Fri, 8 Nov 2013 21:22:56 +0000 (21:22 +0000)
committerandersca@apple.com <andersca@apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Fri, 8 Nov 2013 21:22:56 +0000 (21:22 +0000)
* UIProcess/API/mac/WKConnection.h:
* UIProcess/API/mac/WKConnection.mm:
(didReceiveMessage):

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@158948 268f45cc-cd09-0410-ab3c-d52691b4dbfc

Source/WebKit2/ChangeLog
Source/WebKit2/UIProcess/API/mac/WKConnection.h
Source/WebKit2/UIProcess/API/mac/WKConnection.mm

index 049d663..026e174 100644 (file)
@@ -1,5 +1,13 @@
 2013-11-08  Anders Carlsson  <andersca@apple.com>
 
+        More build fixes.
+
+        * UIProcess/API/mac/WKConnection.h:
+        * UIProcess/API/mac/WKConnection.mm:
+        (didReceiveMessage):
+
+2013-11-08  Anders Carlsson  <andersca@apple.com>
+
         Try to fix the 32-bit build.
 
         * Shared/API/Cocoa/WKBrowsingContextHandleInternal.h:
index df898c7..8b1fa7f 100644 (file)
@@ -25,6 +25,7 @@
 
 #import <Foundation/Foundation.h>
 #import <WebKit2/WKDeclarationSpecifiers.h>
+#import <WebKit2/WKFoundation.h>
 
 @class WKConnection;
 @class WKConnectionData;
@@ -47,6 +48,10 @@ WK_EXPORT
 
 @property(assign) id <WKConnectionDelegate> delegate;
 
+#if WK_API_ENABLED
+
 @property (nonatomic, readonly) WKRemoteObjectRegistry *remoteObjectRegistry;
 
+#endif
+
 @end
index 8ebb8da..418ae6c 100644 (file)
@@ -46,7 +46,9 @@ using namespace WebKit;
     // Delegate for callbacks.
     id<WKConnectionDelegate> _delegate;
 
+#if WK_API_ENABLED
     RetainPtr<WKRemoteObjectRegistry> _remoteObjectRegistry;
+#endif
 }
 @end
 
@@ -81,6 +83,7 @@ using namespace WebKit;
     _data->_delegate = delegate;
 }
 
+#if WK_API_ENABLED
 - (WKRemoteObjectRegistry *)remoteObjectRegistry
 {
     if (!_data->_remoteObjectRegistry)
@@ -88,6 +91,7 @@ using namespace WebKit;
 
     return _data->_remoteObjectRegistry.get();
 }
+#endif
 
 @end
 
@@ -95,9 +99,11 @@ using namespace WebKit;
 
 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));