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