Title: [176380] branches/safari-600.3-branch/Source/WebKit2
- Revision
- 176380
- Author
- [email protected]
- Date
- 2014-11-19 20:40:02 -0800 (Wed, 19 Nov 2014)
Log Message
Merge r176374. rdar://problem/18840128
Modified Paths
Diff
Modified: branches/safari-600.3-branch/Source/WebKit2/ChangeLog (176379 => 176380)
--- branches/safari-600.3-branch/Source/WebKit2/ChangeLog 2014-11-20 04:37:27 UTC (rev 176379)
+++ branches/safari-600.3-branch/Source/WebKit2/ChangeLog 2014-11-20 04:40:02 UTC (rev 176380)
@@ -4,6 +4,18 @@
2014-11-19 Timothy Horton <[email protected]>
+ Try to fix the iOS build
+
+ * WebProcess/WebPage/ios/WebPageIOS.mm:
+ (WebKit::WebPage::performDictionaryLookupForSelection):
+ (WebKit::WebPage::performDictionaryLookupForRange):
+
+2014-11-19 Dana Burkart <[email protected]>
+
+ Merge r176370. rdar://problem/18840128
+
+ 2014-11-19 Timothy Horton <[email protected]>
+
Fix the 32-bit build
* UIProcess/mac/TextIndicatorWindow.mm:
Modified: branches/safari-600.3-branch/Source/WebKit2/WebProcess/WebPage/ios/WebPageIOS.mm (176379 => 176380)
--- branches/safari-600.3-branch/Source/WebKit2/WebProcess/WebPage/ios/WebPageIOS.mm 2014-11-20 04:37:27 UTC (rev 176379)
+++ branches/safari-600.3-branch/Source/WebKit2/WebProcess/WebPage/ios/WebPageIOS.mm 2014-11-20 04:40:02 UTC (rev 176380)
@@ -294,12 +294,12 @@
notImplemented();
}
-void WebPage::performDictionaryLookupForSelection(Frame*, const VisibleSelection&)
+void WebPage::performDictionaryLookupForSelection(Frame*, const VisibleSelection&, TextIndicator::PresentationTransition)
{
notImplemented();
}
-void WebPage::performDictionaryLookupForRange(Frame*, Range&, NSDictionary *)
+void WebPage::performDictionaryLookupForRange(Frame*, Range&, NSDictionary *, TextIndicator::PresentationTransition)
{
notImplemented();
}
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
