Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(388)

Side by Side Diff: third_party/WebKit/Source/core/animation/Animation.h

Issue 2080623002: Revert "Remove OwnPtr from Blink." (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 years, 6 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
OLDNEW
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 27 matching lines...) Expand all
38 #include "core/CSSPropertyNames.h" 38 #include "core/CSSPropertyNames.h"
39 #include "core/CoreExport.h" 39 #include "core/CoreExport.h"
40 #include "core/animation/AnimationEffect.h" 40 #include "core/animation/AnimationEffect.h"
41 #include "core/dom/ActiveDOMObject.h" 41 #include "core/dom/ActiveDOMObject.h"
42 #include "core/dom/DOMException.h" 42 #include "core/dom/DOMException.h"
43 #include "core/events/EventTarget.h" 43 #include "core/events/EventTarget.h"
44 #include "platform/animation/CompositorAnimationDelegate.h" 44 #include "platform/animation/CompositorAnimationDelegate.h"
45 #include "platform/animation/CompositorAnimationPlayerClient.h" 45 #include "platform/animation/CompositorAnimationPlayerClient.h"
46 #include "platform/heap/Handle.h" 46 #include "platform/heap/Handle.h"
47 #include "wtf/RefPtr.h" 47 #include "wtf/RefPtr.h"
48 #include <memory>
49 48
50 namespace blink { 49 namespace blink {
51 50
52 class AnimationTimeline; 51 class AnimationTimeline;
53 class CompositorAnimationPlayer; 52 class CompositorAnimationPlayer;
54 class Element; 53 class Element;
55 class ExceptionState; 54 class ExceptionState;
56 55
57 class CORE_EXPORT Animation final 56 class CORE_EXPORT Animation final
58 : public EventTargetWithInlineData 57 : public EventTargetWithInlineData
(...skipping 229 matching lines...) Expand 10 before | Expand all | Expand 10 after
288 ~PlayStateUpdateScope(); 287 ~PlayStateUpdateScope();
289 private: 288 private:
290 Member<Animation> m_animation; 289 Member<Animation> m_animation;
291 AnimationPlayState m_initialPlayState; 290 AnimationPlayState m_initialPlayState;
292 CompositorPendingChange m_compositorPendingChange; 291 CompositorPendingChange m_compositorPendingChange;
293 }; 292 };
294 293
295 // This mirrors the known compositor state. It is created when a compositor 294 // This mirrors the known compositor state. It is created when a compositor
296 // animation is started. Updated once the start time is known and each time 295 // animation is started. Updated once the start time is known and each time
297 // modifications are pushed to the compositor. 296 // modifications are pushed to the compositor.
298 std::unique_ptr<CompositorState> m_compositorState; 297 OwnPtr<CompositorState> m_compositorState;
299 bool m_compositorPending; 298 bool m_compositorPending;
300 int m_compositorGroup; 299 int m_compositorGroup;
301 300
302 std::unique_ptr<CompositorAnimationPlayer> m_compositorPlayer; 301 OwnPtr<CompositorAnimationPlayer> m_compositorPlayer;
303 302
304 bool m_currentTimePending; 303 bool m_currentTimePending;
305 bool m_stateIsBeingUpdated; 304 bool m_stateIsBeingUpdated;
306 305
307 bool m_effectSuppressed; 306 bool m_effectSuppressed;
308 }; 307 };
309 308
310 } // namespace blink 309 } // namespace blink
311 310
312 #endif // Animation_h 311 #endif // Animation_h
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698