Title: [152796] tags/Safari-537.51.1/Source/WebKit2
- Revision
- 152796
- Author
- [email protected]
- Date
- 2013-07-17 12:48:46 -0700 (Wed, 17 Jul 2013)
Log Message
Merged r152740. <rdar://problem/14300350>
Modified Paths
Diff
Modified: tags/Safari-537.51.1/Source/WebKit2/ChangeLog (152795 => 152796)
--- tags/Safari-537.51.1/Source/WebKit2/ChangeLog 2013-07-17 19:31:39 UTC (rev 152795)
+++ tags/Safari-537.51.1/Source/WebKit2/ChangeLog 2013-07-17 19:48:46 UTC (rev 152796)
@@ -1,3 +1,30 @@
+2013-07-17 Lucas Forschler <[email protected]>
+
+ Merge r152740
+
+ 2013-07-16 Alexey Proskuryakov <[email protected]>
+
+ REGRESSION (r150291): Chinese predictive input pop-up disappears on twitter.com
+ https://bugs.webkit.org/show_bug.cgi?id=118739
+ <rdar://problem/14300350>
+
+ Reviewed by Daniel Bates.
+
+ EditorState tracking on UI side is very fragile. This is a targeted fix just for
+ this specific scenario.
+
+ The issue was that we had a stale m_temporarilyClosedComposition flag, which was
+ making UI process believe that a composition was closed from WebProcess side,
+ and notify input method about that. It shouldn't have been a problem, because there
+ is no composition at this point indeed, but this extra call is a problem for
+ predictive input, which works in a somewhat unconventional way (<rdar://problem/14458297>).
+
+ * UIProcess/mac/WebPageProxyMac.mm:
+ (WebKit::WebPageProxy::insertText): Reset m_temporarilyClosedComposition flag when
+ getting new EditorState in response to performing this action. There is certainly
+ no composition after insertText, and all interested parties are on the same page
+ already.
+
2013-07-16 Lucas Forschler <[email protected]>
Rollout r152701
Modified: tags/Safari-537.51.1/Source/WebKit2/UIProcess/mac/WebPageProxyMac.mm (152795 => 152796)
--- tags/Safari-537.51.1/Source/WebKit2/UIProcess/mac/WebPageProxyMac.mm 2013-07-17 19:31:39 UTC (rev 152795)
+++ tags/Safari-537.51.1/Source/WebKit2/UIProcess/mac/WebPageProxyMac.mm 2013-07-17 19:48:46 UTC (rev 152796)
@@ -221,6 +221,8 @@
bool handled = true;
process()->sendSync(Messages::WebPage::InsertText(text, replacementRangeStart, replacementRangeEnd), Messages::WebPage::InsertText::Reply(handled, m_editorState), m_pageID);
+ m_temporarilyClosedComposition = false;
+
return handled;
}
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
