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 2230 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
2241 bool RenderViewImpl::isPointerLocked() { | 2241 bool RenderViewImpl::isPointerLocked() { |
2242 return mouse_lock_dispatcher_->IsMouseLockedTo( | 2242 return mouse_lock_dispatcher_->IsMouseLockedTo( |
2243 webwidget_mouse_lock_target_.get()); | 2243 webwidget_mouse_lock_target_.get()); |
2244 } | 2244 } |
2245 | 2245 |
2246 void RenderViewImpl::didActivateCompositor(int input_handler_identifier) { | 2246 void RenderViewImpl::didActivateCompositor(int input_handler_identifier) { |
2247 CompositorThread* compositor_thread = | 2247 CompositorThread* compositor_thread = |
2248 RenderThreadImpl::current()->compositor_thread(); | 2248 RenderThreadImpl::current()->compositor_thread(); |
2249 if (compositor_thread) | 2249 if (compositor_thread) |
2250 compositor_thread->AddInputHandler( | 2250 compositor_thread->AddInputHandler( |
2251 routing_id_, input_handler_identifier, AsWeakPtr()); | 2251 routing_id_, RenderThreadImpl::current()->GetChannel(), |
| 2252 input_handler_identifier, AsWeakPtr()); |
2252 | 2253 |
2253 RenderWidget::didActivateCompositor(input_handler_identifier); | 2254 RenderWidget::didActivateCompositor(input_handler_identifier); |
2254 } | 2255 } |
2255 | 2256 |
2256 // WebKit::WebFrameClient ----------------------------------------------------- | 2257 // WebKit::WebFrameClient ----------------------------------------------------- |
2257 | 2258 |
2258 WebPlugin* RenderViewImpl::createPlugin(WebFrame* frame, | 2259 WebPlugin* RenderViewImpl::createPlugin(WebFrame* frame, |
2259 const WebPluginParams& params) { | 2260 const WebPluginParams& params) { |
2260 WebPlugin* plugin = NULL; | 2261 WebPlugin* plugin = NULL; |
2261 if (content::GetContentClient()->renderer()->OverrideCreatePlugin( | 2262 if (content::GetContentClient()->renderer()->OverrideCreatePlugin( |
(...skipping 3345 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
5607 bool RenderViewImpl::WebWidgetHandlesCompositorScheduling() const { | 5608 bool RenderViewImpl::WebWidgetHandlesCompositorScheduling() const { |
5608 return !!RenderThreadImpl::current()->compositor_thread(); | 5609 return !!RenderThreadImpl::current()->compositor_thread(); |
5609 } | 5610 } |
5610 | 5611 |
5611 void RenderViewImpl::OnJavaBridgeInit() { | 5612 void RenderViewImpl::OnJavaBridgeInit() { |
5612 DCHECK(!java_bridge_dispatcher_); | 5613 DCHECK(!java_bridge_dispatcher_); |
5613 #if defined(ENABLE_JAVA_BRIDGE) | 5614 #if defined(ENABLE_JAVA_BRIDGE) |
5614 java_bridge_dispatcher_ = new JavaBridgeDispatcher(this); | 5615 java_bridge_dispatcher_ = new JavaBridgeDispatcher(this); |
5615 #endif | 5616 #endif |
5616 } | 5617 } |
OLD | NEW |