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 1755 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1766 } | 1766 } |
1767 | 1767 |
1768 void RenderViewImpl::DidAutoResize(const blink::WebSize& newSize) { | 1768 void RenderViewImpl::DidAutoResize(const blink::WebSize& newSize) { |
1769 RenderWidget::DidAutoResize(newSize); | 1769 RenderWidget::DidAutoResize(newSize); |
1770 } | 1770 } |
1771 | 1771 |
1772 void RenderViewImpl::DidOverscroll( | 1772 void RenderViewImpl::DidOverscroll( |
1773 const blink::WebFloatSize& overscrollDelta, | 1773 const blink::WebFloatSize& overscrollDelta, |
1774 const blink::WebFloatSize& accumulatedOverscroll, | 1774 const blink::WebFloatSize& accumulatedOverscroll, |
1775 const blink::WebFloatPoint& positionInViewport, | 1775 const blink::WebFloatPoint& positionInViewport, |
1776 const blink::WebFloatSize& velocityInViewport) { | 1776 const blink::WebFloatSize& velocityInViewport, |
| 1777 const blink::WebScrollBoundaryBehavior& behavior) { |
1777 RenderWidget::DidOverscroll(overscrollDelta, accumulatedOverscroll, | 1778 RenderWidget::DidOverscroll(overscrollDelta, accumulatedOverscroll, |
1778 positionInViewport, velocityInViewport); | 1779 positionInViewport, velocityInViewport, behavior); |
1779 } | 1780 } |
1780 | 1781 |
1781 void RenderViewImpl::HasTouchEventHandlers(bool has_handlers) { | 1782 void RenderViewImpl::HasTouchEventHandlers(bool has_handlers) { |
1782 RenderWidget::HasTouchEventHandlers(has_handlers); | 1783 RenderWidget::HasTouchEventHandlers(has_handlers); |
1783 } | 1784 } |
1784 | 1785 |
1785 blink::WebRect RenderViewImpl::RootWindowRect() { | 1786 blink::WebRect RenderViewImpl::RootWindowRect() { |
1786 return RenderWidget::WindowRect(); | 1787 return RenderWidget::WindowRect(); |
1787 } | 1788 } |
1788 | 1789 |
(...skipping 748 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
2537 std::move(callback).Run(INPUT_EVENT_ACK_STATE_NOT_CONSUMED, latency_info, | 2538 std::move(callback).Run(INPUT_EVENT_ACK_STATE_NOT_CONSUMED, latency_info, |
2538 nullptr); | 2539 nullptr); |
2539 return; | 2540 return; |
2540 } | 2541 } |
2541 idle_user_detector_->ActivityDetected(); | 2542 idle_user_detector_->ActivityDetected(); |
2542 RenderWidget::HandleInputEvent(input_event, latency_info, | 2543 RenderWidget::HandleInputEvent(input_event, latency_info, |
2543 std::move(callback)); | 2544 std::move(callback)); |
2544 } | 2545 } |
2545 | 2546 |
2546 } // namespace content | 2547 } // namespace content |
OLD | NEW |