| OLD | NEW |
| 1 /* | 1 /* |
| 2 * Copyright (C) 2006, 2007, 2008, 2009, 2010, 2011, 2012 Apple Inc. All rights
reserved. | 2 * Copyright (C) 2006, 2007, 2008, 2009, 2010, 2011, 2012 Apple Inc. All rights
reserved. |
| 3 * | 3 * |
| 4 * Portions are Copyright (C) 1998 Netscape Communications Corporation. | 4 * Portions are Copyright (C) 1998 Netscape Communications Corporation. |
| 5 * | 5 * |
| 6 * Other contributors: | 6 * Other contributors: |
| 7 * Robert O'Callahan <roc+@cs.cmu.edu> | 7 * Robert O'Callahan <roc+@cs.cmu.edu> |
| 8 * David Baron <dbaron@fas.harvard.edu> | 8 * David Baron <dbaron@fas.harvard.edu> |
| 9 * Christian Biesinger <cbiesinger@web.de> | 9 * Christian Biesinger <cbiesinger@web.de> |
| 10 * Randall Jesup <rjesup@wgate.com> | 10 * Randall Jesup <rjesup@wgate.com> |
| (...skipping 2191 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 2202 } | 2202 } |
| 2203 | 2203 |
| 2204 if (!m_compositedDeprecatedPaintLayerMapping) | 2204 if (!m_compositedDeprecatedPaintLayerMapping) |
| 2205 return NotComposited; | 2205 return NotComposited; |
| 2206 | 2206 |
| 2207 return PaintsIntoOwnBacking; | 2207 return PaintsIntoOwnBacking; |
| 2208 } | 2208 } |
| 2209 | 2209 |
| 2210 bool DeprecatedPaintLayer::isAllowedToQueryCompositingState() const | 2210 bool DeprecatedPaintLayer::isAllowedToQueryCompositingState() const |
| 2211 { | 2211 { |
| 2212 if (gCompositingQueryMode == CompositingQueriesAreAllowed) | 2212 if (gCompositingQueryMode == CompositingQueriesAreAllowed || RuntimeEnabledF
eatures::slimmingPaintV2Enabled()) |
| 2213 return true; | 2213 return true; |
| 2214 return layoutObject()->document().lifecycle().state() >= DocumentLifecycle::
InCompositingUpdate; | 2214 return layoutObject()->document().lifecycle().state() >= DocumentLifecycle::
InCompositingUpdate; |
| 2215 } | 2215 } |
| 2216 | 2216 |
| 2217 CompositedDeprecatedPaintLayerMapping* DeprecatedPaintLayer::compositedDeprecate
dPaintLayerMapping() const | 2217 CompositedDeprecatedPaintLayerMapping* DeprecatedPaintLayer::compositedDeprecate
dPaintLayerMapping() const |
| 2218 { | 2218 { |
| 2219 ASSERT(isAllowedToQueryCompositingState()); | 2219 ASSERT(isAllowedToQueryCompositingState()); |
| 2220 return m_compositedDeprecatedPaintLayerMapping.get(); | 2220 return m_compositedDeprecatedPaintLayerMapping.get(); |
| 2221 } | 2221 } |
| 2222 | 2222 |
| (...skipping 437 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 2660 | 2660 |
| 2661 void showLayerTree(const blink::LayoutObject* layoutObject) | 2661 void showLayerTree(const blink::LayoutObject* layoutObject) |
| 2662 { | 2662 { |
| 2663 if (!layoutObject) { | 2663 if (!layoutObject) { |
| 2664 fprintf(stderr, "Cannot showLayerTree. Root is (nil)\n"); | 2664 fprintf(stderr, "Cannot showLayerTree. Root is (nil)\n"); |
| 2665 return; | 2665 return; |
| 2666 } | 2666 } |
| 2667 showLayerTree(layoutObject->enclosingLayer()); | 2667 showLayerTree(layoutObject->enclosingLayer()); |
| 2668 } | 2668 } |
| 2669 #endif | 2669 #endif |
| OLD | NEW |