| OLD | NEW |
| 1 /* | 1 /* |
| 2 * Copyright (C) 2006, 2007, 2008, 2009, 2010, 2011, 2012 Apple Inc. All rights | 2 * Copyright (C) 2006, 2007, 2008, 2009, 2010, 2011, 2012 Apple Inc. All rights |
| 3 * reserved. | 3 * reserved. |
| 4 * | 4 * |
| 5 * Portions are Copyright (C) 1998 Netscape Communications Corporation. | 5 * Portions are Copyright (C) 1998 Netscape Communications Corporation. |
| 6 * | 6 * |
| 7 * Other contributors: | 7 * Other contributors: |
| 8 * Robert O'Callahan <roc+@cs.cmu.edu> | 8 * Robert O'Callahan <roc+@cs.cmu.edu> |
| 9 * David Baron <dbaron@fas.harvard.edu> | 9 * David Baron <dbaron@fas.harvard.edu> |
| 10 * Christian Biesinger <cbiesinger@web.de> | 10 * Christian Biesinger <cbiesinger@web.de> |
| (...skipping 2568 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 2579 case PaintsIntoGroupedBacking: | 2579 case PaintsIntoGroupedBacking: |
| 2580 return groupedMapping()->squashingLayer(); | 2580 return groupedMapping()->squashingLayer(); |
| 2581 default: | 2581 default: |
| 2582 return (obj != layoutObject() && | 2582 return (obj != layoutObject() && |
| 2583 compositedLayerMapping()->scrollingContentsLayer()) | 2583 compositedLayerMapping()->scrollingContentsLayer()) |
| 2584 ? compositedLayerMapping()->scrollingContentsLayer() | 2584 ? compositedLayerMapping()->scrollingContentsLayer() |
| 2585 : compositedLayerMapping()->mainGraphicsLayer(); | 2585 : compositedLayerMapping()->mainGraphicsLayer(); |
| 2586 } | 2586 } |
| 2587 } | 2587 } |
| 2588 | 2588 |
| 2589 BackgroundPaintLocation PaintLayer::backgroundPaintLocation() const { | 2589 BackgroundPaintLocation PaintLayer::backgroundPaintLocation( |
| 2590 uint32_t* reasons) const { |
| 2590 BackgroundPaintLocation location = | 2591 BackgroundPaintLocation location = |
| 2591 isRootLayer() || !scrollsOverflow() | 2592 isRootLayer() || !scrollsOverflow() |
| 2592 ? BackgroundPaintInGraphicsLayer | 2593 ? BackgroundPaintInGraphicsLayer |
| 2593 : layoutObject()->backgroundPaintLocation(); | 2594 : layoutObject()->backgroundPaintLocation(reasons); |
| 2594 m_stackingNode->updateLayerListsIfNeeded(); | 2595 m_stackingNode->updateLayerListsIfNeeded(); |
| 2595 if (m_stackingNode->hasNegativeZOrderList()) | 2596 if (m_stackingNode->hasNegativeZOrderList()) |
| 2596 location = BackgroundPaintInGraphicsLayer; | 2597 location = BackgroundPaintInGraphicsLayer; |
| 2597 return location; | 2598 return location; |
| 2598 } | 2599 } |
| 2599 | 2600 |
| 2600 void PaintLayer::ensureCompositedLayerMapping() { | 2601 void PaintLayer::ensureCompositedLayerMapping() { |
| 2601 if (m_rareData && m_rareData->compositedLayerMapping) | 2602 if (m_rareData && m_rareData->compositedLayerMapping) |
| 2602 return; | 2603 return; |
| 2603 | 2604 |
| (...skipping 587 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 3191 } | 3192 } |
| 3192 | 3193 |
| 3193 void showLayerTree(const blink::LayoutObject* layoutObject) { | 3194 void showLayerTree(const blink::LayoutObject* layoutObject) { |
| 3194 if (!layoutObject) { | 3195 if (!layoutObject) { |
| 3195 LOG(INFO) << "Cannot showLayerTree. Root is (nil)"; | 3196 LOG(INFO) << "Cannot showLayerTree. Root is (nil)"; |
| 3196 return; | 3197 return; |
| 3197 } | 3198 } |
| 3198 showLayerTree(layoutObject->enclosingLayer()); | 3199 showLayerTree(layoutObject->enclosingLayer()); |
| 3199 } | 3200 } |
| 3200 #endif | 3201 #endif |
| OLD | NEW |