| 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 543 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 554 ancestorStackingContext->rebuildZOrderLists(posZOrderListBeforePromote, negZ
OrderListBeforePromote, this, OnlyStackingContextsCanBeStackingContainers); | 554 ancestorStackingContext->rebuildZOrderLists(posZOrderListBeforePromote, negZ
OrderListBeforePromote, this, OnlyStackingContextsCanBeStackingContainers); |
| 555 | 555 |
| 556 const RenderLayer* positionedAncestor = parent(); | 556 const RenderLayer* positionedAncestor = parent(); |
| 557 while (positionedAncestor && !isPositionedContainer(positionedAncestor) && !
positionedAncestor->isStackingContext()) | 557 while (positionedAncestor && !isPositionedContainer(positionedAncestor) && !
positionedAncestor->isStackingContext()) |
| 558 positionedAncestor = positionedAncestor->parent(); | 558 positionedAncestor = positionedAncestor->parent(); |
| 559 if (positionedAncestor && (!isPositionedContainer(positionedAncestor) || pos
itionedAncestor->isStackingContext())) | 559 if (positionedAncestor && (!isPositionedContainer(positionedAncestor) || pos
itionedAncestor->isStackingContext())) |
| 560 positionedAncestor = 0; | 560 positionedAncestor = 0; |
| 561 | 561 |
| 562 if (!posZOrderListBeforePromote) | 562 if (!posZOrderListBeforePromote) |
| 563 posZOrderListBeforePromote = adoptPtr(new Vector<RenderLayer*>()); | 563 posZOrderListBeforePromote = adoptPtr(new Vector<RenderLayer*>()); |
| 564 else if (posZOrderListBeforePromote->find(this) != notFound) | 564 else if (posZOrderListBeforePromote->find(this) != kNotFound) |
| 565 return; | 565 return; |
| 566 | 566 |
| 567 // The current layer will appear in the z-order lists after promotion, so | 567 // The current layer will appear in the z-order lists after promotion, so |
| 568 // for a meaningful comparison, we must insert it in the z-order lists | 568 // for a meaningful comparison, we must insert it in the z-order lists |
| 569 // before promotion if it does not appear there already. | 569 // before promotion if it does not appear there already. |
| 570 if (!positionedAncestor) { | 570 if (!positionedAncestor) { |
| 571 posZOrderListBeforePromote->prepend(this); | 571 posZOrderListBeforePromote->prepend(this); |
| 572 return; | 572 return; |
| 573 } | 573 } |
| 574 | 574 |
| (...skipping 5485 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 6060 } | 6060 } |
| 6061 } | 6061 } |
| 6062 | 6062 |
| 6063 void showLayerTree(const WebCore::RenderObject* renderer) | 6063 void showLayerTree(const WebCore::RenderObject* renderer) |
| 6064 { | 6064 { |
| 6065 if (!renderer) | 6065 if (!renderer) |
| 6066 return; | 6066 return; |
| 6067 showLayerTree(renderer->enclosingLayer()); | 6067 showLayerTree(renderer->enclosingLayer()); |
| 6068 } | 6068 } |
| 6069 #endif | 6069 #endif |
| OLD | NEW |