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 | 10 |
(...skipping 1819 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1830 } | 1830 } |
1831 | 1831 |
1832 void RenderViewImpl::DidAutoResize(const blink::WebSize& newSize) { | 1832 void RenderViewImpl::DidAutoResize(const blink::WebSize& newSize) { |
1833 RenderWidget::DidAutoResize(newSize); | 1833 RenderWidget::DidAutoResize(newSize); |
1834 } | 1834 } |
1835 | 1835 |
1836 void RenderViewImpl::DidOverscroll( | 1836 void RenderViewImpl::DidOverscroll( |
1837 const blink::WebFloatSize& overscrollDelta, | 1837 const blink::WebFloatSize& overscrollDelta, |
1838 const blink::WebFloatSize& accumulatedOverscroll, | 1838 const blink::WebFloatSize& accumulatedOverscroll, |
1839 const blink::WebFloatPoint& positionInViewport, | 1839 const blink::WebFloatPoint& positionInViewport, |
1840 const blink::WebFloatSize& velocityInViewport) { | 1840 const blink::WebFloatSize& velocityInViewport, |
| 1841 const blink::WebScrollBoundaryBehavior& behavior) { |
1841 RenderWidget::DidOverscroll(overscrollDelta, accumulatedOverscroll, | 1842 RenderWidget::DidOverscroll(overscrollDelta, accumulatedOverscroll, |
1842 positionInViewport, velocityInViewport); | 1843 positionInViewport, velocityInViewport, behavior); |
1843 } | 1844 } |
1844 | 1845 |
1845 void RenderViewImpl::HasTouchEventHandlers(bool has_handlers) { | 1846 void RenderViewImpl::HasTouchEventHandlers(bool has_handlers) { |
1846 RenderWidget::HasTouchEventHandlers(has_handlers); | 1847 RenderWidget::HasTouchEventHandlers(has_handlers); |
1847 } | 1848 } |
1848 | 1849 |
1849 blink::WebRect RenderViewImpl::RootWindowRect() { | 1850 blink::WebRect RenderViewImpl::RootWindowRect() { |
1850 return RenderWidget::WindowRect(); | 1851 return RenderWidget::WindowRect(); |
1851 } | 1852 } |
1852 | 1853 |
(...skipping 811 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
2664 input_event.GetCoalescedEventsPointers(), latency_info, | 2665 input_event.GetCoalescedEventsPointers(), latency_info, |
2665 dispatch_type); | 2666 dispatch_type); |
2666 return INPUT_EVENT_ACK_STATE_NOT_CONSUMED; | 2667 return INPUT_EVENT_ACK_STATE_NOT_CONSUMED; |
2667 } | 2668 } |
2668 idle_user_detector_->ActivityDetected(); | 2669 idle_user_detector_->ActivityDetected(); |
2669 return RenderWidget::HandleInputEvent(input_event, latency_info, | 2670 return RenderWidget::HandleInputEvent(input_event, latency_info, |
2670 dispatch_type); | 2671 dispatch_type); |
2671 } | 2672 } |
2672 | 2673 |
2673 } // namespace content | 2674 } // namespace content |
OLD | NEW |