| 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 1900 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1911 | 1911 |
| 1912 void CompositedLayerMapping::transitionFinished(CSSPropertyID property) | 1912 void CompositedLayerMapping::transitionFinished(CSSPropertyID property) |
| 1913 { | 1913 { |
| 1914 int animationId = m_animationProvider->getWebAnimationId(property); | 1914 int animationId = m_animationProvider->getWebAnimationId(property); |
| 1915 ASSERT(animationId); | 1915 ASSERT(animationId); |
| 1916 m_graphicsLayer->removeAnimation(animationId); | 1916 m_graphicsLayer->removeAnimation(animationId); |
| 1917 } | 1917 } |
| 1918 | 1918 |
| 1919 void CompositedLayerMapping::notifyAnimationStarted(const GraphicsLayer*, double
time) | 1919 void CompositedLayerMapping::notifyAnimationStarted(const GraphicsLayer*, double
time) |
| 1920 { | 1920 { |
| 1921 if (RuntimeEnabledFeatures::webAnimationsEnabled()) | 1921 if (RuntimeEnabledFeatures::webAnimationsCSSEnabled()) |
| 1922 renderer()->node()->document().cssPendingAnimations().notifyCompositorAn
imationStarted(monotonicallyIncreasingTime() - (currentTime() - time)); | 1922 renderer()->node()->document().cssPendingAnimations().notifyCompositorAn
imationStarted(monotonicallyIncreasingTime() - (currentTime() - time)); |
| 1923 else | 1923 else |
| 1924 renderer()->animation().notifyAnimationStarted(renderer(), time); | 1924 renderer()->animation().notifyAnimationStarted(renderer(), time); |
| 1925 } | 1925 } |
| 1926 | 1926 |
| 1927 IntRect CompositedLayerMapping::compositedBounds() const | 1927 IntRect CompositedLayerMapping::compositedBounds() const |
| 1928 { | 1928 { |
| 1929 return m_compositedBounds; | 1929 return m_compositedBounds; |
| 1930 } | 1930 } |
| 1931 | 1931 |
| (...skipping 71 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 2003 } else if (graphicsLayer == m_scrollingContentsLayer.get()) { | 2003 } else if (graphicsLayer == m_scrollingContentsLayer.get()) { |
| 2004 name = "Scrolling Contents Layer"; | 2004 name = "Scrolling Contents Layer"; |
| 2005 } else { | 2005 } else { |
| 2006 ASSERT_NOT_REACHED(); | 2006 ASSERT_NOT_REACHED(); |
| 2007 } | 2007 } |
| 2008 | 2008 |
| 2009 return name; | 2009 return name; |
| 2010 } | 2010 } |
| 2011 | 2011 |
| 2012 } // namespace WebCore | 2012 } // namespace WebCore |
| OLD | NEW |