Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(2065)

Unified Diff: content/renderer/render_view_impl.cc

Issue 8227018: mac: Almost fix Lion accented character bubble input in web contents. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: whoopsies Created 9 years, 2 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: content/renderer/render_view_impl.cc
diff --git a/content/renderer/render_view_impl.cc b/content/renderer/render_view_impl.cc
index 03a66155f38cb0d1376f413869ec603f4d60ab30..d58f4169f136855c97c1245ab2b9c40d5a02e4b2 100644
--- a/content/renderer/render_view_impl.cc
+++ b/content/renderer/render_view_impl.cc
@@ -4186,7 +4186,8 @@ void RenderViewImpl::OnImeSetComposition(
}
}
-void RenderViewImpl::OnImeConfirmComposition(const string16& text) {
+void RenderViewImpl::OnImeConfirmComposition(
+ const string16& text, const ui::Range& replacement_range) {
if (pepper_delegate_.IsPluginFocused()) {
// TODO(kinaba) Until PPAPI has an interface for handling IME events, we
// send character events.
@@ -4207,6 +4208,7 @@ void RenderViewImpl::OnImeConfirmComposition(const string16& text) {
// Same as OnImeSetComposition(), we send the text from IMEs directly to
// plug-ins. When we send IME text directly to plug-ins, we should not send
// it to WebKit to prevent WebKit from controlling IMEs.
+ // TODO(thakis): Honor |replacement_range| for plugins?
if (focused_plugin_id_ >= 0) {
std::set<WebPluginDelegateProxy*>::iterator it;
for (it = plugin_delegates_.begin();
@@ -4216,7 +4218,7 @@ void RenderViewImpl::OnImeConfirmComposition(const string16& text) {
return;
}
#endif
- RenderWidget::OnImeConfirmComposition(text);
+ RenderWidget::OnImeConfirmComposition(text, replacement_range);
}
}

Powered by Google App Engine
This is Rietveld 408576698