| 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 5346 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 5357 Send(new ViewHostMsg_ImeCancelComposition(routing_id())); | 5357 Send(new ViewHostMsg_ImeCancelComposition(routing_id())); |
| 5358 const ui::Range range(ui::Range::InvalidRange()); | 5358 const ui::Range range(ui::Range::InvalidRange()); |
| 5359 const std::vector<gfx::Rect> empty_bounds; | 5359 const std::vector<gfx::Rect> empty_bounds; |
| 5360 UpdateCompositionInfo(range, empty_bounds); | 5360 UpdateCompositionInfo(range, empty_bounds); |
| 5361 } | 5361 } |
| 5362 | 5362 |
| 5363 void RenderViewImpl::PpapiPluginSelectionChanged() { | 5363 void RenderViewImpl::PpapiPluginSelectionChanged() { |
| 5364 SyncSelectionIfRequired(); | 5364 SyncSelectionIfRequired(); |
| 5365 } | 5365 } |
| 5366 | 5366 |
| 5367 void RenderViewImpl::PpapiPluginCreated(ppapi::host::PpapiHost* host) { | 5367 void RenderViewImpl::PpapiPluginCreated(content::RendererPpapiHost* host) { |
| 5368 FOR_EACH_OBSERVER(RenderViewObserver, observers_, | 5368 FOR_EACH_OBSERVER(RenderViewObserver, observers_, |
| 5369 DidCreatePepperPlugin(host)); | 5369 DidCreatePepperPlugin(host)); |
| 5370 } | 5370 } |
| 5371 | 5371 |
| 5372 void RenderViewImpl::OnImeSetComposition( | 5372 void RenderViewImpl::OnImeSetComposition( |
| 5373 const string16& text, | 5373 const string16& text, |
| 5374 const std::vector<WebKit::WebCompositionUnderline>& underlines, | 5374 const std::vector<WebKit::WebCompositionUnderline>& underlines, |
| 5375 int selection_start, | 5375 int selection_start, |
| 5376 int selection_end) { | 5376 int selection_end) { |
| 5377 if (pepper_delegate_.IsPluginFocused()) { | 5377 if (pepper_delegate_.IsPluginFocused()) { |
| (...skipping 406 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 5784 bool RenderViewImpl::WebWidgetHandlesCompositorScheduling() const { | 5784 bool RenderViewImpl::WebWidgetHandlesCompositorScheduling() const { |
| 5785 return !!RenderThreadImpl::current()->compositor_thread(); | 5785 return !!RenderThreadImpl::current()->compositor_thread(); |
| 5786 } | 5786 } |
| 5787 | 5787 |
| 5788 void RenderViewImpl::OnJavaBridgeInit() { | 5788 void RenderViewImpl::OnJavaBridgeInit() { |
| 5789 DCHECK(!java_bridge_dispatcher_); | 5789 DCHECK(!java_bridge_dispatcher_); |
| 5790 #if defined(ENABLE_JAVA_BRIDGE) | 5790 #if defined(ENABLE_JAVA_BRIDGE) |
| 5791 java_bridge_dispatcher_ = new JavaBridgeDispatcher(this); | 5791 java_bridge_dispatcher_ = new JavaBridgeDispatcher(this); |
| 5792 #endif | 5792 #endif |
| 5793 } | 5793 } |
| OLD | NEW |