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 1923 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1934 | 1934 |
1935 void CompositedLayerMapping::transitionFinished(CSSPropertyID property) | 1935 void CompositedLayerMapping::transitionFinished(CSSPropertyID property) |
1936 { | 1936 { |
1937 int animationId = m_animationProvider->getWebAnimationId(property); | 1937 int animationId = m_animationProvider->getWebAnimationId(property); |
1938 ASSERT(animationId); | 1938 ASSERT(animationId); |
1939 m_graphicsLayer->removeAnimation(animationId); | 1939 m_graphicsLayer->removeAnimation(animationId); |
1940 } | 1940 } |
1941 | 1941 |
1942 void CompositedLayerMapping::notifyAnimationStarted(const GraphicsLayer*, double
time) | 1942 void CompositedLayerMapping::notifyAnimationStarted(const GraphicsLayer*, double
time) |
1943 { | 1943 { |
1944 if (RuntimeEnabledFeatures::webAnimationsEnabled()) | 1944 if (RuntimeEnabledFeatures::webAnimationsCSSEnabled()) |
1945 renderer()->node()->document().cssPendingAnimations().notifyCompositorAn
imationStarted(monotonicallyIncreasingTime() - (currentTime() - time)); | 1945 renderer()->node()->document().cssPendingAnimations().notifyCompositorAn
imationStarted(monotonicallyIncreasingTime() - (currentTime() - time)); |
1946 else | 1946 else |
1947 renderer()->animation().notifyAnimationStarted(renderer(), time); | 1947 renderer()->animation().notifyAnimationStarted(renderer(), time); |
1948 } | 1948 } |
1949 | 1949 |
1950 IntRect CompositedLayerMapping::compositedBounds() const | 1950 IntRect CompositedLayerMapping::compositedBounds() const |
1951 { | 1951 { |
1952 return m_compositedBounds; | 1952 return m_compositedBounds; |
1953 } | 1953 } |
1954 | 1954 |
(...skipping 71 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
2026 } else if (graphicsLayer == m_scrollingContentsLayer.get()) { | 2026 } else if (graphicsLayer == m_scrollingContentsLayer.get()) { |
2027 name = "Scrolling Contents Layer"; | 2027 name = "Scrolling Contents Layer"; |
2028 } else { | 2028 } else { |
2029 ASSERT_NOT_REACHED(); | 2029 ASSERT_NOT_REACHED(); |
2030 } | 2030 } |
2031 | 2031 |
2032 return name; | 2032 return name; |
2033 } | 2033 } |
2034 | 2034 |
2035 } // namespace WebCore | 2035 } // namespace WebCore |
OLD | NEW |