| OLD | NEW |
| 1 /* | 1 /* |
| 2 * Copyright (C) 2013 Google Inc. All rights reserved. | 2 * Copyright (C) 2013 Google 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 are | 5 * modification, are permitted provided that the following conditions are |
| 6 * met: | 6 * met: |
| 7 * | 7 * |
| 8 * * Redistributions of source code must retain the above copyright | 8 * * Redistributions of source code must retain the above copyright |
| 9 * notice, this list of conditions and the following disclaimer. | 9 * notice, this list of conditions and the following disclaimer. |
| 10 * * Redistributions in binary form must reproduce the above | 10 * * Redistributions in binary form must reproduce the above |
| (...skipping 229 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 240 // FIXME: Support non-linear timing functions in the compositor for | 240 // FIXME: Support non-linear timing functions in the compositor for |
| 241 // more than two keyframes and step timing functions in the compositor. | 241 // more than two keyframes and step timing functions in the compositor. |
| 242 return false; | 242 return false; |
| 243 } | 243 } |
| 244 | 244 |
| 245 return true; | 245 return true; |
| 246 } | 246 } |
| 247 | 247 |
| 248 bool CompositorAnimations::canStartAnimationOnCompositor(const Element& element) | 248 bool CompositorAnimations::canStartAnimationOnCompositor(const Element& element) |
| 249 { | 249 { |
| 250 return element.renderer() && element.renderer()->compositingState() == Paint
sIntoOwnBacking; | 250 return false; |
| 251 } | 251 } |
| 252 | 252 |
| 253 bool CompositorAnimations::startAnimationOnCompositor(const Element& element, do
uble startTime, double timeOffset, const Timing& timing, const AnimationEffect&
effect, Vector<int>& startedAnimationIds) | 253 bool CompositorAnimations::startAnimationOnCompositor(const Element& element, do
uble startTime, double timeOffset, const Timing& timing, const AnimationEffect&
effect, Vector<int>& startedAnimationIds) |
| 254 { | 254 { |
| 255 // FIXME(sky): Remove CompositorAnimations entirely. | 255 // FIXME(sky): Remove CompositorAnimations entirely. |
| 256 ASSERT_NOT_REACHED(); | 256 ASSERT_NOT_REACHED(); |
| 257 return true; | 257 return true; |
| 258 } | 258 } |
| 259 | 259 |
| 260 void CompositorAnimations::cancelAnimationOnCompositor(const Element& element, i
nt id) | 260 void CompositorAnimations::cancelAnimationOnCompositor(const Element& element, i
nt id) |
| (...skipping 229 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 490 animation->setIterations(compositorTiming.adjustedIterationCount); | 490 animation->setIterations(compositorTiming.adjustedIterationCount); |
| 491 animation->setTimeOffset(compositorTiming.scaledTimeOffset); | 491 animation->setTimeOffset(compositorTiming.scaledTimeOffset); |
| 492 animation->setAlternatesDirection(compositorTiming.alternate); | 492 animation->setAlternatesDirection(compositorTiming.alternate); |
| 493 | 493 |
| 494 animations.append(animation.release()); | 494 animations.append(animation.release()); |
| 495 } | 495 } |
| 496 ASSERT(!animations.isEmpty()); | 496 ASSERT(!animations.isEmpty()); |
| 497 } | 497 } |
| 498 | 498 |
| 499 } // namespace blink | 499 } // namespace blink |
| OLD | NEW |