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 47 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
58 #include "public/platform/WebCompositorSupport.h" | 58 #include "public/platform/WebCompositorSupport.h" |
59 | 59 |
60 namespace blink { | 60 namespace blink { |
61 | 61 |
62 namespace { | 62 namespace { |
63 | 63 |
64 static unsigned NextSequenceNumber() { | 64 static unsigned NextSequenceNumber() { |
65 static unsigned next = 0; | 65 static unsigned next = 0; |
66 return ++next; | 66 return ++next; |
67 } | 67 } |
68 } | 68 } // namespace |
69 | 69 |
70 Animation* Animation::Create(AnimationEffectReadOnly* effect, | 70 Animation* Animation::Create(AnimationEffectReadOnly* effect, |
71 AnimationTimeline* timeline) { | 71 AnimationTimeline* timeline) { |
72 if (!timeline) { | 72 if (!timeline) { |
73 // FIXME: Support creating animations without a timeline. | 73 // FIXME: Support creating animations without a timeline. |
74 NOTREACHED(); | 74 NOTREACHED(); |
75 return nullptr; | 75 return nullptr; |
76 } | 76 } |
77 | 77 |
78 Animation* animation = new Animation( | 78 Animation* animation = new Animation( |
(...skipping 1154 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1233 DCHECK(!compositor_player_); | 1233 DCHECK(!compositor_player_); |
1234 } | 1234 } |
1235 | 1235 |
1236 void Animation::CompositorAnimationPlayerHolder::Detach() { | 1236 void Animation::CompositorAnimationPlayerHolder::Detach() { |
1237 DCHECK(compositor_player_); | 1237 DCHECK(compositor_player_); |
1238 compositor_player_->SetAnimationDelegate(nullptr); | 1238 compositor_player_->SetAnimationDelegate(nullptr); |
1239 animation_ = nullptr; | 1239 animation_ = nullptr; |
1240 compositor_player_.reset(); | 1240 compositor_player_.reset(); |
1241 } | 1241 } |
1242 } // namespace blink | 1242 } // namespace blink |
OLD | NEW |