Title: [92023] branches/safari-534.51-branch/Source/WebKit2
Diff
Modified: branches/safari-534.51-branch/Source/WebKit2/ChangeLog (92022 => 92023)
--- branches/safari-534.51-branch/Source/WebKit2/ChangeLog 2011-07-29 22:17:56 UTC (rev 92022)
+++ branches/safari-534.51-branch/Source/WebKit2/ChangeLog 2011-07-29 22:38:39 UTC (rev 92023)
@@ -1,5 +1,25 @@
2011-07-29 Lucas Forschler <[email protected]>
+ Merged 91964.
+
+ 2011-07-28 Tim Horton <[email protected]>
+
+ REGRESSION (5.1): CJK input broken after clicking on Flash content
+ <rdar://problem/9854447>
+ https://bugs.webkit.org/show_bug.cgi?id=65349
+
+ Reviewed by Darin Adler.
+
+ After giving Flash focus on a page and then navigating away from that page
+ using the back button, we were not getting notified to switch back to
+ inline (non-complex) input. Now, notify the page that it can leave complex
+ text mode when the plugin is destroyed.
+
+ * WebProcess/Plugins/PluginView.cpp:
+ (WebKit::PluginView::~PluginView):
+
+2011-07-29 Lucas Forschler <[email protected]>
+
Merged 91271.
2011-07-19 Brian Weinstein <[email protected]>
Modified: branches/safari-534.51-branch/Source/WebKit2/WebProcess/Plugins/PluginView.cpp (92022 => 92023)
--- branches/safari-534.51-branch/Source/WebKit2/WebProcess/Plugins/PluginView.cpp 2011-07-29 22:17:56 UTC (rev 92022)
+++ branches/safari-534.51-branch/Source/WebKit2/WebProcess/Plugins/PluginView.cpp 2011-07-29 22:38:39 UTC (rev 92023)
@@ -285,6 +285,9 @@
m_isBeingDestroyed = true;
m_plugin->destroy();
m_isBeingDestroyed = false;
+#if PLATFORM(MAC)
+ setComplexTextInputEnabled(false);
+#endif
}
// Invalidate the object map.
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
