| 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 2578 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 2589 case PaintsIntoGroupedBacking: | 2589 case PaintsIntoGroupedBacking: |
| 2590 return groupedMapping()->squashingLayer(); | 2590 return groupedMapping()->squashingLayer(); |
| 2591 default: | 2591 default: |
| 2592 return (obj != layoutObject() && | 2592 return (obj != layoutObject() && |
| 2593 compositedLayerMapping()->scrollingContentsLayer()) | 2593 compositedLayerMapping()->scrollingContentsLayer()) |
| 2594 ? compositedLayerMapping()->scrollingContentsLayer() | 2594 ? compositedLayerMapping()->scrollingContentsLayer() |
| 2595 : compositedLayerMapping()->mainGraphicsLayer(); | 2595 : compositedLayerMapping()->mainGraphicsLayer(); |
| 2596 } | 2596 } |
| 2597 } | 2597 } |
| 2598 | 2598 |
| 2599 BackgroundPaintLocation PaintLayer::backgroundPaintLocation() const { | 2599 BackgroundPaintLocation PaintLayer::backgroundPaintLocation( |
| 2600 uint32_t* reasons) const { |
| 2600 BackgroundPaintLocation location; | 2601 BackgroundPaintLocation location; |
| 2601 if (!scrollsOverflow()) { | 2602 if (!scrollsOverflow()) { |
| 2602 location = BackgroundPaintInGraphicsLayer; | 2603 location = BackgroundPaintInGraphicsLayer; |
| 2603 } else if (RuntimeEnabledFeatures::rootLayerScrollingEnabled()) { | 2604 } else if (RuntimeEnabledFeatures::rootLayerScrollingEnabled()) { |
| 2604 location = layoutObject()->backgroundPaintLocation(); | 2605 location = layoutObject()->backgroundPaintLocation(reasons); |
| 2605 } else { | 2606 } else { |
| 2606 location = isRootLayer() ? BackgroundPaintInGraphicsLayer | 2607 location = isRootLayer() ? BackgroundPaintInGraphicsLayer |
| 2607 : layoutObject()->backgroundPaintLocation(); | 2608 : layoutObject()->backgroundPaintLocation(reasons); |
| 2608 } | 2609 } |
| 2609 m_stackingNode->updateLayerListsIfNeeded(); | 2610 m_stackingNode->updateLayerListsIfNeeded(); |
| 2610 if (m_stackingNode->hasNegativeZOrderList()) | 2611 if (m_stackingNode->hasNegativeZOrderList()) |
| 2611 location = BackgroundPaintInGraphicsLayer; | 2612 location = BackgroundPaintInGraphicsLayer; |
| 2612 return location; | 2613 return location; |
| 2613 } | 2614 } |
| 2614 | 2615 |
| 2615 void PaintLayer::ensureCompositedLayerMapping() { | 2616 void PaintLayer::ensureCompositedLayerMapping() { |
| 2616 if (m_rareData && m_rareData->compositedLayerMapping) | 2617 if (m_rareData && m_rareData->compositedLayerMapping) |
| 2617 return; | 2618 return; |
| (...skipping 599 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 3217 } | 3218 } |
| 3218 | 3219 |
| 3219 void showLayerTree(const blink::LayoutObject* layoutObject) { | 3220 void showLayerTree(const blink::LayoutObject* layoutObject) { |
| 3220 if (!layoutObject) { | 3221 if (!layoutObject) { |
| 3221 LOG(INFO) << "Cannot showLayerTree. Root is (nil)"; | 3222 LOG(INFO) << "Cannot showLayerTree. Root is (nil)"; |
| 3222 return; | 3223 return; |
| 3223 } | 3224 } |
| 3224 showLayerTree(layoutObject->enclosingLayer()); | 3225 showLayerTree(layoutObject->enclosingLayer()); |
| 3225 } | 3226 } |
| 3226 #endif | 3227 #endif |
| OLD | NEW |