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

Unified Diff: third_party/WebKit/Source/core/animation/KeyframeEffect.h

Issue 2394993002: Move Priority enum/field to KeyframeEffectReadOnly (Closed)
Patch Set: Created 4 years, 2 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 side-by-side diff with in-line comments
Download patch
Index: third_party/WebKit/Source/core/animation/KeyframeEffect.h
diff --git a/third_party/WebKit/Source/core/animation/KeyframeEffect.h b/third_party/WebKit/Source/core/animation/KeyframeEffect.h
index 7deead1a2fe5468929b83e43b2b5ebbdd4b01ba4..b9b40c11c648a5c4ee1d39bbd882ede2b932d099 100644
--- a/third_party/WebKit/Source/core/animation/KeyframeEffect.h
+++ b/third_party/WebKit/Source/core/animation/KeyframeEffect.h
@@ -55,12 +55,11 @@ class CORE_EXPORT KeyframeEffect final : public KeyframeEffectReadOnly {
DEFINE_WRAPPERTYPEINFO();
public:
- enum Priority { DefaultPriority, TransitionPriority };
-
static KeyframeEffect* create(Element*,
EffectModel*,
const Timing&,
- Priority = DefaultPriority,
+ KeyframeEffectReadOnly::Priority =
+ KeyframeEffectReadOnly::DefaultPriority,
EventDelegate* = nullptr);
// Web Animations API Bindings constructors.
static KeyframeEffect* create(
@@ -89,7 +88,6 @@ class CORE_EXPORT KeyframeEffect final : public KeyframeEffectReadOnly {
const EffectModel* model() const { return m_model.get(); }
EffectModel* model() { return m_model.get(); }
void setModel(EffectModel* model) { m_model = model; }
- Priority getPriority() const { return m_priority; }
Element* target() const { return m_target; }
void notifySampledEffectRemovedFromAnimationStack();
@@ -118,8 +116,6 @@ class CORE_EXPORT KeyframeEffect final : public KeyframeEffectReadOnly {
DECLARE_VIRTUAL_TRACE();
- void downgradeToNormal() { m_priority = DefaultPriority; }
-
protected:
void applyEffects();
void clearEffects();
@@ -137,10 +133,9 @@ class CORE_EXPORT KeyframeEffect final : public KeyframeEffectReadOnly {
KeyframeEffect(Element*,
EffectModel*,
const Timing&,
- Priority,
+ KeyframeEffectReadOnly::Priority,
EventDelegate*);
- Priority m_priority;
Vector<int> m_compositorAnimationIds;
friend class AnimationAnimationV8Test;

Powered by Google App Engine
This is Rietveld 408576698