Title: [173009] branches/safari-600.1.4.11-branch/Source/WebKit2
- Revision
- 173009
- Author
- [email protected]
- Date
- 2014-08-27 11:55:09 -0700 (Wed, 27 Aug 2014)
Log Message
Merged r171782. <rdar://problem/17760073>
Modified Paths
Diff
Modified: branches/safari-600.1.4.11-branch/Source/WebKit2/ChangeLog (173008 => 173009)
--- branches/safari-600.1.4.11-branch/Source/WebKit2/ChangeLog 2014-08-27 17:12:45 UTC (rev 173008)
+++ branches/safari-600.1.4.11-branch/Source/WebKit2/ChangeLog 2014-08-27 18:55:09 UTC (rev 173009)
@@ -1,5 +1,22 @@
2014-08-27 Babak Shafiei <[email protected]>
+ Merge r171782.
+
+ 2014-07-29 Enrica Casucci <[email protected]>
+
+ REGRESSION [WebKit2 iOS]: Cannot add shortcut to user dictionary from non editable content.
+ https://bugs.webkit.org/show_bug.cgi?id=135392
+ <rdar://problem/17760073>
+
+ Reviewed by Benjamin Poulain.
+
+ Adding a shortcut to the user dictionary needs to be available in non editable content too.
+
+ * UIProcess/ios/WKContentViewInteraction.mm:
+ (-[WKContentView _addShortcut:]):
+
+2014-08-27 Babak Shafiei <[email protected]>
+
Merge r172989.
2014-08-26 Joseph Pecoraro <[email protected]>
Modified: branches/safari-600.1.4.11-branch/Source/WebKit2/UIProcess/ios/WKContentViewInteraction.mm (173008 => 173009)
--- branches/safari-600.1.4.11-branch/Source/WebKit2/UIProcess/ios/WKContentViewInteraction.mm 2014-08-27 17:12:45 UTC (rev 173008)
+++ branches/safari-600.1.4.11-branch/Source/WebKit2/UIProcess/ios/WKContentViewInteraction.mm 2014-08-27 18:55:09 UTC (rev 173009)
@@ -136,6 +136,10 @@
- (void)scheduleChineseTransliterationForText:(NSString *)text;
@end
+@interface UIWKSelectionAssistant (StagingToRemove)
+- (void)showTextServiceFor:(NSString *)selectedTerm fromRect:(CGRect)presentationRect;
+@end
+
@interface UIKeyboardImpl (StagingToRemove)
- (void)didHandleWebKeyEvent;
@end
@@ -1174,6 +1178,8 @@
{
if (_textSelectionAssistant && [_textSelectionAssistant respondsToSelector:@selector(showTextServiceFor:fromRect:)])
[_textSelectionAssistant showTextServiceFor:[self selectedText] fromRect:_page->editorState().selectionRects[0].rect()];
+ else if (_webSelectionAssistant && [_webSelectionAssistant respondsToSelector:@selector(showTextServiceFor:fromRect:)])
+ [_webSelectionAssistant showTextServiceFor:[self selectedText] fromRect:_page->editorState().selectionRects[0].rect()];
}
- (NSString *)selectedText
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
