| OLD | NEW |
| 1 /* | 1 /* |
| 2 * Copyright (C) 2006, 2007, 2008, 2009, 2010, 2011, 2012 Apple Inc. All rights
reserved. | 2 * Copyright (C) 2006, 2007, 2008, 2009, 2010, 2011, 2012 Apple Inc. All rights
reserved. |
| 3 * | 3 * |
| 4 * Portions are Copyright (C) 1998 Netscape Communications Corporation. | 4 * Portions are Copyright (C) 1998 Netscape Communications Corporation. |
| 5 * | 5 * |
| 6 * Other contributors: | 6 * Other contributors: |
| 7 * Robert O'Callahan <roc+@cs.cmu.edu> | 7 * Robert O'Callahan <roc+@cs.cmu.edu> |
| 8 * David Baron <dbaron@fas.harvard.edu> | 8 * David Baron <dbaron@fas.harvard.edu> |
| 9 * Christian Biesinger <cbiesinger@gmail.com> | 9 * Christian Biesinger <cbiesinger@gmail.com> |
| 10 * Randall Jesup <rjesup@wgate.com> | 10 * Randall Jesup <rjesup@wgate.com> |
| (...skipping 713 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 724 | 724 |
| 725 bool hasOverflow = hasScrollableHorizontalOverflow() || hasScrollableVertica
lOverflow(); | 725 bool hasOverflow = hasScrollableHorizontalOverflow() || hasScrollableVertica
lOverflow(); |
| 726 updateScrollableAreaSet(hasOverflow); | 726 updateScrollableAreaSet(hasOverflow); |
| 727 | 727 |
| 728 DisableCompositingQueryAsserts disabler; | 728 DisableCompositingQueryAsserts disabler; |
| 729 positionOverflowControls(); | 729 positionOverflowControls(); |
| 730 } | 730 } |
| 731 | 731 |
| 732 ScrollBehavior PaintLayerScrollableArea::scrollBehaviorStyle() const | 732 ScrollBehavior PaintLayerScrollableArea::scrollBehaviorStyle() const |
| 733 { | 733 { |
| 734 return box().style()->scrollBehavior(); | 734 return box().style()->getScrollBehavior(); |
| 735 } | 735 } |
| 736 | 736 |
| 737 bool PaintLayerScrollableArea::hasHorizontalOverflow() const | 737 bool PaintLayerScrollableArea::hasHorizontalOverflow() const |
| 738 { | 738 { |
| 739 return pixelSnappedScrollWidth() > box().pixelSnappedClientWidth(); | 739 return pixelSnappedScrollWidth() > box().pixelSnappedClientWidth(); |
| 740 } | 740 } |
| 741 | 741 |
| 742 bool PaintLayerScrollableArea::hasVerticalOverflow() const | 742 bool PaintLayerScrollableArea::hasVerticalOverflow() const |
| 743 { | 743 { |
| 744 return pixelSnappedScrollHeight() > box().pixelSnappedClientHeight(); | 744 return pixelSnappedScrollHeight() > box().pixelSnappedClientHeight(); |
| (...skipping 804 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1549 } | 1549 } |
| 1550 | 1550 |
| 1551 DEFINE_TRACE(PaintLayerScrollableArea::ScrollbarManager) | 1551 DEFINE_TRACE(PaintLayerScrollableArea::ScrollbarManager) |
| 1552 { | 1552 { |
| 1553 visitor->trace(m_scrollableArea); | 1553 visitor->trace(m_scrollableArea); |
| 1554 visitor->trace(m_hBar); | 1554 visitor->trace(m_hBar); |
| 1555 visitor->trace(m_vBar); | 1555 visitor->trace(m_vBar); |
| 1556 } | 1556 } |
| 1557 | 1557 |
| 1558 } // namespace blink | 1558 } // namespace blink |
| OLD | NEW |