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 611 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
622 if (options == UseChickenEggHacks) | 622 if (options == UseChickenEggHacks) |
623 applyUpdateLayerCompositingStateChickenEggHacks(layer, compositedLayerUp
date); | 623 applyUpdateLayerCompositingStateChickenEggHacks(layer, compositedLayerUp
date); |
624 } | 624 } |
625 | 625 |
626 void RenderLayerCompositor::repaintOnCompositingChange(RenderLayer* layer) | 626 void RenderLayerCompositor::repaintOnCompositingChange(RenderLayer* layer) |
627 { | 627 { |
628 // If the renderer is not attached yet, no need to repaint. | 628 // If the renderer is not attached yet, no need to repaint. |
629 if (layer->renderer() != &m_renderView && !layer->renderer()->parent()) | 629 if (layer->renderer() != &m_renderView && !layer->renderer()->parent()) |
630 return; | 630 return; |
631 | 631 |
632 RenderLayerModelObject* repaintContainer = layer->renderer()->containerForRe
paint(); | 632 const RenderLayerModelObject* repaintContainer = layer->renderer()->containe
rForRepaint(); |
633 ASSERT(repaintContainer); | 633 ASSERT(repaintContainer); |
634 layer->repainter().repaintIncludingNonCompositingDescendants(repaintContaine
r); | 634 layer->repainter().repaintIncludingNonCompositingDescendants(repaintContaine
r); |
635 } | 635 } |
636 | 636 |
637 // This method assumes that layout is up-to-date, unlike repaintOnCompositingCha
nge(). | 637 // This method assumes that layout is up-to-date, unlike repaintOnCompositingCha
nge(). |
638 void RenderLayerCompositor::repaintInCompositedAncestor(RenderLayer* layer, cons
t LayoutRect& rect) | 638 void RenderLayerCompositor::repaintInCompositedAncestor(RenderLayer* layer, cons
t LayoutRect& rect) |
639 { | 639 { |
640 RenderLayer* compositedAncestor = layer->enclosingCompositingLayerForRepaint
(ExcludeSelf); | 640 RenderLayer* compositedAncestor = layer->enclosingCompositingLayerForRepaint
(ExcludeSelf); |
641 if (!compositedAncestor) | 641 if (!compositedAncestor) |
642 return; | 642 return; |
(...skipping 829 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1472 } else if (graphicsLayer == m_scrollLayer.get()) { | 1472 } else if (graphicsLayer == m_scrollLayer.get()) { |
1473 name = "LocalFrame Scrolling Layer"; | 1473 name = "LocalFrame Scrolling Layer"; |
1474 } else { | 1474 } else { |
1475 ASSERT_NOT_REACHED(); | 1475 ASSERT_NOT_REACHED(); |
1476 } | 1476 } |
1477 | 1477 |
1478 return name; | 1478 return name; |
1479 } | 1479 } |
1480 | 1480 |
1481 } // namespace WebCore | 1481 } // namespace WebCore |
OLD | NEW |