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

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

Issue 819953002: Mac: Update scrollbar size and input position during impl-overscroll (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Peure virtual Created 5 years, 12 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/platform/exported/WebScrollbarImpl.h » ('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 1544 matching lines...) Expand 10 before | Expand all | Expand 10 after
1555 { 1555 {
1556 IntPoint newScrollPosition = adjustScrollPositionWithinRange(scrollPoint); 1556 IntPoint newScrollPosition = adjustScrollPositionWithinRange(scrollPoint);
1557 1557
1558 if (newScrollPosition == scrollPosition()) 1558 if (newScrollPosition == scrollPosition())
1559 return; 1559 return;
1560 1560
1561 TemporaryChange<bool> changeInProgrammaticScroll(m_inProgrammaticScroll, fal se); 1561 TemporaryChange<bool> changeInProgrammaticScroll(m_inProgrammaticScroll, fal se);
1562 notifyScrollPositionChanged(newScrollPosition); 1562 notifyScrollPositionChanged(newScrollPosition);
1563 } 1563 }
1564 1564
1565 void FrameView::setElasticOverscroll(const FloatSize& elasticOverscroll)
1566 {
1567 m_elasticOverscroll = elasticOverscroll;
1568 if (m_horizontalScrollbar && m_horizontalScrollbar->elasticOverscroll() != e lasticOverscroll.width()) {
1569 m_horizontalScrollbar->setElasticOverscroll(elasticOverscroll.width());
1570 if (!m_scrollbarsSuppressed)
1571 m_horizontalScrollbar->invalidate();
1572 }
1573 if (m_verticalScrollbar && m_verticalScrollbar->elasticOverscroll() != elast icOverscroll.width()) {
1574 m_verticalScrollbar->setElasticOverscroll(elasticOverscroll.width());
1575 if (!m_scrollbarsSuppressed)
1576 m_verticalScrollbar->invalidate();
1577 }
1578 }
1579
1565 IntSize FrameView::layoutSize(IncludeScrollbarsInRect scrollbarInclusion) const 1580 IntSize FrameView::layoutSize(IncludeScrollbarsInRect scrollbarInclusion) const
1566 { 1581 {
1567 return scrollbarInclusion == ExcludeScrollbars ? excludeScrollbars(m_layoutS ize) : m_layoutSize; 1582 return scrollbarInclusion == ExcludeScrollbars ? excludeScrollbars(m_layoutS ize) : m_layoutSize;
1568 } 1583 }
1569 1584
1570 void FrameView::setLayoutSize(const IntSize& size) 1585 void FrameView::setLayoutSize(const IntSize& size)
1571 { 1586 {
1572 ASSERT(!layoutSizeFixedToFrameSize()); 1587 ASSERT(!layoutSizeFixedToFrameSize());
1573 1588
1574 setLayoutSizeInternal(size); 1589 setLayoutSizeInternal(size);
(...skipping 2406 matching lines...) Expand 10 before | Expand all | Expand 10 after
3981 return; 3996 return;
3982 3997
3983 ScrollableArea::setScrollOrigin(origin); 3998 ScrollableArea::setScrollOrigin(origin);
3984 3999
3985 // Update if the scroll origin changes, since our position will be different if the content size did not change. 4000 // Update if the scroll origin changes, since our position will be different if the content size did not change.
3986 if (updatePositionAtAll && updatePositionSynchronously) 4001 if (updatePositionAtAll && updatePositionSynchronously)
3987 updateScrollbars(scrollOffsetDouble()); 4002 updateScrollbars(scrollOffsetDouble());
3988 } 4003 }
3989 4004
3990 } // namespace blink 4005 } // namespace blink
OLDNEW
« no previous file with comments | « Source/core/frame/FrameView.h ('k') | Source/platform/exported/WebScrollbarImpl.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698