Chromium Code Reviews| OLD | NEW |
|---|---|
| 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 1745 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 1756 PaintLayerScrollableArea::compositorAnimationTimeline() const { | 1756 PaintLayerScrollableArea::compositorAnimationTimeline() const { |
| 1757 if (LocalFrame* frame = box().frame()) { | 1757 if (LocalFrame* frame = box().frame()) { |
| 1758 if (Page* page = frame->page()) | 1758 if (Page* page = frame->page()) |
| 1759 return page->scrollingCoordinator() | 1759 return page->scrollingCoordinator() |
| 1760 ? page->scrollingCoordinator()->compositorAnimationTimeline() | 1760 ? page->scrollingCoordinator()->compositorAnimationTimeline() |
| 1761 : nullptr; | 1761 : nullptr; |
| 1762 } | 1762 } |
| 1763 return nullptr; | 1763 return nullptr; |
| 1764 } | 1764 } |
| 1765 | 1765 |
| 1766 void PaintLayerScrollableArea::getTickmarks(Vector<IntRect>& tickmarks) const { | |
| 1767 // TODO(crbug.com/417782): Verify that tickmarks work with root layer | |
| 1768 // scrolling. | |
| 1769 if (LocalFrame* frame = box().frame()) | |
|
skobes
2016/11/10 21:10:47
I think you also need to check isRootLayer() here?
ymalik
2016/11/10 21:22:48
Yes. Done.
| |
| 1770 frame->view()->getTickmarks(tickmarks); | |
| 1771 } | |
| 1772 | |
| 1766 PaintLayerScrollableArea* | 1773 PaintLayerScrollableArea* |
| 1767 PaintLayerScrollableArea::ScrollbarManager::scrollableArea() { | 1774 PaintLayerScrollableArea::ScrollbarManager::scrollableArea() { |
| 1768 return toPaintLayerScrollableArea(m_scrollableArea.get()); | 1775 return toPaintLayerScrollableArea(m_scrollableArea.get()); |
| 1769 } | 1776 } |
| 1770 | 1777 |
| 1771 void PaintLayerScrollableArea::ScrollbarManager::destroyDetachedScrollbars() { | 1778 void PaintLayerScrollableArea::ScrollbarManager::destroyDetachedScrollbars() { |
| 1772 DCHECK(!m_hBarIsAttached || m_hBar); | 1779 DCHECK(!m_hBarIsAttached || m_hBar); |
| 1773 DCHECK(!m_vBarIsAttached || m_vBar); | 1780 DCHECK(!m_vBarIsAttached || m_vBar); |
| 1774 if (m_hBar && !m_hBarIsAttached) | 1781 if (m_hBar && !m_hBarIsAttached) |
| 1775 destroyScrollbar(HorizontalScrollbar); | 1782 destroyScrollbar(HorizontalScrollbar); |
| (...skipping 196 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 1972 | 1979 |
| 1973 void PaintLayerScrollableArea::DelayScrollOffsetClampScope:: | 1980 void PaintLayerScrollableArea::DelayScrollOffsetClampScope:: |
| 1974 clampScrollableAreas() { | 1981 clampScrollableAreas() { |
| 1975 for (auto& scrollableArea : *s_needsClamp) | 1982 for (auto& scrollableArea : *s_needsClamp) |
| 1976 scrollableArea->clampScrollOffsetsAfterLayout(); | 1983 scrollableArea->clampScrollOffsetsAfterLayout(); |
| 1977 delete s_needsClamp; | 1984 delete s_needsClamp; |
| 1978 s_needsClamp = nullptr; | 1985 s_needsClamp = nullptr; |
| 1979 } | 1986 } |
| 1980 | 1987 |
| 1981 } // namespace blink | 1988 } // namespace blink |
| OLD | NEW |