Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(76)

Side by Side Diff: content/renderer/render_view_impl.cc

Issue 2605193002: Fix mouse wheel over-scrolls when display is scaled and scroll is paginated (Closed)
Patch Set: Created 3 years, 11 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
OLDNEW
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 1847 matching lines...) Expand 10 before | Expand all | Expand 10 after
1858 } 1858 }
1859 1859
1860 void RenderViewImpl::convertViewportToWindow(blink::WebRect* rect) { 1860 void RenderViewImpl::convertViewportToWindow(blink::WebRect* rect) {
1861 RenderWidget::convertViewportToWindow(rect); 1861 RenderWidget::convertViewportToWindow(rect);
1862 } 1862 }
1863 1863
1864 void RenderViewImpl::convertWindowToViewport(blink::WebFloatRect* rect) { 1864 void RenderViewImpl::convertWindowToViewport(blink::WebFloatRect* rect) {
1865 RenderWidget::convertWindowToViewport(rect); 1865 RenderWidget::convertWindowToViewport(rect);
1866 } 1866 }
1867 1867
1868 float RenderViewImpl::GetOriginalDeviceScaleFactor() const {
1869 if (IsUseZoomForDSFEnabled())
1870 return RenderWidget::GetOriginalDeviceScaleFactor();
1871 return 1.0f;
1872 }
1873
1868 void RenderViewImpl::didAutoResize(const blink::WebSize& newSize) { 1874 void RenderViewImpl::didAutoResize(const blink::WebSize& newSize) {
1869 RenderWidget::DidAutoResize(newSize); 1875 RenderWidget::DidAutoResize(newSize);
1870 } 1876 }
1871 1877
1872 void RenderViewImpl::didOverscroll( 1878 void RenderViewImpl::didOverscroll(
1873 const blink::WebFloatSize& overscrollDelta, 1879 const blink::WebFloatSize& overscrollDelta,
1874 const blink::WebFloatSize& accumulatedOverscroll, 1880 const blink::WebFloatSize& accumulatedOverscroll,
1875 const blink::WebFloatPoint& positionInViewport, 1881 const blink::WebFloatPoint& positionInViewport,
1876 const blink::WebFloatSize& velocityInViewport) { 1882 const blink::WebFloatSize& velocityInViewport) {
1877 RenderWidget::didOverscroll(overscrollDelta, accumulatedOverscroll, 1883 RenderWidget::didOverscroll(overscrollDelta, accumulatedOverscroll,
(...skipping 854 matching lines...) Expand 10 before | Expand all | Expand 10 after
2732 INPUT_EVENT_ACK_STATE_NOT_CONSUMED); 2738 INPUT_EVENT_ACK_STATE_NOT_CONSUMED);
2733 } 2739 }
2734 2740
2735 std::unique_ptr<InputEventAck> ack( 2741 std::unique_ptr<InputEventAck> ack(
2736 new InputEventAck(InputEventAckSource::MAIN_THREAD, input_event->type, 2742 new InputEventAck(InputEventAckSource::MAIN_THREAD, input_event->type,
2737 INPUT_EVENT_ACK_STATE_NOT_CONSUMED)); 2743 INPUT_EVENT_ACK_STATE_NOT_CONSUMED));
2738 OnInputEventAck(std::move(ack)); 2744 OnInputEventAck(std::move(ack));
2739 } 2745 }
2740 2746
2741 } // namespace content 2747 } // namespace content
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698