OLD | NEW |
1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. |
2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
4 | 4 |
5 #include "content/renderer/render_view_impl.h" | 5 #include "content/renderer/render_view_impl.h" |
6 | 6 |
7 #include <algorithm> | 7 #include <algorithm> |
8 #include <cmath> | 8 #include <cmath> |
9 #include <string> | 9 #include <string> |
10 #include <vector> | 10 #include <vector> |
(...skipping 4286 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
4297 it != plugin_delegates_.end(); ++it) { | 4297 it != plugin_delegates_.end(); ++it) { |
4298 (*it)->ImeCompositionCompleted(text, focused_plugin_id_); | 4298 (*it)->ImeCompositionCompleted(text, focused_plugin_id_); |
4299 } | 4299 } |
4300 return; | 4300 return; |
4301 } | 4301 } |
4302 #endif | 4302 #endif |
4303 if (replacement_range.IsValid() && webview()) { | 4303 if (replacement_range.IsValid() && webview()) { |
4304 // Select the text in |replacement_range|, it will then be replaced by | 4304 // Select the text in |replacement_range|, it will then be replaced by |
4305 // text added by the call to RenderWidget::OnImeConfirmComposition(). | 4305 // text added by the call to RenderWidget::OnImeConfirmComposition(). |
4306 if (WebFrame* frame = webview()->focusedFrame()) { | 4306 if (WebFrame* frame = webview()->focusedFrame()) { |
4307 frame->setSelectionToRange( | 4307 WebRange webrange = WebRange::fromDocumentRange( |
4308 WebRange::fromDocumentRange(frame, | 4308 frame, replacement_range.start(), replacement_range.length()); |
4309 replacement_range.start(), | 4309 if (!webrange.isNull()) |
4310 replacement_range.length())); | 4310 frame->setSelectionToRange(webrange); |
4311 } | 4311 } |
4312 } | 4312 } |
4313 RenderWidget::OnImeConfirmComposition(text, replacement_range); | 4313 RenderWidget::OnImeConfirmComposition(text, replacement_range); |
4314 } | 4314 } |
4315 } | 4315 } |
4316 | 4316 |
4317 ui::TextInputType RenderViewImpl::GetTextInputType() { | 4317 ui::TextInputType RenderViewImpl::GetTextInputType() { |
4318 return pepper_delegate_.IsPluginFocused() ? | 4318 return pepper_delegate_.IsPluginFocused() ? |
4319 pepper_delegate_.GetTextInputType() : RenderWidget::GetTextInputType(); | 4319 pepper_delegate_.GetTextInputType() : RenderWidget::GetTextInputType(); |
4320 } | 4320 } |
(...skipping 351 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
4672 return webview()->settings()->useThreadedCompositor(); | 4672 return webview()->settings()->useThreadedCompositor(); |
4673 } | 4673 } |
4674 | 4674 |
4675 void RenderViewImpl::OnJavaBridgeInit( | 4675 void RenderViewImpl::OnJavaBridgeInit( |
4676 const IPC::ChannelHandle& channel_handle) { | 4676 const IPC::ChannelHandle& channel_handle) { |
4677 DCHECK(!java_bridge_dispatcher_.get()); | 4677 DCHECK(!java_bridge_dispatcher_.get()); |
4678 #if defined(ENABLE_JAVA_BRIDGE) | 4678 #if defined(ENABLE_JAVA_BRIDGE) |
4679 java_bridge_dispatcher_.reset(new JavaBridgeDispatcher(this, channel_handle)); | 4679 java_bridge_dispatcher_.reset(new JavaBridgeDispatcher(this, channel_handle)); |
4680 #endif | 4680 #endif |
4681 } | 4681 } |
OLD | NEW |