OLD | NEW |
1 /* | 1 /* |
2 * Copyright (C) 2009, 2010 Apple Inc. All rights reserved. | 2 * Copyright (C) 2009, 2010 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 651 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
662 } | 662 } |
663 | 663 |
664 void RenderLayerCompositor::repaintCompositedLayers() | 664 void RenderLayerCompositor::repaintCompositedLayers() |
665 { | 665 { |
666 recursiveRepaintLayer(rootRenderLayer()); | 666 recursiveRepaintLayer(rootRenderLayer()); |
667 } | 667 } |
668 | 668 |
669 void RenderLayerCompositor::recursiveRepaintLayer(RenderLayer* layer) | 669 void RenderLayerCompositor::recursiveRepaintLayer(RenderLayer* layer) |
670 { | 670 { |
671 // FIXME: This method does not work correctly with transforms. | 671 // FIXME: This method does not work correctly with transforms. |
672 if (layer->compositingState() == PaintsIntoOwnBacking) | 672 if (layer->compositingState() == PaintsIntoOwnBacking) { |
673 layer->repainter().setBackingNeedsRepaint(); | 673 layer->compositedLayerMapping()->setContentsNeedDisplay(); |
| 674 // This function is called only when it is desired to repaint the entire
compositing graphics layer tree. |
| 675 // This includes squashing. |
| 676 layer->compositedLayerMapping()->setSquashingContentsNeedDisplay(); |
| 677 } |
674 | 678 |
675 #if ASSERT_ENABLED | 679 #if ASSERT_ENABLED |
676 LayerListMutationDetector mutationChecker(layer->stackingNode()); | 680 LayerListMutationDetector mutationChecker(layer->stackingNode()); |
677 #endif | 681 #endif |
678 | 682 |
679 unsigned childrenToVisit = NormalFlowChildren; | 683 unsigned childrenToVisit = NormalFlowChildren; |
680 if (layer->hasCompositingDescendant()) | 684 if (layer->hasCompositingDescendant()) |
681 childrenToVisit |= PositiveZOrderChildren | NegativeZOrderChildren; | 685 childrenToVisit |= PositiveZOrderChildren | NegativeZOrderChildren; |
682 RenderLayerStackingNodeIterator iterator(*layer->stackingNode(), childrenToV
isit); | 686 RenderLayerStackingNodeIterator iterator(*layer->stackingNode(), childrenToV
isit); |
683 while (RenderLayerStackingNode* curNode = iterator.next()) | 687 while (RenderLayerStackingNode* curNode = iterator.next()) |
(...skipping 549 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1233 } else if (graphicsLayer == m_scrollLayer.get()) { | 1237 } else if (graphicsLayer == m_scrollLayer.get()) { |
1234 name = "LocalFrame Scrolling Layer"; | 1238 name = "LocalFrame Scrolling Layer"; |
1235 } else { | 1239 } else { |
1236 ASSERT_NOT_REACHED(); | 1240 ASSERT_NOT_REACHED(); |
1237 } | 1241 } |
1238 | 1242 |
1239 return name; | 1243 return name; |
1240 } | 1244 } |
1241 | 1245 |
1242 } // namespace WebCore | 1246 } // namespace WebCore |
OLD | NEW |