| OLD | NEW |
| 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2012 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 5275 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 5286 Send(new ViewHostMsg_ImeCancelComposition(routing_id())); | 5286 Send(new ViewHostMsg_ImeCancelComposition(routing_id())); |
| 5287 const ui::Range range(ui::Range::InvalidRange()); | 5287 const ui::Range range(ui::Range::InvalidRange()); |
| 5288 const std::vector<gfx::Rect> empty_bounds; | 5288 const std::vector<gfx::Rect> empty_bounds; |
| 5289 UpdateCompositionInfo(range, empty_bounds); | 5289 UpdateCompositionInfo(range, empty_bounds); |
| 5290 } | 5290 } |
| 5291 | 5291 |
| 5292 void RenderViewImpl::PpapiPluginSelectionChanged() { | 5292 void RenderViewImpl::PpapiPluginSelectionChanged() { |
| 5293 SyncSelectionIfRequired(); | 5293 SyncSelectionIfRequired(); |
| 5294 } | 5294 } |
| 5295 | 5295 |
| 5296 void RenderViewImpl::PpapiPluginCreated(ppapi::host::PpapiHost* host) { |
| 5297 FOR_EACH_OBSERVER(RenderViewObserver, observers_, |
| 5298 DidCreatePepperPlugin(host)); |
| 5299 } |
| 5300 |
| 5296 void RenderViewImpl::OnImeSetComposition( | 5301 void RenderViewImpl::OnImeSetComposition( |
| 5297 const string16& text, | 5302 const string16& text, |
| 5298 const std::vector<WebKit::WebCompositionUnderline>& underlines, | 5303 const std::vector<WebKit::WebCompositionUnderline>& underlines, |
| 5299 int selection_start, | 5304 int selection_start, |
| 5300 int selection_end) { | 5305 int selection_end) { |
| 5301 if (pepper_delegate_.IsPluginFocused()) { | 5306 if (pepper_delegate_.IsPluginFocused()) { |
| 5302 // When a PPAPI plugin has focus, we bypass WebKit. | 5307 // When a PPAPI plugin has focus, we bypass WebKit. |
| 5303 pepper_delegate_.OnImeSetComposition(text, | 5308 pepper_delegate_.OnImeSetComposition(text, |
| 5304 underlines, | 5309 underlines, |
| 5305 selection_start, | 5310 selection_start, |
| (...skipping 395 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 5701 bool RenderViewImpl::WebWidgetHandlesCompositorScheduling() const { | 5706 bool RenderViewImpl::WebWidgetHandlesCompositorScheduling() const { |
| 5702 return !!RenderThreadImpl::current()->compositor_thread(); | 5707 return !!RenderThreadImpl::current()->compositor_thread(); |
| 5703 } | 5708 } |
| 5704 | 5709 |
| 5705 void RenderViewImpl::OnJavaBridgeInit() { | 5710 void RenderViewImpl::OnJavaBridgeInit() { |
| 5706 DCHECK(!java_bridge_dispatcher_); | 5711 DCHECK(!java_bridge_dispatcher_); |
| 5707 #if defined(ENABLE_JAVA_BRIDGE) | 5712 #if defined(ENABLE_JAVA_BRIDGE) |
| 5708 java_bridge_dispatcher_ = new JavaBridgeDispatcher(this); | 5713 java_bridge_dispatcher_ = new JavaBridgeDispatcher(this); |
| 5709 #endif | 5714 #endif |
| 5710 } | 5715 } |
| OLD | NEW |