Title: [177710] trunk/Source/WebKit2
- Revision
- 177710
- Author
- [email protected]
- Date
- 2014-12-23 17:09:14 -0800 (Tue, 23 Dec 2014)
Log Message
Attempt to fix the iOS build.
* UIProcess/API/Cocoa/WKProcessGroup.mm:
(-[WKProcessGroup _geolocationProvider]):
* UIProcess/API/ios/WKViewIOS.mm:
(-[WKView _commonInitializationWithContextRef:pageGroupRef:relatedToPage:]):
Modified Paths
Diff
Modified: trunk/Source/WebKit2/ChangeLog (177709 => 177710)
--- trunk/Source/WebKit2/ChangeLog 2014-12-24 01:01:18 UTC (rev 177709)
+++ trunk/Source/WebKit2/ChangeLog 2014-12-24 01:09:14 UTC (rev 177710)
@@ -1,3 +1,12 @@
+2014-12-23 Sam Weinig <[email protected]>
+
+ Attempt to fix the iOS build.
+
+ * UIProcess/API/Cocoa/WKProcessGroup.mm:
+ (-[WKProcessGroup _geolocationProvider]):
+ * UIProcess/API/ios/WKViewIOS.mm:
+ (-[WKView _commonInitializationWithContextRef:pageGroupRef:relatedToPage:]):
+
2014-12-23 Anders Carlsson <[email protected]>
Handle coding object graphs in the UI process
Modified: trunk/Source/WebKit2/UIProcess/API/Cocoa/WKProcessGroup.mm (177709 => 177710)
--- trunk/Source/WebKit2/UIProcess/API/Cocoa/WKProcessGroup.mm 2014-12-24 01:01:18 UTC (rev 177709)
+++ trunk/Source/WebKit2/UIProcess/API/Cocoa/WKProcessGroup.mm 2014-12-24 01:09:14 UTC (rev 177710)
@@ -235,7 +235,7 @@
- (WKGeolocationProviderIOS *)_geolocationProvider
{
if (!_geolocationProvider)
- _geolocationProvider = adoptNS([[WKGeolocationProviderIOS alloc] initWithContext:_context.get()]);
+ _geolocationProvider = adoptNS([[WKGeolocationProviderIOS alloc] initWithProcessPool:_processPool.get()]);
return _geolocationProvider.get();
}
#endif // PLATFORM(IOS)
Modified: trunk/Source/WebKit2/UIProcess/API/ios/WKViewIOS.mm (177709 => 177710)
--- trunk/Source/WebKit2/UIProcess/API/ios/WKViewIOS.mm 2014-12-24 01:01:18 UTC (rev 177709)
+++ trunk/Source/WebKit2/UIProcess/API/ios/WKViewIOS.mm 2014-12-24 01:09:14 UTC (rev 177710)
@@ -30,12 +30,13 @@
#import "RemoteLayerTreeTransaction.h"
#import "ViewGestureController.h"
-#import "WebPageProxy.h"
+#import "WKAPICast.h"
#import "WKBrowsingContextGroupPrivate.h"
#import "WKContentView.h"
#import "WKProcessGroupPrivate.h"
#import "WKScrollView.h"
-#import "WKAPICast.h"
+#import "WebPageProxy.h"
+#import "WebProcessPool.h"
#import <UIKit/UIImage_Private.h>
#import <UIKit/UIPeripheralHost_Private.h>
#import <UIKit/UIScreen.h>
@@ -225,7 +226,7 @@
webPageConfiguration.pageGroup = toImpl(pageGroupRef);
webPageConfiguration.relatedPage = toImpl(relatedPage);
- _contentView = adoptNS([[WKContentView alloc] initWithFrame:bounds context:*toImpl(contextRef) configuration:WTF::move(webPageConfiguration) webView:nil]);
+ _contentView = adoptNS([[WKContentView alloc] initWithFrame:bounds processPool:*toImpl(contextRef) configuration:WTF::move(webPageConfiguration) webView:nil]);
[[_contentView layer] setAnchorPoint:CGPointZero];
[_contentView setFrame:bounds];
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
