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

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

Issue 1150003003: Cleanup ScrollableArea scrolling API (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Created 5 years, 6 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
« no previous file with comments | « Source/core/frame/FrameView.h ('k') | Source/core/frame/RootFrameViewportTest.cpp » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 1483 matching lines...) Expand 10 before | Expand all | Expand 10 after
1494 DoublePoint newScrollPosition = adjustScrollPositionWithinRange(scrollPoint) ; 1494 DoublePoint newScrollPosition = adjustScrollPositionWithinRange(scrollPoint) ;
1495 if (newScrollPosition == scrollPositionDouble()) 1495 if (newScrollPosition == scrollPositionDouble())
1496 return; 1496 return;
1497 1497
1498 if (scrollBehavior == ScrollBehaviorAuto) 1498 if (scrollBehavior == ScrollBehaviorAuto)
1499 scrollBehavior = scrollBehaviorStyle(); 1499 scrollBehavior = scrollBehaviorStyle();
1500 1500
1501 if (scrollBehavior == ScrollBehaviorInstant) { 1501 if (scrollBehavior == ScrollBehaviorInstant) {
1502 DoubleSize newOffset(newScrollPosition.x(), newScrollPosition.y()); 1502 DoubleSize newOffset(newScrollPosition.x(), newScrollPosition.y());
1503 // TODO(bokan): Why do we need to go through updateScrollbars? If not, w e can 1503 // TODO(bokan): Why do we need to go through updateScrollbars? If not, w e can
1504 // just delete this whole method and use the base version. 1504 // just delete this behavior switch and use the base method.
1505 updateScrollbars(newOffset); 1505 updateScrollbars(newOffset);
1506 } else { 1506 } else {
1507 ScrollableArea::setScrollPosition(newScrollPosition, ProgrammaticScroll, ScrollBehaviorSmooth); 1507 ScrollableArea::setScrollPosition(newScrollPosition, scrollType, ScrollB ehaviorSmooth);
1508 } 1508 }
1509 } 1509 }
1510 1510
1511 void FrameView::setElasticOverscroll(const FloatSize& elasticOverscroll) 1511 void FrameView::setElasticOverscroll(const FloatSize& elasticOverscroll)
1512 { 1512 {
1513 m_elasticOverscroll = elasticOverscroll; 1513 m_elasticOverscroll = elasticOverscroll;
1514 if (m_horizontalScrollbar) { 1514 if (m_horizontalScrollbar) {
1515 float delta = elasticOverscroll.width() - m_horizontalScrollbar->elastic Overscroll(); 1515 float delta = elasticOverscroll.width() - m_horizontalScrollbar->elastic Overscroll();
1516 if (delta != 0) { 1516 if (delta != 0) {
1517 m_horizontalScrollbar->setElasticOverscroll(elasticOverscroll.width( )); 1517 m_horizontalScrollbar->setElasticOverscroll(elasticOverscroll.width( ));
(...skipping 2491 matching lines...) Expand 10 before | Expand all | Expand 10 after
4009 4009
4010 if (!graphicsLayer) 4010 if (!graphicsLayer)
4011 return; 4011 return;
4012 4012
4013 DeprecatedPaintLayer::mapRectToPaintInvalidationBacking(localFrame->contentL ayoutObject(), paintInvalidationContainer, viewRect); 4013 DeprecatedPaintLayer::mapRectToPaintInvalidationBacking(localFrame->contentL ayoutObject(), paintInvalidationContainer, viewRect);
4014 4014
4015 graphicsLayerTimingRequests.add(graphicsLayer, Vector<std::pair<int64_t, Web Rect>>()).storedValue->value.append(std::make_pair(m_frame->frameID(), enclosing IntRect(viewRect))); 4015 graphicsLayerTimingRequests.add(graphicsLayer, Vector<std::pair<int64_t, Web Rect>>()).storedValue->value.append(std::make_pair(m_frame->frameID(), enclosing IntRect(viewRect)));
4016 } 4016 }
4017 4017
4018 } // namespace blink 4018 } // namespace blink
OLDNEW
« no previous file with comments | « Source/core/frame/FrameView.h ('k') | Source/core/frame/RootFrameViewportTest.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698