| 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 622 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 633 | 633 |
| 634 LayoutRect repaintRect = rect; | 634 LayoutRect repaintRect = rect; |
| 635 repaintRect.moveBy(offset); | 635 repaintRect.moveBy(offset); |
| 636 | 636 |
| 637 compositedAncestor->repainter().setBackingNeedsRepaintInRect(repaintRect
); | 637 compositedAncestor->repainter().setBackingNeedsRepaintInRect(repaintRect
); |
| 638 } | 638 } |
| 639 } | 639 } |
| 640 | 640 |
| 641 // The bounds of the GraphicsLayer created for a compositing layer is the union
of the bounds of all the descendant | 641 // The bounds of the GraphicsLayer created for a compositing layer is the union
of the bounds of all the descendant |
| 642 // RenderLayers that are rendered by the composited RenderLayer. | 642 // RenderLayers that are rendered by the composited RenderLayer. |
| 643 IntRect RenderLayerCompositor::calculateCompositedBounds(const RenderLayer* laye
r, const RenderLayer* ancestorLayer) const | 643 LayoutRect RenderLayerCompositor::calculateCompositedBounds(const RenderLayer* l
ayer, const RenderLayer* ancestorLayer) const |
| 644 { | 644 { |
| 645 if (!canBeComposited(layer)) | 645 if (!canBeComposited(layer)) |
| 646 return IntRect(); | 646 return LayoutRect(); |
| 647 | 647 |
| 648 RenderLayer::CalculateLayerBoundsFlags flags = RenderLayer::DefaultCalculate
LayerBoundsFlags | RenderLayer::ExcludeHiddenDescendants | RenderLayer::DontCons
trainForMask; | 648 RenderLayer::CalculateLayerBoundsFlags flags = RenderLayer::DefaultCalculate
LayerBoundsFlags | RenderLayer::ExcludeHiddenDescendants | RenderLayer::DontCons
trainForMask; |
| 649 #if HAVE(COMPOSITOR_FILTER_OUTSETS) | 649 #if HAVE(COMPOSITOR_FILTER_OUTSETS) |
| 650 // If the compositor computes its own filter outsets, don't include them in
the composited bounds. | 650 // If the compositor computes its own filter outsets, don't include them in
the composited bounds. |
| 651 if (!layer->paintsWithFilters()) | 651 if (!layer->paintsWithFilters()) |
| 652 flags &= ~RenderLayer::IncludeLayerFilterOutsets; | 652 flags &= ~RenderLayer::IncludeLayerFilterOutsets; |
| 653 #endif | 653 #endif |
| 654 return layer->calculateLayerBounds(ancestorLayer, 0, flags); | 654 return layer->calculateLayerBounds(ancestorLayer, 0, flags); |
| 655 } | 655 } |
| 656 | 656 |
| (...skipping 1787 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 2444 } else if (graphicsLayer == m_scrollLayer.get()) { | 2444 } else if (graphicsLayer == m_scrollLayer.get()) { |
| 2445 name = "Frame Scrolling Layer"; | 2445 name = "Frame Scrolling Layer"; |
| 2446 } else { | 2446 } else { |
| 2447 ASSERT_NOT_REACHED(); | 2447 ASSERT_NOT_REACHED(); |
| 2448 } | 2448 } |
| 2449 | 2449 |
| 2450 return name; | 2450 return name; |
| 2451 } | 2451 } |
| 2452 | 2452 |
| 2453 } // namespace WebCore | 2453 } // namespace WebCore |
| OLD | NEW |