| 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 623 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 634 return updateType; | 634 return updateType; |
| 635 | 635 |
| 636 if (!m_needToUpdateGeometry && updateType != GraphicsLayerUpdater::ForceUpda
te) | 636 if (!m_needToUpdateGeometry && updateType != GraphicsLayerUpdater::ForceUpda
te) |
| 637 return updateType; | 637 return updateType; |
| 638 m_needToUpdateGeometry = false; | 638 m_needToUpdateGeometry = false; |
| 639 if (m_needToUpdateGeometryOfAllDecendants) | 639 if (m_needToUpdateGeometryOfAllDecendants) |
| 640 updateType = GraphicsLayerUpdater::ForceUpdate; | 640 updateType = GraphicsLayerUpdater::ForceUpdate; |
| 641 | 641 |
| 642 // Set transform property, if it is not animating. We have to do this here b
ecause the transform | 642 // Set transform property, if it is not animating. We have to do this here b
ecause the transform |
| 643 // is affected by the layer dimensions. | 643 // is affected by the layer dimensions. |
| 644 if (!hasActiveAnimationsOnCompositor(*renderer(), CSSPropertyWebkitTransform
)) | 644 if (!hasActiveAnimationsOnCompositor(*renderer(), CSSPropertyTransform)) |
| 645 updateTransform(renderer()->style()); | 645 updateTransform(renderer()->style()); |
| 646 | 646 |
| 647 // Set opacity, if it is not animating. | 647 // Set opacity, if it is not animating. |
| 648 if (!hasActiveAnimationsOnCompositor(*renderer(), CSSPropertyOpacity)) | 648 if (!hasActiveAnimationsOnCompositor(*renderer(), CSSPropertyOpacity)) |
| 649 updateOpacity(renderer()->style()); | 649 updateOpacity(renderer()->style()); |
| 650 | 650 |
| 651 m_owningLayer.updateDescendantDependentFlags(); | 651 m_owningLayer.updateDescendantDependentFlags(); |
| 652 | 652 |
| 653 // m_graphicsLayer is the corresponding GraphicsLayer for this RenderLayer a
nd its non-compositing | 653 // m_graphicsLayer is the corresponding GraphicsLayer for this RenderLayer a
nd its non-compositing |
| 654 // descendants. So, the visibility flag for m_graphicsLayer should be true i
f there are any | 654 // descendants. So, the visibility flag for m_graphicsLayer should be true i
f there are any |
| (...skipping 1477 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 2132 } else if (graphicsLayer == m_scrollingContentsLayer.get()) { | 2132 } else if (graphicsLayer == m_scrollingContentsLayer.get()) { |
| 2133 name = "Scrolling Contents Layer"; | 2133 name = "Scrolling Contents Layer"; |
| 2134 } else { | 2134 } else { |
| 2135 ASSERT_NOT_REACHED(); | 2135 ASSERT_NOT_REACHED(); |
| 2136 } | 2136 } |
| 2137 | 2137 |
| 2138 return name; | 2138 return name; |
| 2139 } | 2139 } |
| 2140 | 2140 |
| 2141 } // namespace WebCore | 2141 } // namespace WebCore |
| OLD | NEW |