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 return updateType; | 660 return updateType; |
661 | 661 |
662 if (!m_needToUpdateGeometry && updateType != GraphicsLayerUpdater::ForceUpda
te) | 662 if (!m_needToUpdateGeometry && updateType != GraphicsLayerUpdater::ForceUpda
te) |
663 return updateType; | 663 return updateType; |
664 m_needToUpdateGeometry = false; | 664 m_needToUpdateGeometry = false; |
665 if (m_needToUpdateGeometryOfAllDecendants) | 665 if (m_needToUpdateGeometryOfAllDecendants) |
666 updateType = GraphicsLayerUpdater::ForceUpdate; | 666 updateType = GraphicsLayerUpdater::ForceUpdate; |
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 1482 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
2163 } else if (graphicsLayer == m_scrollingContentsLayer.get()) { | 2163 } else if (graphicsLayer == m_scrollingContentsLayer.get()) { |
2164 name = "Scrolling Contents Layer"; | 2164 name = "Scrolling Contents Layer"; |
2165 } else { | 2165 } else { |
2166 ASSERT_NOT_REACHED(); | 2166 ASSERT_NOT_REACHED(); |
2167 } | 2167 } |
2168 | 2168 |
2169 return name; | 2169 return name; |
2170 } | 2170 } |
2171 | 2171 |
2172 } // namespace WebCore | 2172 } // namespace WebCore |
OLD | NEW |