| 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 668 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 679 | 679 |
| 680 // Force an update since we know the scrollbars have changed things. | 680 // Force an update since we know the scrollbars have changed things. |
| 681 if (box().document().hasAnnotatedRegions()) | 681 if (box().document().hasAnnotatedRegions()) |
| 682 box().document().setAnnotatedRegionsDirty(true); | 682 box().document().setAnnotatedRegionsDirty(true); |
| 683 | 683 |
| 684 // Our proprietary overflow: overlay value doesn't trigger a layout. | 684 // Our proprietary overflow: overlay value doesn't trigger a layout. |
| 685 if ((horizontalScrollBarChanged && box().style()->overflowX() != OOVERLA
Y) || (verticalScrollBarChanged && box().style()->overflowY() != OOVERLAY)) { | 685 if ((horizontalScrollBarChanged && box().style()->overflowX() != OOVERLA
Y) || (verticalScrollBarChanged && box().style()->overflowY() != OOVERLAY)) { |
| 686 if (!m_inOverflowRelayout) { | 686 if (!m_inOverflowRelayout) { |
| 687 m_inOverflowRelayout = true; | 687 m_inOverflowRelayout = true; |
| 688 if (delayedLayoutScope) { | 688 if (delayedLayoutScope) { |
| 689 if (box().isLayoutBlock()) |
| 690 toLayoutBlock(box()).scrollbarsChanged(horizontalScrollB
arChanged, verticalScrollBarChanged); |
| 689 delayedLayoutScope->setNeedsLayout(&box(), LayoutInvalidatio
nReason::ScrollbarChanged); | 691 delayedLayoutScope->setNeedsLayout(&box(), LayoutInvalidatio
nReason::ScrollbarChanged); |
| 690 didMarkForDelayedLayout = true; | 692 didMarkForDelayedLayout = true; |
| 691 } else { | 693 } else { |
| 692 SubtreeLayoutScope layoutScope(box()); | 694 SubtreeLayoutScope layoutScope(box()); |
| 693 layoutScope.setNeedsLayout(&box(), LayoutInvalidationReason:
:ScrollbarChanged); | 695 layoutScope.setNeedsLayout(&box(), LayoutInvalidationReason:
:ScrollbarChanged); |
| 694 if (box().isLayoutBlock()) { | 696 if (box().isLayoutBlock()) { |
| 695 LayoutBlock& block = toLayoutBlock(box()); | 697 LayoutBlock& block = toLayoutBlock(box()); |
| 696 block.scrollbarsChanged(horizontalScrollBarChanged, vert
icalScrollBarChanged); | 698 block.scrollbarsChanged(horizontalScrollBarChanged, vert
icalScrollBarChanged); |
| 697 block.layoutBlock(true); | 699 block.layoutBlock(true); |
| 698 } else { | 700 } else { |
| (...skipping 880 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1579 } | 1581 } |
| 1580 | 1582 |
| 1581 DEFINE_TRACE(PaintLayerScrollableArea::ScrollbarManager) | 1583 DEFINE_TRACE(PaintLayerScrollableArea::ScrollbarManager) |
| 1582 { | 1584 { |
| 1583 visitor->trace(m_scrollableArea); | 1585 visitor->trace(m_scrollableArea); |
| 1584 visitor->trace(m_hBar); | 1586 visitor->trace(m_hBar); |
| 1585 visitor->trace(m_vBar); | 1587 visitor->trace(m_vBar); |
| 1586 } | 1588 } |
| 1587 | 1589 |
| 1588 } // namespace blink | 1590 } // namespace blink |
| OLD | NEW |