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_widget.h" | 5 #include "content/renderer/render_widget.h" |
6 | 6 |
7 #include <memory> | 7 #include <memory> |
8 #include <utility> | 8 #include <utility> |
9 | 9 |
10 #include "base/auto_reset.h" | 10 #include "base/auto_reset.h" |
(...skipping 688 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
699 const gfx::Vector2dF& outer_delta, | 699 const gfx::Vector2dF& outer_delta, |
700 const gfx::Vector2dF& elastic_overscroll_delta, | 700 const gfx::Vector2dF& elastic_overscroll_delta, |
701 float page_scale, | 701 float page_scale, |
702 float top_controls_delta) { | 702 float top_controls_delta) { |
703 webwidget_->applyViewportDeltas(inner_delta, outer_delta, | 703 webwidget_->applyViewportDeltas(inner_delta, outer_delta, |
704 elastic_overscroll_delta, page_scale, | 704 elastic_overscroll_delta, page_scale, |
705 top_controls_delta); | 705 top_controls_delta); |
706 } | 706 } |
707 | 707 |
708 void RenderWidget::BeginMainFrame(double frame_time_sec) { | 708 void RenderWidget::BeginMainFrame(double frame_time_sec) { |
| 709 RenderThreadImpl* render_thread = RenderThreadImpl::current(); |
| 710 // render_thread may be NULL in tests. |
| 711 InputHandlerManager* input_handler_manager = |
| 712 render_thread ? render_thread->input_handler_manager() : NULL; |
| 713 if (input_handler_manager) |
| 714 input_handler_manager->ProcessVSyncAlignedInputOnMainThread(routing_id_); |
| 715 |
709 webwidget_->beginFrame(frame_time_sec); | 716 webwidget_->beginFrame(frame_time_sec); |
710 } | 717 } |
711 | 718 |
712 std::unique_ptr<cc::OutputSurface> RenderWidget::CreateOutputSurface( | 719 std::unique_ptr<cc::OutputSurface> RenderWidget::CreateOutputSurface( |
713 bool fallback) { | 720 bool fallback) { |
714 DCHECK(webwidget_); | 721 DCHECK(webwidget_); |
715 // For widgets that are never visible, we don't start the compositor, so we | 722 // For widgets that are never visible, we don't start the compositor, so we |
716 // never get a request for a cc::OutputSurface. | 723 // never get a request for a cc::OutputSurface. |
717 DCHECK(!compositor_never_visible_); | 724 DCHECK(!compositor_never_visible_); |
718 return RenderThreadImpl::current()->CreateCompositorOutputSurface( | 725 return RenderThreadImpl::current()->CreateCompositorOutputSurface( |
(...skipping 1258 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1977 void RenderWidget::requestPointerUnlock() { | 1984 void RenderWidget::requestPointerUnlock() { |
1978 mouse_lock_dispatcher_->UnlockMouse(webwidget_mouse_lock_target_.get()); | 1985 mouse_lock_dispatcher_->UnlockMouse(webwidget_mouse_lock_target_.get()); |
1979 } | 1986 } |
1980 | 1987 |
1981 bool RenderWidget::isPointerLocked() { | 1988 bool RenderWidget::isPointerLocked() { |
1982 return mouse_lock_dispatcher_->IsMouseLockedTo( | 1989 return mouse_lock_dispatcher_->IsMouseLockedTo( |
1983 webwidget_mouse_lock_target_.get()); | 1990 webwidget_mouse_lock_target_.get()); |
1984 } | 1991 } |
1985 | 1992 |
1986 } // namespace content | 1993 } // namespace content |
OLD | NEW |