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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: third_party/WebKit/Source/core/inspector/InspectorDOMAgent.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
« no previous file with comments | « third_party/WebKit/Source/core/inspector/InspectorConsoleAgent.cpp ('k') | third_party/WebKit/Source/core/inspector/InspectorDOMAgent.cpp » ('j') | third_party/WebKit/Source/core/inspector/InspectorLayerTreeAgent.cpp » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: third_party/WebKit/Source/core/inspector/InspectorDOMAgent.h
diff --git a/third_party/WebKit/Source/core/inspector/InspectorDOMAgent.h b/third_party/WebKit/Source/core/inspector/InspectorDOMAgent.h
index c77da2ba1006abad01adc68e6ab91e17249d5fea..a903a9eda05770954f76c06d1dc743521068d3b5 100644
--- a/third_party/WebKit/Source/core/inspector/InspectorDOMAgent.h
+++ b/third_party/WebKit/Source/core/inspector/InspectorDOMAgent.h
@@ -102,13 +102,12 @@ public:
}
static String toErrorString(ExceptionState&);
- static bool getPseudoElementType(PseudoId, protocol::TypeBuilder::DOM::PseudoType::Enum*);
+ static bool getPseudoElementType(PseudoId, String*);
static ShadowRoot* userAgentShadowRoot(Node*);
~InspectorDOMAgent() override;
DECLARE_VIRTUAL_TRACE();
- void disable(ErrorString*) override;
void restore() override;
WillBeHeapVector<RawPtrWillBeMember<Document>> documents();
@@ -116,45 +115,45 @@ public:
// Methods called from the frontend for DOM nodes inspection.
void enable(ErrorString*) override;
- void querySelector(ErrorString*, int nodeId, const String& selectors, int* elementId) override;
- void querySelectorAll(ErrorString*, int nodeId, const String& selectors, RefPtr<protocol::TypeBuilder::Array<int>>& result) override;
- void getDocument(ErrorString*, RefPtr<protocol::TypeBuilder::DOM::Node>& root) override;
- void requestChildNodes(ErrorString*, int nodeId, const int* depth) override;
- void setAttributeValue(ErrorString*, int elementId, const String& name, const String& value) override;
- void setAttributesAsText(ErrorString*, int elementId, const String& text, const String* name) override;
- void removeAttribute(ErrorString*, int elementId, const String& name) override;
- void removeNode(ErrorString*, int nodeId) override;
- void setNodeName(ErrorString*, int nodeId, const String& name, int* newId) override;
- void getOuterHTML(ErrorString*, int nodeId, WTF::String* outerHTML) override;
- void setOuterHTML(ErrorString*, int nodeId, const String& outerHTML) override;
- void setNodeValue(ErrorString*, int nodeId, const String& value) override;
- void performSearch(ErrorString*, const String& whitespaceTrimmedQuery, const bool* includeUserAgentShadowDOM, String* searchId, int* resultCount) override;
- void getSearchResults(ErrorString*, const String& searchId, int fromIndex, int toIndex, RefPtr<protocol::TypeBuilder::Array<int>>&) override;
- void discardSearchResults(ErrorString*, const String& searchId) override;
- void resolveNode(ErrorString*, int nodeId, const String* objectGroup, RefPtr<protocol::TypeBuilder::Runtime::RemoteObject>& result) override;
- void getAttributes(ErrorString*, int nodeId, RefPtr<protocol::TypeBuilder::Array<String>>& result) override;
- void setInspectMode(ErrorString*, const String&, const RefPtr<JSONObject>* highlightConfig) override;
- void requestNode(ErrorString*, const String& objectId, int* nodeId) override;
- void pushNodeByPathToFrontend(ErrorString*, const String& path, int* nodeId) override;
- void pushNodesByBackendIdsToFrontend(ErrorString*, const RefPtr<JSONArray>& nodeIds, RefPtr<protocol::TypeBuilder::Array<int>>&) override;
- void setInspectedNode(ErrorString*, int nodeId) override;
+ void disable(ErrorString*) override;
+ void getDocument(ErrorString*, OwnPtr<protocol::TypeBuilder::DOM::Node>* out_root) override;
+ void requestChildNodes(ErrorString*, int in_nodeId, const OptionalValue<int>& in_depth) override;
+ void querySelector(ErrorString*, int in_nodeId, const String& in_selector, int* out_nodeId) override;
+ void querySelectorAll(ErrorString*, int in_nodeId, const String& in_selector, OwnPtr<protocol::TypeBuilder::Array<int>>* out_nodeIds) override;
+ void setNodeName(ErrorString*, int in_nodeId, const String& in_name, int* out_nodeId) override;
+ void setNodeValue(ErrorString*, int in_nodeId, const String& in_value) override;
+ void removeNode(ErrorString*, int in_nodeId) override;
+ void setAttributeValue(ErrorString*, int in_nodeId, const String& in_name, const String& in_value) override;
+ void setAttributesAsText(ErrorString*, int in_nodeId, const String& in_text, const OptionalValue<String>& in_name) override;
+ void removeAttribute(ErrorString*, int in_nodeId, const String& in_name) override;
+ void getOuterHTML(ErrorString*, int in_nodeId, String* out_outerHTML) override;
+ void setOuterHTML(ErrorString*, int in_nodeId, const String& in_outerHTML) override;
+ void performSearch(ErrorString*, const String& in_query, const OptionalValue<bool>& in_includeUserAgentShadowDOM, String* out_searchId, int* out_resultCount) override;
+ void getSearchResults(ErrorString*, const String& in_searchId, int in_fromIndex, int in_toIndex, OwnPtr<protocol::TypeBuilder::Array<int>>* out_nodeIds) override;
+ void discardSearchResults(ErrorString*, const String& in_searchId) override;
+ void requestNode(ErrorString*, const String& in_objectId, int* out_nodeId) override;
+ void setInspectMode(ErrorString*, const String& in_mode, PassOwnPtr<protocol::TypeBuilder::DOM::HighlightConfig> in_highlightConfig) override;
+ void highlightRect(ErrorString*, int in_x, int in_y, int in_width, int in_height, PassOwnPtr<protocol::TypeBuilder::DOM::RGBA> in_color, PassOwnPtr<protocol::TypeBuilder::DOM::RGBA> in_outlineColor) override;
+ void highlightQuad(ErrorString*, PassOwnPtr<protocol::TypeBuilder::Array<double>> in_quad, PassOwnPtr<protocol::TypeBuilder::DOM::RGBA> in_color, PassOwnPtr<protocol::TypeBuilder::DOM::RGBA> in_outlineColor) override;
+ void highlightNode(ErrorString*, PassOwnPtr<protocol::TypeBuilder::DOM::HighlightConfig> in_highlightConfig, const OptionalValue<int>& in_nodeId, const OptionalValue<int>& in_backendNodeId, const OptionalValue<String>& in_objectId) override;
void hideHighlight(ErrorString*) override;
- void highlightRect(ErrorString*, int x, int y, int width, int height, const RefPtr<JSONObject>* color, const RefPtr<JSONObject>* outlineColor) override;
- void highlightQuad(ErrorString*, const RefPtr<JSONArray>& quad, const RefPtr<JSONObject>* color, const RefPtr<JSONObject>* outlineColor) override;
- void highlightNode(ErrorString*, const RefPtr<JSONObject>& highlightConfig, const int* nodeId, const int* backendNodeId, const String* objectId) override;
- void highlightFrame(ErrorString*, const String& frameId, const RefPtr<JSONObject>* color, const RefPtr<JSONObject>* outlineColor) override;
-
- void copyTo(ErrorString*, int nodeId, int targetElementId, const int* anchorNodeId, int* newNodeId) override;
- void moveTo(ErrorString*, int nodeId, int targetNodeId, const int* anchorNodeId, int* newNodeId) override;
+ void highlightFrame(ErrorString*, const String& in_frameId, PassOwnPtr<protocol::TypeBuilder::DOM::RGBA> in_contentColor, PassOwnPtr<protocol::TypeBuilder::DOM::RGBA> in_contentOutlineColor) override;
+ void pushNodeByPathToFrontend(ErrorString*, const String& in_path, int* out_nodeId) override;
+ void pushNodesByBackendIdsToFrontend(ErrorString*, PassOwnPtr<protocol::TypeBuilder::Array<int>> in_backendNodeIds, OwnPtr<protocol::TypeBuilder::Array<int>>* out_nodeIds) override;
+ void setInspectedNode(ErrorString*, int in_nodeId) override;
+ void resolveNode(ErrorString*, int in_nodeId, const OptionalValue<String>& in_objectGroup, OwnPtr<protocol::TypeBuilder::Runtime::RemoteObject>* out_object) override;
+ void getAttributes(ErrorString*, int in_nodeId, OwnPtr<protocol::TypeBuilder::Array<String>>* out_attributes) override;
+ void copyTo(ErrorString*, int in_nodeId, int in_targetNodeId, const OptionalValue<int>& in_insertBeforeNodeId, int* out_nodeId) override;
+ void moveTo(ErrorString*, int in_nodeId, int in_targetNodeId, const OptionalValue<int>& in_insertBeforeNodeId, int* out_nodeId) override;
void undo(ErrorString*) override;
void redo(ErrorString*) override;
void markUndoableState(ErrorString*) override;
- void focus(ErrorString*, int nodeId) override;
- void setFileInputFiles(ErrorString*, int nodeId, const RefPtr<JSONArray>& files) override;
- void getBoxModel(ErrorString*, int nodeId, RefPtr<protocol::TypeBuilder::DOM::BoxModel>&) override;
- void getNodeForLocation(ErrorString*, int x, int y, int* nodeId) override;
- void getRelayoutBoundary(ErrorString*, int nodeId, int* relayoutBoundaryNodeId) override;
- void getHighlightObjectForTest(ErrorString*, int nodeId, RefPtr<JSONObject>&) override;
+ void focus(ErrorString*, int in_nodeId) override;
+ void setFileInputFiles(ErrorString*, int in_nodeId, PassOwnPtr<protocol::TypeBuilder::Array<String>> in_files) override;
+ void getBoxModel(ErrorString*, int in_nodeId, OwnPtr<protocol::TypeBuilder::DOM::BoxModel>* out_model) override;
+ void getNodeForLocation(ErrorString*, int in_x, int in_y, int* out_nodeId) override;
+ void getRelayoutBoundary(ErrorString*, int in_nodeId, int* out_nodeId) override;
+ void getHighlightObjectForTest(ErrorString*, int in_nodeId, RefPtr<JSONObject>* out_highlight) override;
bool enabled() const;
void releaseDanglingNodes();
@@ -185,7 +184,7 @@ public:
static String documentURLString(Document*);
- PassRefPtr<protocol::TypeBuilder::Runtime::RemoteObject> resolveNode(Node*, const String& objectGroup);
+ PassOwnPtr<protocol::TypeBuilder::Runtime::RemoteObject> resolveNode(Node*, const String& objectGroup);
InspectorHistory* history() { return m_history.get(); }
@@ -208,8 +207,8 @@ private:
void setDocument(Document*);
void innerEnable();
- void setSearchingForNode(ErrorString*, SearchMode, JSONObject* highlightConfig);
- PassOwnPtr<InspectorHighlightConfig> highlightConfigFromInspectorObject(ErrorString*, JSONObject* highlightInspectorObject);
+ void setSearchingForNode(ErrorString*, SearchMode, PassOwnPtr<protocol::TypeBuilder::DOM::HighlightConfig>);
+ PassOwnPtr<InspectorHighlightConfig> highlightConfigFromInspectorObject(ErrorString*, PassOwnPtr<protocol::TypeBuilder::DOM::HighlightConfig> highlightInspectorObject);
// Node-related methods.
typedef WillBeHeapHashMap<RefPtrWillBeMember<Node>, int> NodeToIdMap;
@@ -226,18 +225,18 @@ private:
void invalidateFrameOwnerElement(LocalFrame*);
- PassRefPtr<protocol::TypeBuilder::DOM::Node> buildObjectForNode(Node*, int depth, NodeToIdMap*);
- PassRefPtr<protocol::TypeBuilder::Array<String>> buildArrayForElementAttributes(Element*);
- PassRefPtr<protocol::TypeBuilder::Array<protocol::TypeBuilder::DOM::Node>> buildArrayForContainerChildren(Node* container, int depth, NodeToIdMap* nodesMap);
- PassRefPtr<protocol::TypeBuilder::Array<protocol::TypeBuilder::DOM::Node>> buildArrayForPseudoElements(Element*, NodeToIdMap* nodesMap);
- PassRefPtr<protocol::TypeBuilder::Array<protocol::TypeBuilder::DOM::BackendNode>> buildArrayForDistributedNodes(InsertionPoint*);
+ PassOwnPtr<protocol::TypeBuilder::DOM::Node> buildObjectForNode(Node*, int depth, NodeToIdMap*);
+ PassOwnPtr<protocol::TypeBuilder::Array<String>> buildArrayForElementAttributes(Element*);
+ PassOwnPtr<protocol::TypeBuilder::Array<protocol::TypeBuilder::DOM::Node>> buildArrayForContainerChildren(Node* container, int depth, NodeToIdMap* nodesMap);
+ PassOwnPtr<protocol::TypeBuilder::Array<protocol::TypeBuilder::DOM::Node>> buildArrayForPseudoElements(Element*, NodeToIdMap* nodesMap);
+ PassOwnPtr<protocol::TypeBuilder::Array<protocol::TypeBuilder::DOM::BackendNode>> buildArrayForDistributedNodes(InsertionPoint*);
Node* nodeForPath(const String& path);
Node* nodeForRemoteId(ErrorString*, const String& id);
void discardFrontendBindings();
- void innerHighlightQuad(PassOwnPtr<FloatQuad>, const RefPtr<JSONObject>* color, const RefPtr<JSONObject>* outlineColor);
+ void innerHighlightQuad(PassOwnPtr<FloatQuad>, PassOwnPtr<protocol::TypeBuilder::DOM::RGBA> color, PassOwnPtr<protocol::TypeBuilder::DOM::RGBA> outlineColor);
bool pushDocumentUponHandlelessOperation(ErrorString*);
« no previous file with comments | « third_party/WebKit/Source/core/inspector/InspectorConsoleAgent.cpp ('k') | third_party/WebKit/Source/core/inspector/InspectorDOMAgent.cpp » ('j') | third_party/WebKit/Source/core/inspector/InspectorLayerTreeAgent.cpp » ('J')

Powered by Google App Engine
This is Rietveld 408576698