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 601 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
612 layers[i].renderLayer->setOffsetFromSquashingLayerOrigin(layers[i].offse
tFromRenderer); | 612 layers[i].renderLayer->setOffsetFromSquashingLayerOrigin(layers[i].offse
tFromRenderer); |
613 | 613 |
614 } | 614 } |
615 | 615 |
616 for (size_t i = 0; i < layers.size(); ++i) | 616 for (size_t i = 0; i < layers.size(); ++i) |
617 layers[i].localClipRectForSquashedLayer = localClipRectForSquashedLayer(
referenceLayer, layers[i], layers); | 617 layers[i].localClipRectForSquashedLayer = localClipRectForSquashedLayer(
referenceLayer, layers[i], layers); |
618 } | 618 } |
619 | 619 |
620 void CompositedLayerMapping::updateGraphicsLayerGeometry(GraphicsLayerUpdater::U
pdateType updateType, const RenderLayer* compositingContainer) | 620 void CompositedLayerMapping::updateGraphicsLayerGeometry(GraphicsLayerUpdater::U
pdateType updateType, const RenderLayer* compositingContainer) |
621 { | 621 { |
622 // If we haven't built z-order lists yet, wait until later. | |
623 if (m_owningLayer.stackingNode()->isStackingContext() && m_owningLayer.stack
ingNode()->zOrderListsDirty()) | |
624 return; | |
625 | |
626 if (!shouldUpdateGraphicsLayer(updateType)) | 622 if (!shouldUpdateGraphicsLayer(updateType)) |
627 return; | 623 return; |
628 | 624 |
629 // Set transform property, if it is not animating. We have to do this here b
ecause the transform | 625 // Set transform property, if it is not animating. We have to do this here b
ecause the transform |
630 // is affected by the layer dimensions. | 626 // is affected by the layer dimensions. |
631 if (!renderer()->style()->isRunningTransformAnimationOnCompositor()) | 627 if (!renderer()->style()->isRunningTransformAnimationOnCompositor()) |
632 updateTransform(renderer()->style()); | 628 updateTransform(renderer()->style()); |
633 | 629 |
634 // Set opacity, if it is not animating. | 630 // Set opacity, if it is not animating. |
635 if (!renderer()->style()->isRunningOpacityAnimationOnCompositor()) | 631 if (!renderer()->style()->isRunningOpacityAnimationOnCompositor()) |
(...skipping 1604 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
2240 } else if (graphicsLayer == m_scrollingContentsLayer.get()) { | 2236 } else if (graphicsLayer == m_scrollingContentsLayer.get()) { |
2241 name = "Scrolling Contents Layer"; | 2237 name = "Scrolling Contents Layer"; |
2242 } else { | 2238 } else { |
2243 ASSERT_NOT_REACHED(); | 2239 ASSERT_NOT_REACHED(); |
2244 } | 2240 } |
2245 | 2241 |
2246 return name; | 2242 return name; |
2247 } | 2243 } |
2248 | 2244 |
2249 } // namespace WebCore | 2245 } // namespace WebCore |
OLD | NEW |