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

Unified Diff: third_party/WebKit/Source/core/inspector/InspectorPageAgent.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/InspectorPageAgent.h
diff --git a/third_party/WebKit/Source/core/inspector/InspectorPageAgent.h b/third_party/WebKit/Source/core/inspector/InspectorPageAgent.h
index a3a3ebf767eeeca7ab510f2aa82d60d52fb6a668..5082c52494947f9607b15161b3a0b001767d144a 100644
--- a/third_party/WebKit/Source/core/inspector/InspectorPageAgent.h
+++ b/third_party/WebKit/Source/core/inspector/InspectorPageAgent.h
@@ -54,6 +54,8 @@ class TextResourceDecoder;
typedef String ErrorString;
+using blink::protocol::TypeBuilder::OptionalValue;
+
class CORE_EXPORT InspectorPageAgent final : public InspectorBaseAgent<InspectorPageAgent, protocol::Frontend::Page>, public protocol::Dispatcher::PageCommandHandler {
WTF_MAKE_NONCOPYABLE(InspectorPageAgent);
public:
@@ -61,7 +63,7 @@ public:
public:
virtual ~Client() { }
virtual void pageLayoutInvalidated() { }
- virtual void setPausedInDebuggerMessage(const String*) { }
+ virtual void setPausedInDebuggerMessage(const String&) { }
virtual void waitForCreateWindow(LocalFrame*) { }
};
@@ -89,25 +91,26 @@ public:
static PassRefPtr<SharedBuffer> resourceData(LocalFrame*, const KURL&, String* textEncodingName);
static Resource* cachedResource(LocalFrame*, const KURL&);
- static protocol::TypeBuilder::Page::ResourceType::Enum resourceTypeJson(ResourceType);
+ static String resourceTypeJson(ResourceType);
static ResourceType cachedResourceType(const Resource&);
- static protocol::TypeBuilder::Page::ResourceType::Enum cachedResourceTypeJson(const Resource&);
+ static String cachedResourceTypeJson(const Resource&);
static PassOwnPtr<TextResourceDecoder> createResourceTextDecoder(const String& mimeType, const String& textEncodingName);
// Page API for InspectorFrontend
void enable(ErrorString*) override;
- void addScriptToEvaluateOnLoad(ErrorString*, const String& source, String* result) override;
- void removeScriptToEvaluateOnLoad(ErrorString*, const String& identifier) override;
- void setAutoAttachToCreatedPages(ErrorString*, bool autoAttach) override;
- void reload(ErrorString*, const bool* optionalIgnoreCache, const String* optionalScriptToEvaluateOnLoad) override;
- void navigate(ErrorString*, const String& url, String* frameId) override;
- void getResourceTree(ErrorString*, RefPtr<protocol::TypeBuilder::Page::FrameResourceTree>&) override;
- void getResourceContent(ErrorString*, const String& frameId, const String& url, PassRefPtr<GetResourceContentCallback>) override;
- void searchInResource(ErrorString*, const String& frameId, const String& url, const String& query, const bool* optionalCaseSensitive, const bool* optionalIsRegex, PassRefPtr<SearchInResourceCallback>) override;
- void setDocumentContent(ErrorString*, const String& frameId, const String& html) override;
- void startScreencast(ErrorString*, const String* format, const int* quality, const int* maxWidth, const int* maxHeight, const int* everyNthFrame) override;
+ void disable(ErrorString*) override;
+ void addScriptToEvaluateOnLoad(ErrorString*, const String& in_scriptSource, String* out_identifier) override;
+ void removeScriptToEvaluateOnLoad(ErrorString*, const String& in_identifier) override;
+ void setAutoAttachToCreatedPages(ErrorString*, bool in_autoAttach) override;
+ void reload(ErrorString*, const protocol::TypeBuilder::OptionalValue<bool>& in_ignoreCache, const protocol::TypeBuilder::OptionalValue<String>& in_scriptToEvaluateOnLoad) override;
+ void navigate(ErrorString*, const String& in_url, String* out_frameId) override;
+ void getResourceTree(ErrorString*, OwnPtr<protocol::TypeBuilder::Page::FrameResourceTree>* out_frameTree) override;
+ void getResourceContent(ErrorString*, const String& in_frameId, const String& in_url, PassRefPtr<GetResourceContentCallback>) override;
+ void searchInResource(ErrorString*, const String& in_frameId, const String& in_url, const String& in_query, const protocol::TypeBuilder::OptionalValue<bool>& in_caseSensitive, const protocol::TypeBuilder::OptionalValue<bool>& in_isRegex, PassRefPtr<SearchInResourceCallback>) override;
+ void setDocumentContent(ErrorString*, const String& in_frameId, const String& in_html) override;
+ void startScreencast(ErrorString*, const protocol::TypeBuilder::OptionalValue<String>& in_format, const protocol::TypeBuilder::OptionalValue<int>& in_quality, const protocol::TypeBuilder::OptionalValue<int>& in_maxWidth, const protocol::TypeBuilder::OptionalValue<int>& in_maxHeight, const protocol::TypeBuilder::OptionalValue<int>& in_everyNthFrame) override;
void stopScreencast(ErrorString*) override;
- void setOverlayMessage(ErrorString*, const String*) override;
+ void setOverlayMessage(ErrorString*, const protocol::TypeBuilder::OptionalValue<String>& in_message) override;
// InspectorInstrumentation API
void didClearDocumentOfWindowObject(LocalFrame*);
@@ -128,7 +131,6 @@ public:
void windowCreated(LocalFrame*);
// Inspector Controller API
- void disable(ErrorString*) override;
void restore() override;
bool screencastEnabled();
@@ -143,8 +145,8 @@ private:
static bool dataContent(const char* data, unsigned size, const String& textEncodingName, bool withBase64Encode, String* result);
- PassRefPtr<protocol::TypeBuilder::Page::Frame> buildObjectForFrame(LocalFrame*);
- PassRefPtr<protocol::TypeBuilder::Page::FrameResourceTree> buildObjectForFrameTree(LocalFrame*);
+ PassOwnPtr<protocol::TypeBuilder::Page::Frame> buildObjectForFrame(LocalFrame*);
+ PassOwnPtr<protocol::TypeBuilder::Page::FrameResourceTree> buildObjectForFrameTree(LocalFrame*);
RawPtrWillBeMember<InspectedFrames> m_inspectedFrames;
RawPtrWillBeMember<InspectorDebuggerAgent> m_debuggerAgent;
Client* m_client;

Powered by Google App Engine
This is Rietveld 408576698