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 | 9 |
10 #include "base/bind.h" | 10 #include "base/bind.h" |
(...skipping 2476 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
2487 void RenderViewImpl::requestPointerUnlock() { | 2487 void RenderViewImpl::requestPointerUnlock() { |
2488 mouse_lock_dispatcher_->UnlockMouse(webwidget_mouse_lock_target_.get()); | 2488 mouse_lock_dispatcher_->UnlockMouse(webwidget_mouse_lock_target_.get()); |
2489 } | 2489 } |
2490 | 2490 |
2491 bool RenderViewImpl::isPointerLocked() { | 2491 bool RenderViewImpl::isPointerLocked() { |
2492 return mouse_lock_dispatcher_->IsMouseLockedTo( | 2492 return mouse_lock_dispatcher_->IsMouseLockedTo( |
2493 webwidget_mouse_lock_target_.get()); | 2493 webwidget_mouse_lock_target_.get()); |
2494 } | 2494 } |
2495 | 2495 |
2496 void RenderViewImpl::didActivateCompositor(int input_handler_identifier) { | 2496 void RenderViewImpl::didActivateCompositor(int input_handler_identifier) { |
| 2497 #if !defined(OS_WIN) // http://crbug.com/160122 |
2497 CompositorThread* compositor_thread = | 2498 CompositorThread* compositor_thread = |
2498 RenderThreadImpl::current()->compositor_thread(); | 2499 RenderThreadImpl::current()->compositor_thread(); |
2499 if (compositor_thread) | 2500 if (compositor_thread) |
2500 compositor_thread->AddInputHandler( | 2501 compositor_thread->AddInputHandler( |
2501 routing_id_, input_handler_identifier, AsWeakPtr()); | 2502 routing_id_, input_handler_identifier, AsWeakPtr()); |
| 2503 #endif |
2502 | 2504 |
2503 RenderWidget::didActivateCompositor(input_handler_identifier); | 2505 RenderWidget::didActivateCompositor(input_handler_identifier); |
2504 | 2506 |
2505 ProcessAcceleratedPinchZoomFlags(*CommandLine::ForCurrentProcess()); | 2507 ProcessAcceleratedPinchZoomFlags(*CommandLine::ForCurrentProcess()); |
2506 } | 2508 } |
2507 | 2509 |
2508 // WebKit::WebFrameClient ----------------------------------------------------- | 2510 // WebKit::WebFrameClient ----------------------------------------------------- |
2509 | 2511 |
2510 WebPlugin* RenderViewImpl::createPlugin(WebFrame* frame, | 2512 WebPlugin* RenderViewImpl::createPlugin(WebFrame* frame, |
2511 const WebPluginParams& params) { | 2513 const WebPluginParams& params) { |
(...skipping 4003 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
6515 } | 6517 } |
6516 #endif | 6518 #endif |
6517 | 6519 |
6518 void RenderViewImpl::OnReleaseDisambiguationPopupDIB( | 6520 void RenderViewImpl::OnReleaseDisambiguationPopupDIB( |
6519 TransportDIB::Handle dib_handle) { | 6521 TransportDIB::Handle dib_handle) { |
6520 TransportDIB* dib = TransportDIB::CreateWithHandle(dib_handle); | 6522 TransportDIB* dib = TransportDIB::CreateWithHandle(dib_handle); |
6521 RenderProcess::current()->ReleaseTransportDIB(dib); | 6523 RenderProcess::current()->ReleaseTransportDIB(dib); |
6522 } | 6524 } |
6523 | 6525 |
6524 } // namespace content | 6526 } // namespace content |
OLD | NEW |