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 649 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
660 { | 660 { |
661 // If we haven't built z-order lists yet, wait until later. | 661 // If we haven't built z-order lists yet, wait until later. |
662 if (m_owningLayer.stackingNode()->isStackingContainer() && m_owningLayer.sta
ckingNode()->zOrderListsDirty()) | 662 if (m_owningLayer.stackingNode()->isStackingContainer() && m_owningLayer.sta
ckingNode()->zOrderListsDirty()) |
663 return; | 663 return; |
664 | 664 |
665 if (!shouldUpdateGraphicsLayer(updateType)) | 665 if (!shouldUpdateGraphicsLayer(updateType)) |
666 return; | 666 return; |
667 | 667 |
668 // Set transform property, if it is not animating. We have to do this here b
ecause the transform | 668 // Set transform property, if it is not animating. We have to do this here b
ecause the transform |
669 // is affected by the layer dimensions. | 669 // is affected by the layer dimensions. |
670 if (!hasActiveAnimationsOnCompositor(*renderer(), CSSPropertyWebkitTransform
)) | 670 if (!hasActiveAnimationsOnCompositor(*renderer(), CSSPropertyTransform)) |
671 updateTransform(renderer()->style()); | 671 updateTransform(renderer()->style()); |
672 | 672 |
673 // Set opacity, if it is not animating. | 673 // Set opacity, if it is not animating. |
674 if (!hasActiveAnimationsOnCompositor(*renderer(), CSSPropertyOpacity)) | 674 if (!hasActiveAnimationsOnCompositor(*renderer(), CSSPropertyOpacity)) |
675 updateOpacity(renderer()->style()); | 675 updateOpacity(renderer()->style()); |
676 | 676 |
677 m_owningLayer.updateDescendantDependentFlags(); | 677 m_owningLayer.updateDescendantDependentFlags(); |
678 | 678 |
679 // m_graphicsLayer is the corresponding GraphicsLayer for this RenderLayer a
nd its non-compositing | 679 // m_graphicsLayer is the corresponding GraphicsLayer for this RenderLayer a
nd its non-compositing |
680 // descendants. So, the visibility flag for m_graphicsLayer should be true i
f there are any | 680 // descendants. So, the visibility flag for m_graphicsLayer should be true i
f there are any |
(...skipping 1494 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
2175 } else if (graphicsLayer == m_scrollingContentsLayer.get()) { | 2175 } else if (graphicsLayer == m_scrollingContentsLayer.get()) { |
2176 name = "Scrolling Contents Layer"; | 2176 name = "Scrolling Contents Layer"; |
2177 } else { | 2177 } else { |
2178 ASSERT_NOT_REACHED(); | 2178 ASSERT_NOT_REACHED(); |
2179 } | 2179 } |
2180 | 2180 |
2181 return name; | 2181 return name; |
2182 } | 2182 } |
2183 | 2183 |
2184 } // namespace WebCore | 2184 } // namespace WebCore |
OLD | NEW |