| 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 186 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 197 if (groupedMapping()) { | 197 if (groupedMapping()) { |
| 198 DisableCompositingQueryAsserts disabler; | 198 DisableCompositingQueryAsserts disabler; |
| 199 setGroupedMapping(0, InvalidateLayerAndRemoveFromMapping); | 199 setGroupedMapping(0, InvalidateLayerAndRemoveFromMapping); |
| 200 } | 200 } |
| 201 | 201 |
| 202 // Child layers will be deleted by their corresponding layout objects, so | 202 // Child layers will be deleted by their corresponding layout objects, so |
| 203 // we don't need to delete them ourselves. | 203 // we don't need to delete them ourselves. |
| 204 | 204 |
| 205 clearCompositedLayerMapping(true); | 205 clearCompositedLayerMapping(true); |
| 206 | 206 |
| 207 if (PaintLayerReflectionInfo* reflectionInfo = this->reflectionInfo()) |
| 208 reflectionInfo->destroy(); |
| 209 |
| 207 if (m_scrollableArea) | 210 if (m_scrollableArea) |
| 208 m_scrollableArea->dispose(); | 211 m_scrollableArea->dispose(); |
| 209 } | 212 } |
| 210 | 213 |
| 211 String PaintLayer::debugName() const | 214 String PaintLayer::debugName() const |
| 212 { | 215 { |
| 213 if (isReflection()) | 216 if (isReflection()) |
| 214 return layoutObject()->parent()->debugName() + " (reflection)"; | 217 return layoutObject()->parent()->debugName() + " (reflection)"; |
| 215 return layoutObject()->debugName(); | 218 return layoutObject()->debugName(); |
| 216 } | 219 } |
| (...skipping 1199 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1416 LayoutBlockFlow::setAncestorShouldPaintFloatingObject(*layoutBox(), wasS
elfPaintingLayer); | 1419 LayoutBlockFlow::setAncestorShouldPaintFloatingObject(*layoutBox(), wasS
elfPaintingLayer); |
| 1417 } | 1420 } |
| 1418 | 1421 |
| 1419 void PaintLayer::updateReflectionInfo(const ComputedStyle* oldStyle) | 1422 void PaintLayer::updateReflectionInfo(const ComputedStyle* oldStyle) |
| 1420 { | 1423 { |
| 1421 ASSERT(!oldStyle || !layoutObject()->style()->reflectionDataEquivalent(oldSt
yle)); | 1424 ASSERT(!oldStyle || !layoutObject()->style()->reflectionDataEquivalent(oldSt
yle)); |
| 1422 if (layoutObject()->hasReflection()) { | 1425 if (layoutObject()->hasReflection()) { |
| 1423 ensureRareData().reflectionInfo = adoptPtr(new PaintLayerReflectionInfo(
*layoutBox())); | 1426 ensureRareData().reflectionInfo = adoptPtr(new PaintLayerReflectionInfo(
*layoutBox())); |
| 1424 m_rareData->reflectionInfo->updateAfterStyleChange(oldStyle); | 1427 m_rareData->reflectionInfo->updateAfterStyleChange(oldStyle); |
| 1425 } else if (m_rareData && m_rareData->reflectionInfo) { | 1428 } else if (m_rareData && m_rareData->reflectionInfo) { |
| 1429 m_rareData->reflectionInfo->destroy(); |
| 1426 m_rareData->reflectionInfo = nullptr; | 1430 m_rareData->reflectionInfo = nullptr; |
| 1427 } | 1431 } |
| 1428 } | 1432 } |
| 1429 | 1433 |
| 1430 void PaintLayer::updateStackingNode() | 1434 void PaintLayer::updateStackingNode() |
| 1431 { | 1435 { |
| 1432 ASSERT(!m_stackingNode); | 1436 ASSERT(!m_stackingNode); |
| 1433 if (requiresStackingNode()) | 1437 if (requiresStackingNode()) |
| 1434 m_stackingNode = adoptPtr(new PaintLayerStackingNode(this)); | 1438 m_stackingNode = adoptPtr(new PaintLayerStackingNode(this)); |
| 1435 else | 1439 else |
| (...skipping 1361 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 2797 | 2801 |
| 2798 void showLayerTree(const blink::LayoutObject* layoutObject) | 2802 void showLayerTree(const blink::LayoutObject* layoutObject) |
| 2799 { | 2803 { |
| 2800 if (!layoutObject) { | 2804 if (!layoutObject) { |
| 2801 fprintf(stderr, "Cannot showLayerTree. Root is (nil)\n"); | 2805 fprintf(stderr, "Cannot showLayerTree. Root is (nil)\n"); |
| 2802 return; | 2806 return; |
| 2803 } | 2807 } |
| 2804 showLayerTree(layoutObject->enclosingLayer()); | 2808 showLayerTree(layoutObject->enclosingLayer()); |
| 2805 } | 2809 } |
| 2806 #endif | 2810 #endif |
| OLD | NEW |