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

Side by Side Diff: third_party/WebKit/Source/core/paint/PaintLayerScrollableArea.cpp

Issue 2501493002: Revert "MainFrame scrollbars should work with RFV instead of FV" (Closed)
Patch Set: Created 4 years, 1 month 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) 2006, 2007, 2008, 2009, 2010, 2011, 2012 Apple Inc. All rights 2 * Copyright (C) 2006, 2007, 2008, 2009, 2010, 2011, 2012 Apple Inc. All rights
3 * reserved. 3 * reserved.
4 * 4 *
5 * Portions are Copyright (C) 1998 Netscape Communications Corporation. 5 * Portions are Copyright (C) 1998 Netscape Communications Corporation.
6 * 6 *
7 * Other contributors: 7 * Other contributors:
8 * Robert O'Callahan <roc+@cs.cmu.edu> 8 * Robert O'Callahan <roc+@cs.cmu.edu>
9 * David Baron <dbaron@fas.harvard.edu> 9 * David Baron <dbaron@fas.harvard.edu>
10 * Christian Biesinger <cbiesinger@gmail.com> 10 * Christian Biesinger <cbiesinger@gmail.com>
(...skipping 1740 matching lines...) Expand 10 before | Expand all | Expand 10 after
1751 PaintLayerScrollableArea::compositorAnimationTimeline() const { 1751 PaintLayerScrollableArea::compositorAnimationTimeline() const {
1752 if (LocalFrame* frame = box().frame()) { 1752 if (LocalFrame* frame = box().frame()) {
1753 if (Page* page = frame->page()) 1753 if (Page* page = frame->page())
1754 return page->scrollingCoordinator() 1754 return page->scrollingCoordinator()
1755 ? page->scrollingCoordinator()->compositorAnimationTimeline() 1755 ? page->scrollingCoordinator()->compositorAnimationTimeline()
1756 : nullptr; 1756 : nullptr;
1757 } 1757 }
1758 return nullptr; 1758 return nullptr;
1759 } 1759 }
1760 1760
1761 void PaintLayerScrollableArea::getTickmarks(Vector<IntRect>& tickmarks) const {
1762 if (!layer()->isRootLayer())
1763 return;
1764
1765 // TODO(crbug.com/417782): Verify that tickmarks work with root layer
1766 // scrolling.
1767 if (LocalFrame* frame = box().frame())
1768 frame->view()->getTickmarks(tickmarks);
1769 }
1770
1771 PaintLayerScrollableArea* 1761 PaintLayerScrollableArea*
1772 PaintLayerScrollableArea::ScrollbarManager::scrollableArea() { 1762 PaintLayerScrollableArea::ScrollbarManager::scrollableArea() {
1773 return toPaintLayerScrollableArea(m_scrollableArea.get()); 1763 return toPaintLayerScrollableArea(m_scrollableArea.get());
1774 } 1764 }
1775 1765
1776 void PaintLayerScrollableArea::ScrollbarManager::destroyDetachedScrollbars() { 1766 void PaintLayerScrollableArea::ScrollbarManager::destroyDetachedScrollbars() {
1777 DCHECK(!m_hBarIsAttached || m_hBar); 1767 DCHECK(!m_hBarIsAttached || m_hBar);
1778 DCHECK(!m_vBarIsAttached || m_vBar); 1768 DCHECK(!m_vBarIsAttached || m_vBar);
1779 if (m_hBar && !m_hBarIsAttached) 1769 if (m_hBar && !m_hBarIsAttached)
1780 destroyScrollbar(HorizontalScrollbar); 1770 destroyScrollbar(HorizontalScrollbar);
(...skipping 196 matching lines...) Expand 10 before | Expand all | Expand 10 after
1977 1967
1978 void PaintLayerScrollableArea::DelayScrollOffsetClampScope:: 1968 void PaintLayerScrollableArea::DelayScrollOffsetClampScope::
1979 clampScrollableAreas() { 1969 clampScrollableAreas() {
1980 for (auto& scrollableArea : *s_needsClamp) 1970 for (auto& scrollableArea : *s_needsClamp)
1981 scrollableArea->clampScrollOffsetsAfterLayout(); 1971 scrollableArea->clampScrollOffsetsAfterLayout();
1982 delete s_needsClamp; 1972 delete s_needsClamp;
1983 s_needsClamp = nullptr; 1973 s_needsClamp = nullptr;
1984 } 1974 }
1985 1975
1986 } // namespace blink 1976 } // namespace blink
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698