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

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

Issue 2738453004: Avoid using declarations in headers which introduce symbol conflicts. (Closed)
Patch Set: Created 3 years, 9 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 3273f5530deadd4502ce76e4d30872edebfee9e1..1c76ca9c697eaf492b4fdcf5d78708e5f2d807a2 100644
--- a/third_party/WebKit/Source/core/inspector/InspectorAnimationAgent.h
+++ b/third_party/WebKit/Source/core/inspector/InspectorAnimationAgent.h
@@ -34,21 +34,24 @@ class CORE_EXPORT InspectorAnimationAgent final
void didCommitLoadForLocalFrame(LocalFrame*) override;
// Protocol method implementations
- Response enable() override;
- Response disable() override;
- Response getPlaybackRate(double* playbackRate) override;
- Response setPlaybackRate(double) override;
- Response getCurrentTime(const String& id, double* currentTime) override;
- Response setPaused(std::unique_ptr<protocol::Array<String>> animations,
- bool paused) override;
- Response setTiming(const String& animationId,
- double duration,
- double delay) override;
- Response seekAnimations(std::unique_ptr<protocol::Array<String>> animations,
- double currentTime) override;
- Response releaseAnimations(
+ protocol::Response enable() override;
+ protocol::Response disable() override;
+ protocol::Response getPlaybackRate(double* playbackRate) override;
+ protocol::Response setPlaybackRate(double) override;
+ protocol::Response getCurrentTime(const String& id,
+ double* currentTime) override;
+ protocol::Response setPaused(
+ std::unique_ptr<protocol::Array<String>> animations,
+ bool paused) override;
+ protocol::Response setTiming(const String& animationId,
+ double duration,
+ double delay) override;
+ protocol::Response seekAnimations(
+ std::unique_ptr<protocol::Array<String>> animations,
+ double currentTime) override;
+ protocol::Response releaseAnimations(
std::unique_ptr<protocol::Array<String>> animations) override;
- Response resolveAnimation(
+ protocol::Response resolveAnimation(
const String& animationId,
std::unique_ptr<v8_inspector::protocol::Runtime::API::RemoteObject>*)
override;
@@ -61,7 +64,8 @@ class CORE_EXPORT InspectorAnimationAgent final
void didClearDocumentOfWindowObject(LocalFrame*);
// Methods for other agents to use.
- Response assertAnimation(const String& id, blink::Animation*& result);
+ protocol::Response assertAnimation(const String& id,
+ blink::Animation*& result);
DECLARE_VIRTUAL_TRACE();

Powered by Google App Engine
This is Rietveld 408576698