| 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 1700 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1711 scrollParent = 0; | 1711 scrollParent = 0; |
| 1712 break; | 1712 break; |
| 1713 } | 1713 } |
| 1714 } | 1714 } |
| 1715 | 1715 |
| 1716 return scrollParent; | 1716 return scrollParent; |
| 1717 } | 1717 } |
| 1718 | 1718 |
| 1719 RenderLayer* RenderLayer::clipParent() const | 1719 RenderLayer* RenderLayer::clipParent() const |
| 1720 { | 1720 { |
| 1721 if (compositingReasons() & CompositingReasonOutOfFlowClipping && !compositor
()->clippedByAncestor(this)) { | 1721 if (compositingReasons() & CompositingReasonOutOfFlowClipping && !compositor
()->clippedByNonAncestorInStackingTree(this)) { |
| 1722 if (RenderObject* containingBlock = renderer()->containingBlock()) | 1722 if (RenderObject* containingBlock = renderer()->containingBlock()) |
| 1723 return containingBlock->enclosingLayer()->enclosingCompositingLayer(
); | 1723 return containingBlock->enclosingLayer()->enclosingCompositingLayer(
); |
| 1724 } | 1724 } |
| 1725 return 0; | 1725 return 0; |
| 1726 } | 1726 } |
| 1727 | 1727 |
| 1728 void RenderLayer::didUpdateNeedsCompositedScrolling() | 1728 void RenderLayer::didUpdateNeedsCompositedScrolling() |
| 1729 { | 1729 { |
| 1730 m_stackingNode->updateIsNormalFlowOnly(); | 1730 m_stackingNode->updateIsNormalFlowOnly(); |
| 1731 updateSelfPaintingLayer(); | 1731 updateSelfPaintingLayer(); |
| (...skipping 2284 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 4016 } | 4016 } |
| 4017 } | 4017 } |
| 4018 | 4018 |
| 4019 void showLayerTree(const WebCore::RenderObject* renderer) | 4019 void showLayerTree(const WebCore::RenderObject* renderer) |
| 4020 { | 4020 { |
| 4021 if (!renderer) | 4021 if (!renderer) |
| 4022 return; | 4022 return; |
| 4023 showLayerTree(renderer->enclosingLayer()); | 4023 showLayerTree(renderer->enclosingLayer()); |
| 4024 } | 4024 } |
| 4025 #endif | 4025 #endif |
| OLD | NEW |