| 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 634 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 645 m_hasVisibleNonLayerContent = false; | 645 m_hasVisibleNonLayerContent = false; |
| 646 for (RenderObject* r = renderer()->slowFirstChild(); r; r = r->nextSibling()
) { | 646 for (RenderObject* r = renderer()->slowFirstChild(); r; r = r->nextSibling()
) { |
| 647 if (!r->hasLayer()) { | 647 if (!r->hasLayer()) { |
| 648 m_hasVisibleNonLayerContent = true; | 648 m_hasVisibleNonLayerContent = true; |
| 649 break; | 649 break; |
| 650 } | 650 } |
| 651 } | 651 } |
| 652 | 652 |
| 653 m_hasNonCompositedChild = false; | 653 m_hasNonCompositedChild = false; |
| 654 for (RenderLayer* child = firstChild(); child; child = child->nextSibling())
{ | 654 for (RenderLayer* child = firstChild(); child; child = child->nextSibling())
{ |
| 655 if (child->compositingState() == NotComposited || child->compositingStat
e() == HasOwnBackingButPaintsIntoAncestor) { | 655 if (child->compositingState() == NotComposited) { |
| 656 m_hasNonCompositedChild = true; | 656 m_hasNonCompositedChild = true; |
| 657 return; | 657 return; |
| 658 } | 658 } |
| 659 } | 659 } |
| 660 } | 660 } |
| 661 | 661 |
| 662 // The descendant-dependent flags system is badly broken because we clean dirty | 662 // The descendant-dependent flags system is badly broken because we clean dirty |
| 663 // bits in upward tree walks, which means we need to call updateDescendantDepend
entFlags | 663 // bits in upward tree walks, which means we need to call updateDescendantDepend
entFlags |
| 664 // at every node in the tree to fully clean all the dirty bits. While we'll in | 664 // at every node in the tree to fully clean all the dirty bits. While we'll in |
| 665 // the process of fixing this issue, updateDescendantDependentFlagsForEntireSubt
ree | 665 // the process of fixing this issue, updateDescendantDependentFlagsForEntireSubt
ree |
| (...skipping 1725 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 2391 | 2391 |
| 2392 if (m_groupedMapping) { | 2392 if (m_groupedMapping) { |
| 2393 ASSERT(compositor()->layerSquashingEnabled()); | 2393 ASSERT(compositor()->layerSquashingEnabled()); |
| 2394 ASSERT(!m_compositedLayerMapping); | 2394 ASSERT(!m_compositedLayerMapping); |
| 2395 return PaintsIntoGroupedBacking; | 2395 return PaintsIntoGroupedBacking; |
| 2396 } | 2396 } |
| 2397 | 2397 |
| 2398 if (!m_compositedLayerMapping) | 2398 if (!m_compositedLayerMapping) |
| 2399 return NotComposited; | 2399 return NotComposited; |
| 2400 | 2400 |
| 2401 if (compositedLayerMapping()->paintsIntoCompositedAncestor()) | |
| 2402 return HasOwnBackingButPaintsIntoAncestor; | |
| 2403 | |
| 2404 return PaintsIntoOwnBacking; | 2401 return PaintsIntoOwnBacking; |
| 2405 } | 2402 } |
| 2406 | 2403 |
| 2407 bool RenderLayer::isAllowedToQueryCompositingState() const | 2404 bool RenderLayer::isAllowedToQueryCompositingState() const |
| 2408 { | 2405 { |
| 2409 if (gCompositingQueryMode == CompositingQueriesAreAllowed) | 2406 if (gCompositingQueryMode == CompositingQueriesAreAllowed) |
| 2410 return true; | 2407 return true; |
| 2411 return renderer()->document().lifecycle().state() >= DocumentLifecycle::InCo
mpositingUpdate; | 2408 return renderer()->document().lifecycle().state() >= DocumentLifecycle::InCo
mpositingUpdate; |
| 2412 } | 2409 } |
| 2413 | 2410 |
| (...skipping 452 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 2866 } | 2863 } |
| 2867 } | 2864 } |
| 2868 | 2865 |
| 2869 void showLayerTree(const blink::RenderObject* renderer) | 2866 void showLayerTree(const blink::RenderObject* renderer) |
| 2870 { | 2867 { |
| 2871 if (!renderer) | 2868 if (!renderer) |
| 2872 return; | 2869 return; |
| 2873 showLayerTree(renderer->enclosingLayer()); | 2870 showLayerTree(renderer->enclosingLayer()); |
| 2874 } | 2871 } |
| 2875 #endif | 2872 #endif |
| OLD | NEW |