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 1864 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 1875 return box().frame()->view(); | 1875 return box().frame()->view(); |
| 1876 } | 1876 } |
| 1877 | 1877 |
| 1878 void PaintLayerScrollableArea::resetRebuildScrollbarLayerFlags() { | 1878 void PaintLayerScrollableArea::resetRebuildScrollbarLayerFlags() { |
| 1879 m_rebuildHorizontalScrollbarLayer = false; | 1879 m_rebuildHorizontalScrollbarLayer = false; |
| 1880 m_rebuildVerticalScrollbarLayer = false; | 1880 m_rebuildVerticalScrollbarLayer = false; |
| 1881 } | 1881 } |
| 1882 | 1882 |
| 1883 CompositorAnimationHost* PaintLayerScrollableArea::compositorAnimationHost() | 1883 CompositorAnimationHost* PaintLayerScrollableArea::compositorAnimationHost() |
| 1884 const { | 1884 const { |
| 1885 if (ScrollingCoordinator* coordinator = getScrollingCoordinator()) | 1885 return m_layer.layoutObject()->frameView()->compositorAnimationHost(); |
|
bokan
2017/01/17 20:40:16
VisualViewport also calls this via ScrollingCoordi
kenrb
2017/01/19 19:07:40
There are VisualViewports in OOPIF processes, but
bokan
2017/01/19 20:05:39
Ok, in that case, if it works please add DCHECKs i
kenrb
2017/01/19 21:36:19
I will do this in a follow up CL.
| |
| 1886 return coordinator->compositorAnimationHost(); | |
| 1887 | |
| 1888 return nullptr; | |
| 1889 } | 1886 } |
| 1890 | 1887 |
| 1891 CompositorAnimationTimeline* | 1888 CompositorAnimationTimeline* |
| 1892 PaintLayerScrollableArea::compositorAnimationTimeline() const { | 1889 PaintLayerScrollableArea::compositorAnimationTimeline() const { |
| 1893 if (ScrollingCoordinator* coordinator = getScrollingCoordinator()) | 1890 return m_layer.layoutObject()->frameView()->compositorAnimationTimeline(); |
| 1894 return coordinator->compositorAnimationTimeline(); | |
| 1895 | |
| 1896 return nullptr; | |
| 1897 } | 1891 } |
| 1898 | 1892 |
| 1899 PaintLayerScrollableArea* | 1893 PaintLayerScrollableArea* |
| 1900 PaintLayerScrollableArea::ScrollbarManager::scrollableArea() { | 1894 PaintLayerScrollableArea::ScrollbarManager::scrollableArea() { |
| 1901 return toPaintLayerScrollableArea(m_scrollableArea.get()); | 1895 return toPaintLayerScrollableArea(m_scrollableArea.get()); |
| 1902 } | 1896 } |
| 1903 | 1897 |
| 1904 void PaintLayerScrollableArea::ScrollbarManager::destroyDetachedScrollbars() { | 1898 void PaintLayerScrollableArea::ScrollbarManager::destroyDetachedScrollbars() { |
| 1905 DCHECK(!m_hBarIsAttached || m_hBar); | 1899 DCHECK(!m_hBarIsAttached || m_hBar); |
| 1906 DCHECK(!m_vBarIsAttached || m_vBar); | 1900 DCHECK(!m_vBarIsAttached || m_vBar); |
| (...skipping 198 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 2105 | 2099 |
| 2106 void PaintLayerScrollableArea::DelayScrollOffsetClampScope:: | 2100 void PaintLayerScrollableArea::DelayScrollOffsetClampScope:: |
| 2107 clampScrollableAreas() { | 2101 clampScrollableAreas() { |
| 2108 for (auto& scrollableArea : *s_needsClamp) | 2102 for (auto& scrollableArea : *s_needsClamp) |
| 2109 scrollableArea->clampScrollOffsetAfterOverflowChange(); | 2103 scrollableArea->clampScrollOffsetAfterOverflowChange(); |
| 2110 delete s_needsClamp; | 2104 delete s_needsClamp; |
| 2111 s_needsClamp = nullptr; | 2105 s_needsClamp = nullptr; |
| 2112 } | 2106 } |
| 2113 | 2107 |
| 2114 } // namespace blink | 2108 } // namespace blink |
| OLD | NEW |