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 846 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
857 const gfx::Vector2dF& inner_delta, | 857 const gfx::Vector2dF& inner_delta, |
858 const gfx::Vector2dF& outer_delta, | 858 const gfx::Vector2dF& outer_delta, |
859 const gfx::Vector2dF& elastic_overscroll_delta, | 859 const gfx::Vector2dF& elastic_overscroll_delta, |
860 float page_scale, | 860 float page_scale, |
861 float top_controls_delta) { | 861 float top_controls_delta) { |
862 GetWebWidget()->applyViewportDeltas(inner_delta, outer_delta, | 862 GetWebWidget()->applyViewportDeltas(inner_delta, outer_delta, |
863 elastic_overscroll_delta, page_scale, | 863 elastic_overscroll_delta, page_scale, |
864 top_controls_delta); | 864 top_controls_delta); |
865 } | 865 } |
866 | 866 |
| 867 void RenderWidget::RecordWheelAndTouchScrollingCount( |
| 868 bool has_scrolled_by_wheel, |
| 869 bool has_scrolled_by_touch) { |
| 870 GetWebWidget()->recordWheelAndTouchScrollingCount(has_scrolled_by_wheel, |
| 871 has_scrolled_by_touch); |
| 872 } |
| 873 |
867 void RenderWidget::BeginMainFrame(double frame_time_sec) { | 874 void RenderWidget::BeginMainFrame(double frame_time_sec) { |
868 RenderThreadImpl* render_thread = RenderThreadImpl::current(); | 875 RenderThreadImpl* render_thread = RenderThreadImpl::current(); |
869 // render_thread may be NULL in tests. | 876 // render_thread may be NULL in tests. |
870 InputHandlerManager* input_handler_manager = | 877 InputHandlerManager* input_handler_manager = |
871 render_thread ? render_thread->input_handler_manager() : NULL; | 878 render_thread ? render_thread->input_handler_manager() : NULL; |
872 if (input_handler_manager) | 879 if (input_handler_manager) |
873 input_handler_manager->ProcessRafAlignedInputOnMainThread( | 880 input_handler_manager->ProcessRafAlignedInputOnMainThread( |
874 routing_id_, ui::EventTimeStampFromSeconds(frame_time_sec)); | 881 routing_id_, ui::EventTimeStampFromSeconds(frame_time_sec)); |
875 | 882 |
876 GetWebWidget()->beginFrame(frame_time_sec); | 883 GetWebWidget()->beginFrame(frame_time_sec); |
(...skipping 1448 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
2325 // browser side (https://crbug.com/669219). | 2332 // browser side (https://crbug.com/669219). |
2326 // If there is no WebFrameWidget, then there will be no | 2333 // If there is no WebFrameWidget, then there will be no |
2327 // InputMethodControllers for a WebLocalFrame. | 2334 // InputMethodControllers for a WebLocalFrame. |
2328 return nullptr; | 2335 return nullptr; |
2329 } | 2336 } |
2330 return static_cast<blink::WebFrameWidget*>(GetWebWidget()) | 2337 return static_cast<blink::WebFrameWidget*>(GetWebWidget()) |
2331 ->getActiveWebInputMethodController(); | 2338 ->getActiveWebInputMethodController(); |
2332 } | 2339 } |
2333 | 2340 |
2334 } // namespace content | 2341 } // namespace content |
OLD | NEW |