Title: [168654] trunk/Source/WebKit2
- Revision
- 168654
- Author
- a...@apple.com
- Date
- 2014-05-12 16:17:46 -0700 (Mon, 12 May 2014)
Log Message
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.
Modified Paths
Diff
Modified: trunk/Source/WebKit2/ChangeLog (168653 => 168654)
--- trunk/Source/WebKit2/ChangeLog 2014-05-12 23:02:59 UTC (rev 168653)
+++ trunk/Source/WebKit2/ChangeLog 2014-05-12 23:17:46 UTC (rev 168654)
@@ -1,3 +1,14 @@
+2014-05-12 Alexey Proskuryakov <a...@apple.com>
+
+ 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-12 Chris Fleizach <cfleiz...@apple.com>
AX: .js dialogs shown in unload while AX is running crash WebKit.
Modified: trunk/Source/WebKit2/UIProcess/API/mac/WKView.mm (168653 => 168654)
--- trunk/Source/WebKit2/UIProcess/API/mac/WKView.mm 2014-05-12 23:02:59 UTC (rev 168653)
+++ trunk/Source/WebKit2/UIProcess/API/mac/WKView.mm 2014-05-12 23:17:46 UTC (rev 168654)
@@ -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
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
