Title: [163578] trunk/Source/WebKit2
- Revision
- 163578
- Author
- [email protected]
- Date
- 2014-02-06 16:51:18 -0800 (Thu, 06 Feb 2014)
Log Message
Fix build.
* UIProcess/API/Cocoa/WKWebView.mm:
(-[WKWebView _remoteObjectRegistry]):
Modified Paths
Diff
Modified: trunk/Source/WebKit2/ChangeLog (163577 => 163578)
--- trunk/Source/WebKit2/ChangeLog 2014-02-07 00:50:32 UTC (rev 163577)
+++ trunk/Source/WebKit2/ChangeLog 2014-02-07 00:51:18 UTC (rev 163578)
@@ -1,3 +1,10 @@
+2014-02-06 Anders Carlsson <[email protected]>
+
+ Fix build.
+
+ * UIProcess/API/Cocoa/WKWebView.mm:
+ (-[WKWebView _remoteObjectRegistry]):
+
2014-02-06 Benjamin Poulain <[email protected]>
Fix the setter definition from r163514.
Modified: trunk/Source/WebKit2/UIProcess/API/Cocoa/WKWebView.mm (163577 => 163578)
--- trunk/Source/WebKit2/UIProcess/API/Cocoa/WKWebView.mm 2014-02-07 00:50:32 UTC (rev 163577)
+++ trunk/Source/WebKit2/UIProcess/API/Cocoa/WKWebView.mm 2014-02-07 00:51:18 UTC (rev 163578)
@@ -29,14 +29,18 @@
#if WK_API_ENABLED
#import "NavigationState.h"
+#import "RemoteObjectRegistry.h"
+#import "RemoteObjectRegistryMessages.h"
#import "WKBackForwardListInternal.h"
#import "WKNavigationDelegate.h"
#import "WKNavigationInternal.h"
#import "WKProcessClass.h"
#import "WKRemoteObjectRegistryInternal.h"
#import "WKWebViewConfiguration.h"
+#import "WebContext.h"
#import "WebBackForwardList.h"
#import "WebPageProxy.h"
+#import "WebProcessProxy.h"
#import <WebKit2/RemoteLayerTreeTransaction.h>
#import <wtf/RetainPtr.h>
@@ -318,6 +322,8 @@
[_scrollView setContentOffset:contentOffset];
}
+#endif
+
#pragma mark OS X-specific methods
#if PLATFORM(MAC) && !PLATFORM(IOS)
@@ -336,7 +342,7 @@
- (WKRemoteObjectRegistry *)_remoteObjectRegistry
{
if (!_remoteObjectRegistry) {
- _remoteObjectRegistry = adoptNS([[WKRemoteObjectRegistry alloc] _initWithMessageSender:*_page]0;
+ _remoteObjectRegistry = adoptNS([[WKRemoteObjectRegistry alloc] _initWithMessageSender:*_page]);
_page->process().context().addMessageReceiver(Messages::RemoteObjectRegistry::messageReceiverName(), _page->pageID(), [_remoteObjectRegistry remoteObjectRegistry]);
}
@@ -362,8 +368,6 @@
#endif
-#endif
-
@end
#endif // WK_API_ENABLED
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
