Title: [168757] branches/safari-538.34-branch/Source/WebKit2
Diff
Modified: branches/safari-538.34-branch/Source/WebKit2/ChangeLog (168756 => 168757)
--- branches/safari-538.34-branch/Source/WebKit2/ChangeLog 2014-05-13 23:56:32 UTC (rev 168756)
+++ branches/safari-538.34-branch/Source/WebKit2/ChangeLog 2014-05-13 23:59:00 UTC (rev 168757)
@@ -1,5 +1,20 @@
2014-05-13 Lucas Forschler <[email protected]>
+ Merge r168654
+
+ 2014-05-12 Alexey Proskuryakov <[email protected]>
+
+ REGRESSION (r165972): Can't type into text fields in Flash
+ https://bugs.webkit.org/show_bug.cgi?id=132840
+ <rdar://problem/16671969>
+
+ Reviewed by Anders Carlsson.
+
+ * UIProcess/API/mac/WKView.mm: (-[WKView inputContext]): Restore a function that
+ got accidentally lost when adding async text input code.
+
+2014-05-13 Lucas Forschler <[email protected]>
+
Merge r168439
2014-05-07 Jeremy Jones <[email protected]>
Modified: branches/safari-538.34-branch/Source/WebKit2/UIProcess/API/mac/WKView.mm (168756 => 168757)
--- branches/safari-538.34-branch/Source/WebKit2/UIProcess/API/mac/WKView.mm 2014-05-13 23:56:32 UTC (rev 168756)
+++ branches/safari-538.34-branch/Source/WebKit2/UIProcess/API/mac/WKView.mm 2014-05-13 23:59:00 UTC (rev 168757)
@@ -1898,6 +1898,20 @@
parameters->eventInterpretationHadSideEffects |= eventHandled;
}
+- (NSTextInputContext *)inputContext
+{
+ WKViewInterpretKeyEventsParameters* parameters = _data->_interpretKeyEventsParameters;
+
+ if (_data->_pluginComplexTextInputIdentifier && !parameters)
+ return [[WKTextInputWindowController sharedTextInputWindowController] inputContext];
+
+ // Disable text input machinery when in non-editable content. An invisible inline input area affects performance, and can prevent Expose from working.
+ if (!_data->_page->editorState().isContentEditable)
+ return nil;
+
+ return [super inputContext];
+}
+
- (NSRange)selectedRange
{
[self _executeSavedKeypressCommands];
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
