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 2568 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
2579 compositor()->paintInvalidationOnCompositingChange(layerToRemove); | 2579 compositor()->paintInvalidationOnCompositingChange(layerToRemove); |
2580 return true; | 2580 return true; |
2581 } | 2581 } |
2582 return false; | 2582 return false; |
2583 } | 2583 } |
2584 | 2584 |
2585 bool CompositedLayerMapping::shouldPaintBackgroundOntoScrollingContentsLayer() c
onst | 2585 bool CompositedLayerMapping::shouldPaintBackgroundOntoScrollingContentsLayer() c
onst |
2586 { | 2586 { |
2587 return !m_owningLayer.isRootLayer() | 2587 return !m_owningLayer.isRootLayer() |
2588 && m_owningLayer.scrollsOverflow() | 2588 && m_owningLayer.scrollsOverflow() |
2589 && m_owningLayer.layoutObject()->style()->hasEntirelyLocalBackground() | 2589 && m_owningLayer.layoutObject()->hasLocalEquivalentBackground() |
2590 && !m_owningLayer.stackingNode()->hasNegativeZOrderList(); | 2590 && !m_owningLayer.stackingNode()->hasNegativeZOrderList(); |
2591 } | 2591 } |
2592 | 2592 |
2593 bool CompositedLayerMapping::updateSquashingLayerAssignment(PaintLayer* squashed
Layer, size_t nextSquashedLayerIndex) | 2593 bool CompositedLayerMapping::updateSquashingLayerAssignment(PaintLayer* squashed
Layer, size_t nextSquashedLayerIndex) |
2594 { | 2594 { |
2595 GraphicsLayerPaintInfo paintInfo; | 2595 GraphicsLayerPaintInfo paintInfo; |
2596 paintInfo.paintLayer = squashedLayer; | 2596 paintInfo.paintLayer = squashedLayer; |
2597 // NOTE: composited bounds are updated elsewhere | 2597 // NOTE: composited bounds are updated elsewhere |
2598 // NOTE: offsetFromLayoutObject is updated elsewhere | 2598 // NOTE: offsetFromLayoutObject is updated elsewhere |
2599 | 2599 |
(...skipping 103 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
2703 } else if (graphicsLayer == m_scrollingContentsLayer.get()) { | 2703 } else if (graphicsLayer == m_scrollingContentsLayer.get()) { |
2704 name = "Scrolling Contents Layer"; | 2704 name = "Scrolling Contents Layer"; |
2705 } else { | 2705 } else { |
2706 ASSERT_NOT_REACHED(); | 2706 ASSERT_NOT_REACHED(); |
2707 } | 2707 } |
2708 | 2708 |
2709 return name; | 2709 return name; |
2710 } | 2710 } |
2711 | 2711 |
2712 } // namespace blink | 2712 } // namespace blink |
OLD | NEW |