| 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 2246 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 2257 | 2257 |
| 2258 bool RenderViewImpl::isPointerLocked() { | 2258 bool RenderViewImpl::isPointerLocked() { |
| 2259 return mouse_lock_dispatcher_->IsMouseLockedTo( | 2259 return mouse_lock_dispatcher_->IsMouseLockedTo( |
| 2260 webwidget_mouse_lock_target_.get()); | 2260 webwidget_mouse_lock_target_.get()); |
| 2261 } | 2261 } |
| 2262 | 2262 |
| 2263 void RenderViewImpl::didActivateCompositor(int input_handler_identifier) { | 2263 void RenderViewImpl::didActivateCompositor(int input_handler_identifier) { |
| 2264 CompositorThread* compositor_thread = | 2264 CompositorThread* compositor_thread = |
| 2265 RenderThreadImpl::current()->compositor_thread(); | 2265 RenderThreadImpl::current()->compositor_thread(); |
| 2266 if (compositor_thread) | 2266 if (compositor_thread) |
| 2267 compositor_thread->AddInputHandler( | 2267 compositor_thread->AddHandlers( |
| 2268 routing_id_, input_handler_identifier, AsWeakPtr()); | 2268 routing_id_, input_handler_identifier, AsWeakPtr()); |
| 2269 | 2269 |
| 2270 RenderWidget::didActivateCompositor(input_handler_identifier); | 2270 RenderWidget::didActivateCompositor(input_handler_identifier); |
| 2271 } | 2271 } |
| 2272 | 2272 |
| 2273 // WebKit::WebFrameClient ----------------------------------------------------- | 2273 // WebKit::WebFrameClient ----------------------------------------------------- |
| 2274 | 2274 |
| 2275 WebPlugin* RenderViewImpl::createPlugin(WebFrame* frame, | 2275 WebPlugin* RenderViewImpl::createPlugin(WebFrame* frame, |
| 2276 const WebPluginParams& params) { | 2276 const WebPluginParams& params) { |
| 2277 WebPlugin* plugin = NULL; | 2277 WebPlugin* plugin = NULL; |
| (...skipping 3427 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 5705 bool RenderViewImpl::WebWidgetHandlesCompositorScheduling() const { | 5705 bool RenderViewImpl::WebWidgetHandlesCompositorScheduling() const { |
| 5706 return !!RenderThreadImpl::current()->compositor_thread(); | 5706 return !!RenderThreadImpl::current()->compositor_thread(); |
| 5707 } | 5707 } |
| 5708 | 5708 |
| 5709 void RenderViewImpl::OnJavaBridgeInit() { | 5709 void RenderViewImpl::OnJavaBridgeInit() { |
| 5710 DCHECK(!java_bridge_dispatcher_); | 5710 DCHECK(!java_bridge_dispatcher_); |
| 5711 #if defined(ENABLE_JAVA_BRIDGE) | 5711 #if defined(ENABLE_JAVA_BRIDGE) |
| 5712 java_bridge_dispatcher_ = new JavaBridgeDispatcher(this); | 5712 java_bridge_dispatcher_ = new JavaBridgeDispatcher(this); |
| 5713 #endif | 5713 #endif |
| 5714 } | 5714 } |
| OLD | NEW |