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 <memory> | 9 #include <memory> |
10 #include <utility> | 10 #include <utility> |
(...skipping 1751 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1762 } | 1762 } |
1763 | 1763 |
1764 void RenderViewImpl::DidAutoResize(const blink::WebSize& newSize) { | 1764 void RenderViewImpl::DidAutoResize(const blink::WebSize& newSize) { |
1765 RenderWidget::DidAutoResize(newSize); | 1765 RenderWidget::DidAutoResize(newSize); |
1766 } | 1766 } |
1767 | 1767 |
1768 void RenderViewImpl::DidOverscroll( | 1768 void RenderViewImpl::DidOverscroll( |
1769 const blink::WebFloatSize& overscrollDelta, | 1769 const blink::WebFloatSize& overscrollDelta, |
1770 const blink::WebFloatSize& accumulatedOverscroll, | 1770 const blink::WebFloatSize& accumulatedOverscroll, |
1771 const blink::WebFloatPoint& positionInViewport, | 1771 const blink::WebFloatPoint& positionInViewport, |
1772 const blink::WebFloatSize& velocityInViewport) { | 1772 const blink::WebFloatSize& velocityInViewport, |
| 1773 const blink::WebScrollBoundaryBehavior& behavior) { |
1773 RenderWidget::DidOverscroll(overscrollDelta, accumulatedOverscroll, | 1774 RenderWidget::DidOverscroll(overscrollDelta, accumulatedOverscroll, |
1774 positionInViewport, velocityInViewport); | 1775 positionInViewport, velocityInViewport, behavior); |
1775 } | 1776 } |
1776 | 1777 |
1777 void RenderViewImpl::HasTouchEventHandlers(bool has_handlers) { | 1778 void RenderViewImpl::HasTouchEventHandlers(bool has_handlers) { |
1778 RenderWidget::HasTouchEventHandlers(has_handlers); | 1779 RenderWidget::HasTouchEventHandlers(has_handlers); |
1779 } | 1780 } |
1780 | 1781 |
1781 blink::WebRect RenderViewImpl::RootWindowRect() { | 1782 blink::WebRect RenderViewImpl::RootWindowRect() { |
1782 return RenderWidget::WindowRect(); | 1783 return RenderWidget::WindowRect(); |
1783 } | 1784 } |
1784 | 1785 |
(...skipping 747 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
2532 std::move(callback).Run(INPUT_EVENT_ACK_STATE_NOT_CONSUMED, latency_info, | 2533 std::move(callback).Run(INPUT_EVENT_ACK_STATE_NOT_CONSUMED, latency_info, |
2533 nullptr); | 2534 nullptr); |
2534 return; | 2535 return; |
2535 } | 2536 } |
2536 idle_user_detector_->ActivityDetected(); | 2537 idle_user_detector_->ActivityDetected(); |
2537 RenderWidget::HandleInputEvent(input_event, latency_info, | 2538 RenderWidget::HandleInputEvent(input_event, latency_info, |
2538 std::move(callback)); | 2539 std::move(callback)); |
2539 } | 2540 } |
2540 | 2541 |
2541 } // namespace content | 2542 } // namespace content |
OLD | NEW |