Modified: trunk/Source/WebKit2/ChangeLog (159903 => 159904)
--- trunk/Source/WebKit2/ChangeLog 2013-12-02 00:50:16 UTC (rev 159903)
+++ trunk/Source/WebKit2/ChangeLog 2013-12-02 01:04:19 UTC (rev 159904)
@@ -1,5 +1,13 @@
2013-12-01 Sam Weinig <[email protected]>
+ Fix the iOS build.
+
+ * UIProcess/API/ios/WKContentView.mm:
+ * UIProcess/API/ios/WKInteractionView.mm:
+ * UIProcess/ios/WebPageProxyIOS.mm:
+
+2013-12-01 Sam Weinig <[email protected]>
+
[CTTE] The WebPageProxy's WebProcessProxy is never null so it should be stored in a Ref
https://bugs.webkit.org/show_bug.cgi?id=125047
Modified: trunk/Source/WebKit2/UIProcess/API/ios/WKContentView.mm (159903 => 159904)
--- trunk/Source/WebKit2/UIProcess/API/ios/WKContentView.mm 2013-12-02 00:50:16 UTC (rev 159903)
+++ trunk/Source/WebKit2/UIProcess/API/ios/WKContentView.mm 2013-12-02 01:04:19 UTC (rev 159904)
@@ -257,7 +257,7 @@
- (void)_decidePolicyForGeolocationRequestFromOrigin:(WebSecurityOrigin&)origin frame:(WebFrameProxy&)frame request:(GeolocationPermissionRequestProxy&)permissionRequest
{
- [[wrapper(*_page->process()->context()) _geolocationProvider] decidePolicyForGeolocationRequestFromOrigin:toAPI(&origin) frame:toAPI(&frame) request:toAPI(&permissionRequest) window:[self window]];
+ [[wrapper(_page->process().context()) _geolocationProvider] decidePolicyForGeolocationRequestFromOrigin:toAPI(&origin) frame:toAPI(&frame) request:toAPI(&permissionRequest) window:[self window]];
}
@end
Modified: trunk/Source/WebKit2/UIProcess/API/ios/WKInteractionView.mm (159903 => 159904)
--- trunk/Source/WebKit2/UIProcess/API/ios/WKInteractionView.mm 2013-12-02 00:50:16 UTC (rev 159903)
+++ trunk/Source/WebKit2/UIProcess/API/ios/WKInteractionView.mm 2013-12-02 01:04:19 UTC (rev 159904)
@@ -382,7 +382,7 @@
if (![self isFirstResponder])
[self becomeFirstResponder];
- _page->process()->send(Messages::WebPage::HandleTap(IntPoint(location)), _page->pageID());
+ _page->process().send(Messages::WebPage::HandleTap(IntPoint(location)), _page->pageID());
}
- (UIView *)inputAccessoryView
Modified: trunk/Source/WebKit2/UIProcess/ios/WebPageProxyIOS.mm (159903 => 159904)
--- trunk/Source/WebKit2/UIProcess/ios/WebPageProxyIOS.mm 2013-12-02 00:50:16 UTC (rev 159903)
+++ trunk/Source/WebKit2/UIProcess/ios/WebPageProxyIOS.mm 2013-12-02 01:04:19 UTC (rev 159904)
@@ -103,7 +103,7 @@
return true;
bool handled = true;
- process()->sendSync(Messages::WebPage::InsertText(text, replacementRangeStart, replacementRangeEnd), Messages::WebPage::InsertText::Reply(handled, m_editorState), m_pageID);
+ process().sendSync(Messages::WebPage::InsertText(text, replacementRangeStart, replacementRangeEnd), Messages::WebPage::InsertText::Reply(handled, m_editorState), m_pageID);
return handled;
}
@@ -333,12 +333,12 @@
void WebPageProxy::didFinishScrolling(const WebCore::FloatPoint& contentOffset)
{
- process()->send(Messages::WebPage::DidFinishScrolling(contentOffset), m_pageID);
+ process().send(Messages::WebPage::DidFinishScrolling(contentOffset), m_pageID);
}
void WebPageProxy::didFinishZooming(float newScale)
{
- process()->send(Messages::WebPage::DidFinishZooming(newScale), m_pageID);
+ process().send(Messages::WebPage::DidFinishZooming(newScale), m_pageID);
}
void WebPageProxy::tapHighlightAtPosition(const WebCore::FloatPoint& position, uint64_t& requestID)
@@ -346,12 +346,12 @@
static uint64_t uniqueRequestID = 0;
requestID = ++uniqueRequestID;
- process()->send(Messages::WebPage::TapHighlightAtPosition(requestID, position), m_pageID);
+ process().send(Messages::WebPage::TapHighlightAtPosition(requestID, position), m_pageID);
}
void WebPageProxy::blurAssistedNode()
{
- process()->send(Messages::WebPage::BlurAssistedNode(), m_pageID);
+ process().send(Messages::WebPage::BlurAssistedNode(), m_pageID);
}
void WebPageProxy::mainDocumentDidReceiveMobileDocType()
