| 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@web.de> | 9 * Christian Biesinger <cbiesinger@web.de> |
| 10 * Randall Jesup <rjesup@wgate.com> | 10 * Randall Jesup <rjesup@wgate.com> |
| (...skipping 884 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 895 return IntRect(); | 895 return IntRect(); |
| 896 | 896 |
| 897 const IntRect& scrollCorner = scrollCornerRect(); | 897 const IntRect& scrollCorner = scrollCornerRect(); |
| 898 | 898 |
| 899 return IntRect(verticalScrollbarStart(borderBoxRect.x(), borderBoxRect.maxX(
)), | 899 return IntRect(verticalScrollbarStart(borderBoxRect.x(), borderBoxRect.maxX(
)), |
| 900 borderBoxRect.y() + box().borderTop(), | 900 borderBoxRect.y() + box().borderTop(), |
| 901 verticalScrollbar()->width(), | 901 verticalScrollbar()->width(), |
| 902 borderBoxRect.height() - (box().borderTop() + box().borderBottom()) - sc
rollCorner.height()); | 902 borderBoxRect.height() - (box().borderTop() + box().borderBottom()) - sc
rollCorner.height()); |
| 903 } | 903 } |
| 904 | 904 |
| 905 LayoutUnit PaintLayerScrollableArea::verticalScrollbarStart(int minX, int maxX)
const | 905 int PaintLayerScrollableArea::verticalScrollbarStart(int minX, int maxX) const |
| 906 { | 906 { |
| 907 if (box().shouldPlaceBlockDirectionScrollbarOnLogicalLeft()) | 907 if (box().shouldPlaceBlockDirectionScrollbarOnLogicalLeft()) |
| 908 return minX + box().borderLeft(); | 908 return minX + box().borderLeft(); |
| 909 return maxX - box().borderRight() - verticalScrollbar()->width(); | 909 return maxX - box().borderRight() - verticalScrollbar()->width(); |
| 910 } | 910 } |
| 911 | 911 |
| 912 LayoutUnit PaintLayerScrollableArea::horizontalScrollbarStart(int minX) const | 912 int PaintLayerScrollableArea::horizontalScrollbarStart(int minX) const |
| 913 { | 913 { |
| 914 int x = minX + box().borderLeft(); | 914 int x = minX + box().borderLeft(); |
| 915 if (box().shouldPlaceBlockDirectionScrollbarOnLogicalLeft()) | 915 if (box().shouldPlaceBlockDirectionScrollbarOnLogicalLeft()) |
| 916 x += hasVerticalScrollbar() ? verticalScrollbar()->width() : resizerCorn
erRect(box().pixelSnappedBorderBoxRect(), ResizerForPointer).width(); | 916 x += hasVerticalScrollbar() ? verticalScrollbar()->width() : resizerCorn
erRect(box().pixelSnappedBorderBoxRect(), ResizerForPointer).width(); |
| 917 return x; | 917 return x; |
| 918 } | 918 } |
| 919 | 919 |
| 920 IntSize PaintLayerScrollableArea::scrollbarOffset(const Scrollbar& scrollbar) co
nst | 920 IntSize PaintLayerScrollableArea::scrollbarOffset(const Scrollbar& scrollbar) co
nst |
| 921 { | 921 { |
| 922 if (&scrollbar == verticalScrollbar()) | 922 if (&scrollbar == verticalScrollbar()) |
| (...skipping 622 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1545 } | 1545 } |
| 1546 | 1546 |
| 1547 DEFINE_TRACE(PaintLayerScrollableArea::ScrollbarManager) | 1547 DEFINE_TRACE(PaintLayerScrollableArea::ScrollbarManager) |
| 1548 { | 1548 { |
| 1549 visitor->trace(m_scrollableArea); | 1549 visitor->trace(m_scrollableArea); |
| 1550 visitor->trace(m_hBar); | 1550 visitor->trace(m_hBar); |
| 1551 visitor->trace(m_vBar); | 1551 visitor->trace(m_vBar); |
| 1552 } | 1552 } |
| 1553 | 1553 |
| 1554 } // namespace blink | 1554 } // namespace blink |
| OLD | NEW |