Title: [168797] branches/safari-538.34-branch/Source/WebKit2
Diff
Modified: branches/safari-538.34-branch/Source/WebKit2/ChangeLog (168796 => 168797)
--- branches/safari-538.34-branch/Source/WebKit2/ChangeLog 2014-05-14 07:14:06 UTC (rev 168796)
+++ branches/safari-538.34-branch/Source/WebKit2/ChangeLog 2014-05-14 07:18:40 UTC (rev 168797)
@@ -1,5 +1,25 @@
2014-05-14 Lucas Forschler <[email protected]>
+ Merge r168563
+
+ 2014-05-09 Enrica Casucci <[email protected]>
+
+ REGRESSION (WebKit2): Tapping in search field at wikipedia.org doesn’t bring up the keyboard.
+ https://bugs.webkit.org/show_bug.cgi?id=132761
+ <rdar://problem/16857491>
+
+ Reviewed by Benjamin Poulain.
+
+ The interactionAssistant accessor should never create an instance of
+ UIWKTextInteractionAssistant, but simply return the value of _textInteractionAssistant.
+ The text interaction assistant should only be created when needed so that the rest of
+ the code could reliably check if we are interacting with text or not.
+
+ * UIProcess/ios/WKContentViewInteraction.mm:
+ (-[WKContentView interactionAssistant]):
+
+2014-05-14 Lucas Forschler <[email protected]>
+
Merge r168555
2014-05-09 Benjamin Poulain <[email protected]>
Modified: branches/safari-538.34-branch/Source/WebKit2/UIProcess/ios/WKContentViewInteraction.mm (168796 => 168797)
--- branches/safari-538.34-branch/Source/WebKit2/UIProcess/ios/WKContentViewInteraction.mm 2014-05-14 07:14:06 UTC (rev 168796)
+++ branches/safari-538.34-branch/Source/WebKit2/UIProcess/ios/WKContentViewInteraction.mm 2014-05-14 07:18:40 UTC (rev 168797)
@@ -1828,13 +1828,6 @@
- (UITextInteractionAssistant *)interactionAssistant
{
- // This method should only be called when we're in UIWebSelectionModeTextOnly however it is
- // possible that it can be called while we are transitioning between modes.
- // assert(!_webSelectionAssistant);
-
- if (!_textSelectionAssistant)
- _textSelectionAssistant = [[UIWKTextInteractionAssistant alloc] initWithView:self];
-
return _textSelectionAssistant.get();
}
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
