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