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

Unified Diff: third_party/WebKit/Source/core/inspector/InspectorAnimationAgent.h

Issue 1702673002: DevTools: migrate remote debugging protocol generators to jinja2. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 years, 10 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/inspector/InspectorAnimationAgent.h
diff --git a/third_party/WebKit/Source/core/inspector/InspectorAnimationAgent.h b/third_party/WebKit/Source/core/inspector/InspectorAnimationAgent.h
index f173da2677353de9b70f574fab902d2e21f90b87..81090d1ee77316bf36c1cf40c729068e20971bf8 100644
--- a/third_party/WebKit/Source/core/inspector/InspectorAnimationAgent.h
+++ b/third_party/WebKit/Source/core/inspector/InspectorAnimationAgent.h
@@ -33,27 +33,25 @@ public:
// Base agent methods.
void restore() override;
- void disable(ErrorString*) override;
void didCommitLoadForLocalFrame(LocalFrame*) override;
// Protocol method implementations
+ void enable(ErrorString*) override;
+ void disable(ErrorString*) override;
void getPlaybackRate(ErrorString*, double* playbackRate) override;
void setPlaybackRate(ErrorString*, double playbackRate) override;
- void getCurrentTime(ErrorString*, const String& animationId, double* currentTime) override;
- void setPaused(ErrorString*, const RefPtr<JSONArray>& animationIds, bool paused) override;
+ void getCurrentTime(ErrorString*, const String& id, double* currentTime) override;
+ void setPaused(ErrorString*, PassOwnPtr<protocol::Array<String>> animations, bool paused) override;
void setTiming(ErrorString*, const String& animationId, double duration, double delay) override;
- void seekAnimations(ErrorString*, const RefPtr<JSONArray>& animationIds, double currentTime) override;
- void resolveAnimation(ErrorString*, const String& animationId, RefPtr<protocol::TypeBuilder::Runtime::RemoteObject>& result) override;
- void releaseAnimations(ErrorString*, const RefPtr<JSONArray>& animationIds) override;
+ void seekAnimations(ErrorString*, PassOwnPtr<protocol::Array<String>> animations, double currentTime) override;
+ void releaseAnimations(ErrorString*, PassOwnPtr<protocol::Array<String>> animations) override;
+ void resolveAnimation(ErrorString*, const String& animationId, OwnPtr<protocol::Runtime::RemoteObject>*) override;
// API for InspectorInstrumentation
void didCreateAnimation(unsigned);
void animationPlayStateChanged(Animation*, Animation::AnimationPlayState, Animation::AnimationPlayState);
void didClearDocumentOfWindowObject(LocalFrame*);
- // API for InspectorFrontend
- void enable(ErrorString*) override;
-
// Methods for other agents to use.
Animation* assertAnimation(ErrorString*, const String& id);
@@ -62,10 +60,10 @@ public:
private:
InspectorAnimationAgent(InspectedFrames*, InspectorDOMAgent*, InspectorCSSAgent*, V8RuntimeAgent*);
- typedef protocol::TypeBuilder::Animation::Animation::Type::Enum AnimationType;
+ using AnimationType = protocol::Animation::Animation::TypeEnum;
- PassRefPtr<protocol::TypeBuilder::Animation::Animation> buildObjectForAnimation(Animation&);
- PassRefPtr<protocol::TypeBuilder::Animation::Animation> buildObjectForAnimation(Animation&, AnimationType, PassRefPtr<protocol::TypeBuilder::Animation::KeyframesRule> keyframeRule = nullptr);
+ PassOwnPtr<protocol::Animation::Animation> buildObjectForAnimation(Animation&);
+ PassOwnPtr<protocol::Animation::Animation> buildObjectForAnimation(Animation&, String, PassOwnPtr<protocol::Animation::KeyframesRule> keyframeRule = nullptr);
double normalizedStartTime(Animation&);
AnimationTimeline& referenceTimeline();
Animation* animationClone(Animation*);
@@ -77,7 +75,7 @@ private:
V8RuntimeAgent* m_runtimeAgent;
PersistentHeapHashMapWillBeHeapHashMap<String, Member<Animation>> m_idToAnimation;
PersistentHeapHashMapWillBeHeapHashMap<String, Member<Animation>> m_idToAnimationClone;
- WillBeHeapHashMap<String, AnimationType> m_idToAnimationType;
+ WillBeHeapHashMap<String, String> m_idToAnimationType;
bool m_isCloning;
HashSet<String> m_clearedAnimations;
};

Powered by Google App Engine
This is Rietveld 408576698