Chromium Code Reviews| 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 2656 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 2667 } | 2667 } |
| 2668 if (m_rareData || groupedMapping) | 2668 if (m_rareData || groupedMapping) |
| 2669 ensureRareData().groupedMapping = groupedMapping; | 2669 ensureRareData().groupedMapping = groupedMapping; |
| 2670 #if DCHECK_IS_ON() | 2670 #if DCHECK_IS_ON() |
| 2671 DCHECK(!groupedMapping || groupedMapping->verifyLayerInSquashingVector(this)); | 2671 DCHECK(!groupedMapping || groupedMapping->verifyLayerInSquashingVector(this)); |
| 2672 #endif | 2672 #endif |
| 2673 if (options == InvalidateLayerAndRemoveFromMapping && groupedMapping) | 2673 if (options == InvalidateLayerAndRemoveFromMapping && groupedMapping) |
| 2674 groupedMapping->setNeedsGraphicsLayerUpdate(GraphicsLayerUpdateSubtree); | 2674 groupedMapping->setNeedsGraphicsLayerUpdate(GraphicsLayerUpdateSubtree); |
| 2675 } | 2675 } |
| 2676 | 2676 |
| 2677 bool PaintLayer::hasCompositedMask() const { | 2677 bool PaintLayer::hasCompositedMask() const { |
|
trchen
2017/01/21 01:27:08
Is it obvious to you why this change is needed? I
chrishtr
2017/01/24 01:16:28
Maybe just rename the method to something like app
trchen
2017/02/11 02:35:45
"maskBlendingAppliedByCompositor" to avoid negatio
| |
| 2678 DCHECK(m_layoutObject->hasMask()); | |
| 2679 if (RuntimeEnabledFeatures::slimmingPaintV2Enabled()) | |
| 2680 return true; | |
| 2678 return m_rareData && m_rareData->compositedLayerMapping && | 2681 return m_rareData && m_rareData->compositedLayerMapping && |
| 2679 m_rareData->compositedLayerMapping->hasMaskLayer(); | 2682 m_rareData->compositedLayerMapping->hasMaskLayer(); |
| 2680 } | 2683 } |
| 2681 | 2684 |
| 2682 bool PaintLayer::hasCompositedClippingMask() const { | 2685 bool PaintLayer::hasCompositedClippingMask() const { |
| 2683 return m_rareData && m_rareData->compositedLayerMapping && | 2686 return m_rareData && m_rareData->compositedLayerMapping && |
| 2684 m_rareData->compositedLayerMapping->hasChildClippingMaskLayer(); | 2687 m_rareData->compositedLayerMapping->hasChildClippingMaskLayer(); |
| 2685 } | 2688 } |
| 2686 | 2689 |
| 2687 bool PaintLayer::paintsWithTransform(GlobalPaintFlags globalPaintFlags) const { | 2690 bool PaintLayer::paintsWithTransform(GlobalPaintFlags globalPaintFlags) const { |
| (...skipping 533 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 3221 } | 3224 } |
| 3222 | 3225 |
| 3223 void showLayerTree(const blink::LayoutObject* layoutObject) { | 3226 void showLayerTree(const blink::LayoutObject* layoutObject) { |
| 3224 if (!layoutObject) { | 3227 if (!layoutObject) { |
| 3225 LOG(INFO) << "Cannot showLayerTree. Root is (nil)"; | 3228 LOG(INFO) << "Cannot showLayerTree. Root is (nil)"; |
| 3226 return; | 3229 return; |
| 3227 } | 3230 } |
| 3228 showLayerTree(layoutObject->enclosingLayer()); | 3231 showLayerTree(layoutObject->enclosingLayer()); |
| 3229 } | 3232 } |
| 3230 #endif | 3233 #endif |
| OLD | NEW |