| OLD | NEW |
| 1 /* | 1 /* |
| 2 * Copyright (C) 2009, 2010, 2011 Apple Inc. All rights reserved. | 2 * Copyright (C) 2009, 2010, 2011 Apple Inc. All rights reserved. |
| 3 * | 3 * |
| 4 * Redistribution and use in source and binary forms, with or without | 4 * Redistribution and use in source and binary forms, with or without |
| 5 * modification, are permitted provided that the following conditions | 5 * modification, are permitted provided that the following conditions |
| 6 * are met: | 6 * are met: |
| 7 * 1. Redistributions of source code must retain the above copyright | 7 * 1. Redistributions of source code must retain the above copyright |
| 8 * notice, this list of conditions and the following disclaimer. | 8 * notice, this list of conditions and the following disclaimer. |
| 9 * 2. Redistributions in binary form must reproduce the above copyright | 9 * 2. Redistributions in binary form must reproduce the above copyright |
| 10 * notice, this list of conditions and the following disclaimer in the | 10 * notice, this list of conditions and the following disclaimer in the |
| (...skipping 1617 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1628 } | 1628 } |
| 1629 | 1629 |
| 1630 bool CompositedLayerMapping::hasVisibleNonCompositingDescendant(RenderLayer* par
ent) | 1630 bool CompositedLayerMapping::hasVisibleNonCompositingDescendant(RenderLayer* par
ent) |
| 1631 { | 1631 { |
| 1632 if (!parent->hasVisibleDescendant()) | 1632 if (!parent->hasVisibleDescendant()) |
| 1633 return false; | 1633 return false; |
| 1634 | 1634 |
| 1635 // FIXME: We shouldn't be called with a stale z-order lists. See bug 85512. | 1635 // FIXME: We shouldn't be called with a stale z-order lists. See bug 85512. |
| 1636 parent->stackingNode()->updateLayerListsIfNeeded(); | 1636 parent->stackingNode()->updateLayerListsIfNeeded(); |
| 1637 | 1637 |
| 1638 #if ASSERT_ENABLED | 1638 #if ENABLE(ASSERT) |
| 1639 LayerListMutationDetector mutationChecker(parent->stackingNode()); | 1639 LayerListMutationDetector mutationChecker(parent->stackingNode()); |
| 1640 #endif | 1640 #endif |
| 1641 | 1641 |
| 1642 RenderLayerStackingNodeIterator normalFlowIterator(*parent->stackingNode(),
AllChildren); | 1642 RenderLayerStackingNodeIterator normalFlowIterator(*parent->stackingNode(),
AllChildren); |
| 1643 while (RenderLayerStackingNode* curNode = normalFlowIterator.next()) { | 1643 while (RenderLayerStackingNode* curNode = normalFlowIterator.next()) { |
| 1644 RenderLayer* curLayer = curNode->layer(); | 1644 RenderLayer* curLayer = curNode->layer(); |
| 1645 if (curLayer->hasCompositedLayerMapping()) | 1645 if (curLayer->hasCompositedLayerMapping()) |
| 1646 continue; | 1646 continue; |
| 1647 if (curLayer->hasVisibleContent() || hasVisibleNonCompositingDescendant(
curLayer)) | 1647 if (curLayer->hasVisibleContent() || hasVisibleNonCompositingDescendant(
curLayer)) |
| 1648 return true; | 1648 return true; |
| (...skipping 594 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 2243 } else if (graphicsLayer == m_scrollingBlockSelectionLayer.get()) { | 2243 } else if (graphicsLayer == m_scrollingBlockSelectionLayer.get()) { |
| 2244 name = "Scrolling Block Selection Layer"; | 2244 name = "Scrolling Block Selection Layer"; |
| 2245 } else { | 2245 } else { |
| 2246 ASSERT_NOT_REACHED(); | 2246 ASSERT_NOT_REACHED(); |
| 2247 } | 2247 } |
| 2248 | 2248 |
| 2249 return name; | 2249 return name; |
| 2250 } | 2250 } |
| 2251 | 2251 |
| 2252 } // namespace WebCore | 2252 } // namespace WebCore |
| OLD | NEW |