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 1519 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1530 LayoutPoint delta; | 1530 LayoutPoint delta; |
1531 convertToLayerCoords(ancestorLayer, delta); | 1531 convertToLayerCoords(ancestorLayer, delta); |
1532 rect.move(-delta.x(), -delta.y()); | 1532 rect.move(-delta.x(), -delta.y()); |
1533 } | 1533 } |
1534 | 1534 |
1535 void RenderLayer::didUpdateNeedsCompositedScrolling() | 1535 void RenderLayer::didUpdateNeedsCompositedScrolling() |
1536 { | 1536 { |
1537 updateSelfPaintingLayer(); | 1537 updateSelfPaintingLayer(); |
1538 } | 1538 } |
1539 | 1539 |
| 1540 bool RenderLayer::needsToReparentOverflowControls() const |
| 1541 { |
| 1542 return hasCompositedLayerMapping() |
| 1543 && scrollableArea() |
| 1544 && scrollableArea()->hasOverlayScrollbars() |
| 1545 && scrollableArea()->topmostScrollChild(); |
| 1546 } |
| 1547 |
1540 void RenderLayer::updateReflectionInfo(const RenderStyle* oldStyle) | 1548 void RenderLayer::updateReflectionInfo(const RenderStyle* oldStyle) |
1541 { | 1549 { |
1542 ASSERT(!oldStyle || !renderer()->style()->reflectionDataEquivalent(oldStyle)
); | 1550 ASSERT(!oldStyle || !renderer()->style()->reflectionDataEquivalent(oldStyle)
); |
1543 if (renderer()->hasReflection()) { | 1551 if (renderer()->hasReflection()) { |
1544 if (!m_reflectionInfo) | 1552 if (!m_reflectionInfo) |
1545 m_reflectionInfo = adoptPtr(new RenderLayerReflectionInfo(*renderBox
())); | 1553 m_reflectionInfo = adoptPtr(new RenderLayerReflectionInfo(*renderBox
())); |
1546 m_reflectionInfo->updateAfterStyleChange(oldStyle); | 1554 m_reflectionInfo->updateAfterStyleChange(oldStyle); |
1547 } else if (m_reflectionInfo) { | 1555 } else if (m_reflectionInfo) { |
1548 m_reflectionInfo = nullptr; | 1556 m_reflectionInfo = nullptr; |
1549 } | 1557 } |
(...skipping 2240 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
3790 } | 3798 } |
3791 } | 3799 } |
3792 | 3800 |
3793 void showLayerTree(const blink::RenderObject* renderer) | 3801 void showLayerTree(const blink::RenderObject* renderer) |
3794 { | 3802 { |
3795 if (!renderer) | 3803 if (!renderer) |
3796 return; | 3804 return; |
3797 showLayerTree(renderer->enclosingLayer()); | 3805 showLayerTree(renderer->enclosingLayer()); |
3798 } | 3806 } |
3799 #endif | 3807 #endif |
OLD | NEW |