Chromium Code Reviews| OLD | NEW |
|---|---|
| 1 /* | 1 /* |
| 2 * Copyright (C) 2012 Google Inc. All rights reserved. | 2 * Copyright (C) 2012 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 | 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 |
| 11 * documentation and/or other materials provided with the distribution. | 11 * documentation and/or other materials provided with the distribution. |
| 12 * | 12 * |
| 13 * THIS SOFTWARE IS PROVIDED BY APPLE INC. AND ITS CONTRIBUTORS ``AS IS'' AND AN Y | 13 * THIS SOFTWARE IS PROVIDED BY APPLE INC. AND ITS CONTRIBUTORS ``AS IS'' AND AN Y |
| 14 * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED | 14 * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED |
| 15 * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE | 15 * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE |
| 16 * DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR ITS CONTRIBUTORS BE LIABLE FOR AN Y | 16 * DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR ITS CONTRIBUTORS BE LIABLE FOR AN Y |
| 17 * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES | 17 * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES |
| 18 * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; | 18 * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; |
| 19 * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND O N | 19 * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND O N |
| 20 * ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT | 20 * ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT |
| 21 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS | 21 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS |
| 22 * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. | 22 * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. |
| 23 */ | 23 */ |
| 24 | 24 |
| 25 #ifndef WebAnimationDelegate_h | 25 #ifndef WebAnimationDelegate_h |
| 26 #define WebAnimationDelegate_h | 26 #define WebAnimationDelegate_h |
| 27 | 27 |
| 28 #include "WebAnimation.h" | 28 #include "WebAnimation.h" |
| 29 #include "WebCommon.h" | |
| 29 | 30 |
| 30 #define WEB_ANIMATION_DELEGATE_TAKES_MONOTONIC_TIME 1 | 31 #define WEB_ANIMATION_DELEGATE_TAKES_MONOTONIC_TIME 1 |
| 31 | 32 |
| 32 namespace blink { | 33 namespace blink { |
| 33 | 34 |
| 34 class WebAnimationDelegate { | 35 class BLINK_PLATFORM_EXPORT WebAnimationDelegate { |
|
jamesr
2014/03/04 21:38:37
why does this class need to be exported? i don't s
mithro-old
2014/03/04 23:54:24
The two methods I add below with inline definition
| |
| 35 public: | 36 public: |
| 36 // FIXME: Remove wallClockTime once the legacy implementation of CSS | 37 // FIXME: Remove wallClockTime API after the following file is updated; |
| 37 // animations and transitions is removed. | 38 // webkit/renderer/compositor_bindings/web_to_cc_animation_delegate_adapter. cc |
| 38 virtual void notifyAnimationStarted(double wallClockTime, double monotonicTi me, WebAnimation::TargetProperty) = 0; | 39 inline void notifyAnimationStarted(double wallClockTime, double monotonicTim e, WebAnimation::TargetProperty prop) |
|
jamesr
2014/03/04 21:38:37
i don't think the "inline" annotation provides any
mithro-old
2014/03/04 23:54:24
Fixed.
| |
| 39 virtual void notifyAnimationFinished(double wallClockTime, double monotonicT ime, WebAnimation::TargetProperty) = 0; | 40 { |
| 41 notifyAnimationStarted(monotonicTime, prop); | |
| 42 } | |
| 43 inline void notifyAnimationFinished(double wallClockTime, double monotonicTi me, WebAnimation::TargetProperty prop) | |
| 44 { | |
| 45 notifyAnimationFinished(monotonicTime, prop); | |
| 46 } | |
| 47 virtual void notifyAnimationStarted(double monotonicTime, WebAnimation::Targ etProperty) = 0; | |
| 48 virtual void notifyAnimationFinished(double monotonicTime, WebAnimation::Tar getProperty) = 0; | |
| 40 }; | 49 }; |
| 41 | 50 |
| 42 } // namespace blink | 51 } // namespace blink |
| 43 | 52 |
| 44 #endif // WebAnimationDelegate_h | 53 #endif // WebAnimationDelegate_h |
| OLD | NEW |