| 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 2394 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 2405 } | 2405 } |
| 2406 | 2406 |
| 2407 CompositingState RenderLayer::compositingState() const | 2407 CompositingState RenderLayer::compositingState() const |
| 2408 { | 2408 { |
| 2409 ASSERT(isAllowedToQueryCompositingState()); | 2409 ASSERT(isAllowedToQueryCompositingState()); |
| 2410 | 2410 |
| 2411 // This is computed procedurally so there is no redundant state variable tha
t | 2411 // This is computed procedurally so there is no redundant state variable tha
t |
| 2412 // can get out of sync from the real actual compositing state. | 2412 // can get out of sync from the real actual compositing state. |
| 2413 | 2413 |
| 2414 if (m_groupedMapping) { | 2414 if (m_groupedMapping) { |
| 2415 ASSERT(compositor()->layerSquashingEnabled()); | |
| 2416 ASSERT(!m_compositedLayerMapping); | 2415 ASSERT(!m_compositedLayerMapping); |
| 2417 return PaintsIntoGroupedBacking; | 2416 return PaintsIntoGroupedBacking; |
| 2418 } | 2417 } |
| 2419 | 2418 |
| 2420 if (!m_compositedLayerMapping) | 2419 if (!m_compositedLayerMapping) |
| 2421 return NotComposited; | 2420 return NotComposited; |
| 2422 | 2421 |
| 2423 return PaintsIntoOwnBacking; | 2422 return PaintsIntoOwnBacking; |
| 2424 } | 2423 } |
| 2425 | 2424 |
| (...skipping 450 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 2876 } | 2875 } |
| 2877 } | 2876 } |
| 2878 | 2877 |
| 2879 void showLayerTree(const blink::RenderObject* renderer) | 2878 void showLayerTree(const blink::RenderObject* renderer) |
| 2880 { | 2879 { |
| 2881 if (!renderer) | 2880 if (!renderer) |
| 2882 return; | 2881 return; |
| 2883 showLayerTree(renderer->enclosingLayer()); | 2882 showLayerTree(renderer->enclosingLayer()); |
| 2884 } | 2883 } |
| 2885 #endif | 2884 #endif |
| OLD | NEW |