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