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

Side by Side Diff: Source/core/frame/FrameView.cpp

Issue 1147283002: Add ScrollDirectionPhysical enum in Scroll types. (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Created 5 years, 7 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 /* 1 /*
2 * Copyright (C) 1998, 1999 Torben Weis <weis@kde.org> 2 * Copyright (C) 1998, 1999 Torben Weis <weis@kde.org>
3 * 1999 Lars Knoll <knoll@kde.org> 3 * 1999 Lars Knoll <knoll@kde.org>
4 * 1999 Antti Koivisto <koivisto@kde.org> 4 * 1999 Antti Koivisto <koivisto@kde.org>
5 * 2000 Dirk Mueller <mueller@kde.org> 5 * 2000 Dirk Mueller <mueller@kde.org>
6 * Copyright (C) 2004, 2005, 2006, 2007, 2008 Apple Inc. All rights reserved. 6 * Copyright (C) 2004, 2005, 2006, 2007, 2008 Apple Inc. All rights reserved.
7 * (C) 2006 Graham Dennis (graham.dennis@gmail.com) 7 * (C) 2006 Graham Dennis (graham.dennis@gmail.com)
8 * (C) 2006 Alexey Proskuryakov (ap@nypop.com) 8 * (C) 2006 Alexey Proskuryakov (ap@nypop.com)
9 * Copyright (C) 2009 Google Inc. All rights reserved. 9 * Copyright (C) 2009 Google Inc. All rights reserved.
10 * 10 *
(...skipping 3245 matching lines...) Expand 10 before | Expand all | Expand 10 after
3256 void FrameView::setScrollOffset(const IntPoint& offset) 3256 void FrameView::setScrollOffset(const IntPoint& offset)
3257 { 3257 {
3258 scrollTo(DoublePoint(adjustScrollPositionWithinRange(offset))); 3258 scrollTo(DoublePoint(adjustScrollPositionWithinRange(offset)));
3259 } 3259 }
3260 3260
3261 void FrameView::setScrollOffset(const DoublePoint& offset) 3261 void FrameView::setScrollOffset(const DoublePoint& offset)
3262 { 3262 {
3263 scrollTo(adjustScrollPositionWithinRange(offset)); 3263 scrollTo(adjustScrollPositionWithinRange(offset));
3264 } 3264 }
3265 3265
3266 bool FrameView::scroll(ScrollDirection direction, ScrollGranularity granularity, float delta) 3266 bool FrameView::scroll(ScrollDirectionPhysical direction, ScrollGranularity gran ularity, float delta)
bokan 2015/05/21 18:54:43 Just remove FrameView::scroll and let callers use
3267 { 3267 {
3268 ScrollDirection physicalDirection = 3268 return ScrollableArea::scroll(direction, granularity, delta);
3269 toPhysicalDirection(direction, isVerticalDocument(), isFlippedDocument() );
3270
3271 return ScrollableArea::scroll(physicalDirection, granularity, delta);
3272 } 3269 }
3273 3270
3274 void FrameView::windowResizerRectChanged() 3271 void FrameView::windowResizerRectChanged()
3275 { 3272 {
3276 updateScrollbars(scrollOffsetDouble()); 3273 updateScrollbars(scrollOffsetDouble());
3277 } 3274 }
3278 3275
3279 bool FrameView::hasOverlayScrollbars() const 3276 bool FrameView::hasOverlayScrollbars() const
3280 { 3277 {
3281 3278
(...skipping 786 matching lines...) Expand 10 before | Expand all | Expand 10 after
4068 4065
4069 if (!graphicsLayer) 4066 if (!graphicsLayer)
4070 return; 4067 return;
4071 4068
4072 DeprecatedPaintLayer::mapRectToPaintInvalidationBacking(localFrame->contentL ayoutObject(), paintInvalidationContainer, viewRect); 4069 DeprecatedPaintLayer::mapRectToPaintInvalidationBacking(localFrame->contentL ayoutObject(), paintInvalidationContainer, viewRect);
4073 4070
4074 graphicsLayerTimingRequests.add(graphicsLayer, Vector<std::pair<int64_t, Web Rect>>()).storedValue->value.append(std::make_pair(m_frame->frameID(), enclosing IntRect(viewRect))); 4071 graphicsLayerTimingRequests.add(graphicsLayer, Vector<std::pair<int64_t, Web Rect>>()).storedValue->value.append(std::make_pair(m_frame->frameID(), enclosing IntRect(viewRect)));
4075 } 4072 }
4076 4073
4077 } // namespace blink 4074 } // namespace blink
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698