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 1792 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1803 } | 1803 } |
1804 | 1804 |
1805 void RenderViewImpl::DidAutoResize(const blink::WebSize& newSize) { | 1805 void RenderViewImpl::DidAutoResize(const blink::WebSize& newSize) { |
1806 RenderWidget::DidAutoResize(newSize); | 1806 RenderWidget::DidAutoResize(newSize); |
1807 } | 1807 } |
1808 | 1808 |
1809 void RenderViewImpl::DidOverscroll( | 1809 void RenderViewImpl::DidOverscroll( |
1810 const blink::WebFloatSize& overscrollDelta, | 1810 const blink::WebFloatSize& overscrollDelta, |
1811 const blink::WebFloatSize& accumulatedOverscroll, | 1811 const blink::WebFloatSize& accumulatedOverscroll, |
1812 const blink::WebFloatPoint& positionInViewport, | 1812 const blink::WebFloatPoint& positionInViewport, |
1813 const blink::WebFloatSize& velocityInViewport) { | 1813 const blink::WebFloatSize& velocityInViewport, |
| 1814 const blink::WebScrollBoundaryBehavior& behavior) { |
1814 RenderWidget::DidOverscroll(overscrollDelta, accumulatedOverscroll, | 1815 RenderWidget::DidOverscroll(overscrollDelta, accumulatedOverscroll, |
1815 positionInViewport, velocityInViewport); | 1816 positionInViewport, velocityInViewport, behavior); |
1816 } | 1817 } |
1817 | 1818 |
1818 void RenderViewImpl::HasTouchEventHandlers(bool has_handlers) { | 1819 void RenderViewImpl::HasTouchEventHandlers(bool has_handlers) { |
1819 RenderWidget::HasTouchEventHandlers(has_handlers); | 1820 RenderWidget::HasTouchEventHandlers(has_handlers); |
1820 } | 1821 } |
1821 | 1822 |
1822 blink::WebRect RenderViewImpl::RootWindowRect() { | 1823 blink::WebRect RenderViewImpl::RootWindowRect() { |
1823 return RenderWidget::WindowRect(); | 1824 return RenderWidget::WindowRect(); |
1824 } | 1825 } |
1825 | 1826 |
(...skipping 759 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
2585 input_event.GetCoalescedEventsPointers(), latency_info, | 2586 input_event.GetCoalescedEventsPointers(), latency_info, |
2586 dispatch_type); | 2587 dispatch_type); |
2587 return INPUT_EVENT_ACK_STATE_NOT_CONSUMED; | 2588 return INPUT_EVENT_ACK_STATE_NOT_CONSUMED; |
2588 } | 2589 } |
2589 idle_user_detector_->ActivityDetected(); | 2590 idle_user_detector_->ActivityDetected(); |
2590 return RenderWidget::HandleInputEvent(input_event, latency_info, | 2591 return RenderWidget::HandleInputEvent(input_event, latency_info, |
2591 dispatch_type); | 2592 dispatch_type); |
2592 } | 2593 } |
2593 | 2594 |
2594 } // namespace content | 2595 } // namespace content |
OLD | NEW |