| 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 856 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 867 elastic_overscroll_delta, page_scale, | 867 elastic_overscroll_delta, page_scale, |
| 868 top_controls_delta); | 868 top_controls_delta); |
| 869 } | 869 } |
| 870 | 870 |
| 871 void RenderWidget::BeginMainFrame(double frame_time_sec) { | 871 void RenderWidget::BeginMainFrame(double frame_time_sec) { |
| 872 RenderThreadImpl* render_thread = RenderThreadImpl::current(); | 872 RenderThreadImpl* render_thread = RenderThreadImpl::current(); |
| 873 // render_thread may be NULL in tests. | 873 // render_thread may be NULL in tests. |
| 874 InputHandlerManager* input_handler_manager = | 874 InputHandlerManager* input_handler_manager = |
| 875 render_thread ? render_thread->input_handler_manager() : NULL; | 875 render_thread ? render_thread->input_handler_manager() : NULL; |
| 876 if (input_handler_manager) | 876 if (input_handler_manager) |
| 877 input_handler_manager->ProcessRafAlignedInputOnMainThread(routing_id_); | 877 input_handler_manager->ProcessRafAlignedInputOnMainThread(routing_id_, |
| 878 frame_time_sec); |
| 878 | 879 |
| 879 GetWebWidget()->beginFrame(frame_time_sec); | 880 GetWebWidget()->beginFrame(frame_time_sec); |
| 880 } | 881 } |
| 881 | 882 |
| 882 std::unique_ptr<cc::CompositorFrameSink> | 883 std::unique_ptr<cc::CompositorFrameSink> |
| 883 RenderWidget::CreateCompositorFrameSink(const cc::FrameSinkId& frame_sink_id, | 884 RenderWidget::CreateCompositorFrameSink(const cc::FrameSinkId& frame_sink_id, |
| 884 bool fallback) { | 885 bool fallback) { |
| 885 DCHECK(GetWebWidget()); | 886 DCHECK(GetWebWidget()); |
| 886 // For widgets that are never visible, we don't start the compositor, so we | 887 // For widgets that are never visible, we don't start the compositor, so we |
| 887 // never get a request for a cc::CompositorFrameSink. | 888 // never get a request for a cc::CompositorFrameSink. |
| (...skipping 1422 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 2310 // browser side (https://crbug.com/669219). | 2311 // browser side (https://crbug.com/669219). |
| 2311 // If there is no WebFrameWidget, then there will be no | 2312 // If there is no WebFrameWidget, then there will be no |
| 2312 // InputMethodControllers for a WebLocalFrame. | 2313 // InputMethodControllers for a WebLocalFrame. |
| 2313 return nullptr; | 2314 return nullptr; |
| 2314 } | 2315 } |
| 2315 return static_cast<blink::WebFrameWidget*>(GetWebWidget()) | 2316 return static_cast<blink::WebFrameWidget*>(GetWebWidget()) |
| 2316 ->getActiveWebInputMethodController(); | 2317 ->getActiveWebInputMethodController(); |
| 2317 } | 2318 } |
| 2318 | 2319 |
| 2319 } // namespace content | 2320 } // namespace content |
| OLD | NEW |