| 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 2649 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 2660 } | 2660 } |
| 2661 if (m_rareData || groupedMapping) | 2661 if (m_rareData || groupedMapping) |
| 2662 ensureRareData().groupedMapping = groupedMapping; | 2662 ensureRareData().groupedMapping = groupedMapping; |
| 2663 #if DCHECK_IS_ON() | 2663 #if DCHECK_IS_ON() |
| 2664 DCHECK(!groupedMapping || groupedMapping->verifyLayerInSquashingVector(this)); | 2664 DCHECK(!groupedMapping || groupedMapping->verifyLayerInSquashingVector(this)); |
| 2665 #endif | 2665 #endif |
| 2666 if (options == InvalidateLayerAndRemoveFromMapping && groupedMapping) | 2666 if (options == InvalidateLayerAndRemoveFromMapping && groupedMapping) |
| 2667 groupedMapping->setNeedsGraphicsLayerUpdate(GraphicsLayerUpdateSubtree); | 2667 groupedMapping->setNeedsGraphicsLayerUpdate(GraphicsLayerUpdateSubtree); |
| 2668 } | 2668 } |
| 2669 | 2669 |
| 2670 bool PaintLayer::hasCompositedMask() const { | 2670 bool PaintLayer::maskBlendingAppliedByCompositor() const { |
| 2671 DCHECK(m_layoutObject->hasMask()); |
| 2672 if (RuntimeEnabledFeatures::slimmingPaintV2Enabled()) |
| 2673 return true; |
| 2671 return m_rareData && m_rareData->compositedLayerMapping && | 2674 return m_rareData && m_rareData->compositedLayerMapping && |
| 2672 m_rareData->compositedLayerMapping->hasMaskLayer(); | 2675 m_rareData->compositedLayerMapping->hasMaskLayer(); |
| 2673 } | 2676 } |
| 2674 | 2677 |
| 2675 bool PaintLayer::hasCompositedClippingMask() const { | 2678 bool PaintLayer::hasCompositedClippingMask() const { |
| 2676 return m_rareData && m_rareData->compositedLayerMapping && | 2679 return m_rareData && m_rareData->compositedLayerMapping && |
| 2677 m_rareData->compositedLayerMapping->hasChildClippingMaskLayer(); | 2680 m_rareData->compositedLayerMapping->hasChildClippingMaskLayer(); |
| 2678 } | 2681 } |
| 2679 | 2682 |
| 2680 bool PaintLayer::paintsWithTransform(GlobalPaintFlags globalPaintFlags) const { | 2683 bool PaintLayer::paintsWithTransform(GlobalPaintFlags globalPaintFlags) const { |
| (...skipping 537 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 3218 } | 3221 } |
| 3219 | 3222 |
| 3220 void showLayerTree(const blink::LayoutObject* layoutObject) { | 3223 void showLayerTree(const blink::LayoutObject* layoutObject) { |
| 3221 if (!layoutObject) { | 3224 if (!layoutObject) { |
| 3222 LOG(INFO) << "Cannot showLayerTree. Root is (nil)"; | 3225 LOG(INFO) << "Cannot showLayerTree. Root is (nil)"; |
| 3223 return; | 3226 return; |
| 3224 } | 3227 } |
| 3225 showLayerTree(layoutObject->enclosingLayer()); | 3228 showLayerTree(layoutObject->enclosingLayer()); |
| 3226 } | 3229 } |
| 3227 #endif | 3230 #endif |
| OLD | NEW |