| Index: Source/core/inspector/InspectorDOMAgent.h
|
| diff --git a/Source/core/inspector/InspectorDOMAgent.h b/Source/core/inspector/InspectorDOMAgent.h
|
| index 9425a351d5ea0ea5c17863bb5f6e532fd8eae549..72276dbd0486ee640d8c9f93ab3bc498dca3ff9f 100644
|
| --- a/Source/core/inspector/InspectorDOMAgent.h
|
| +++ b/Source/core/inspector/InspectorDOMAgent.h
|
| @@ -108,17 +108,17 @@ public:
|
| virtual void clearFrontend() override;
|
| virtual void restore() override;
|
|
|
| - WillBeHeapVector<RawPtrWillBeMember<Document> > documents();
|
| + WillBeHeapVector<RawPtrWillBeMember<Document>> documents();
|
| void reset();
|
|
|
| // Methods called from the frontend for DOM nodes inspection.
|
| virtual void enable(ErrorString*) override;
|
| virtual void disable(ErrorString*) override;
|
| virtual void querySelector(ErrorString*, int nodeId, const String& selectors, int* elementId) override;
|
| - virtual void querySelectorAll(ErrorString*, int nodeId, const String& selectors, RefPtr<TypeBuilder::Array<int> >& result) override;
|
| + virtual void querySelectorAll(ErrorString*, int nodeId, const String& selectors, RefPtr<TypeBuilder::Array<int>>& result) override;
|
| virtual void getDocument(ErrorString*, RefPtr<TypeBuilder::DOM::Node>& root) override;
|
| virtual void requestChildNodes(ErrorString*, int nodeId, const int* depth) override;
|
| - virtual void requestShadowHostDistributedNodes(ErrorString*, int nodeId, RefPtr<TypeBuilder::Array<TypeBuilder::DOM::InsertionPointDistribution> >& insertionPointDistributions) override;
|
| + virtual void requestShadowHostDistributedNodes(ErrorString*, int nodeId, RefPtr<TypeBuilder::Array<TypeBuilder::DOM::InsertionPointDistribution>>& insertionPointDistributions) override;
|
| virtual void setAttributeValue(ErrorString*, int elementId, const String& name, const String& value) override;
|
| virtual void setAttributesAsText(ErrorString*, int elementId, const String& text, const String* name) override;
|
| virtual void removeAttribute(ErrorString*, int elementId, const String& name) override;
|
| @@ -127,16 +127,16 @@ public:
|
| virtual void getOuterHTML(ErrorString*, int nodeId, WTF::String* outerHTML) override;
|
| virtual void setOuterHTML(ErrorString*, int nodeId, const String& outerHTML) override;
|
| virtual void setNodeValue(ErrorString*, int nodeId, const String& value) override;
|
| - virtual void getEventListenersForNode(ErrorString*, int nodeId, const WTF::String* objectGroup, RefPtr<TypeBuilder::Array<TypeBuilder::DOM::EventListener> >& listenersArray) override;
|
| + virtual void getEventListenersForNode(ErrorString*, int nodeId, const WTF::String* objectGroup, RefPtr<TypeBuilder::Array<TypeBuilder::DOM::EventListener>>& listenersArray) override;
|
| virtual void performSearch(ErrorString*, const String& whitespaceTrimmedQuery, const bool* includeUserAgentShadowDOM, String* searchId, int* resultCount) override;
|
| - virtual void getSearchResults(ErrorString*, const String& searchId, int fromIndex, int toIndex, RefPtr<TypeBuilder::Array<int> >&) override;
|
| + virtual void getSearchResults(ErrorString*, const String& searchId, int fromIndex, int toIndex, RefPtr<TypeBuilder::Array<int>>&) override;
|
| virtual void discardSearchResults(ErrorString*, const String& searchId) override;
|
| virtual void resolveNode(ErrorString*, int nodeId, const String* objectGroup, RefPtr<TypeBuilder::Runtime::RemoteObject>& result) override;
|
| - virtual void getAttributes(ErrorString*, int nodeId, RefPtr<TypeBuilder::Array<String> >& result) override;
|
| + virtual void getAttributes(ErrorString*, int nodeId, RefPtr<TypeBuilder::Array<String>>& result) override;
|
| virtual void setInspectModeEnabled(ErrorString*, bool enabled, const bool* inspectUAShadowDOM, const RefPtr<JSONObject>* highlightConfig) override;
|
| virtual void requestNode(ErrorString*, const String& objectId, int* nodeId) override;
|
| virtual void pushNodeByPathToFrontend(ErrorString*, const String& path, int* nodeId) override;
|
| - virtual void pushNodesByBackendIdsToFrontend(ErrorString*, const RefPtr<JSONArray>& nodeIds, RefPtr<TypeBuilder::Array<int> >&) override;
|
| + virtual void pushNodesByBackendIdsToFrontend(ErrorString*, const RefPtr<JSONArray>& nodeIds, RefPtr<TypeBuilder::Array<int>>&) override;
|
| virtual void hideHighlight(ErrorString*) override;
|
| virtual void highlightRect(ErrorString*, int x, int y, int width, int height, const RefPtr<JSONObject>* color, const RefPtr<JSONObject>* outlineColor) override;
|
| virtual void highlightQuad(ErrorString*, const RefPtr<JSONArray>& quad, const RefPtr<JSONObject>* color, const RefPtr<JSONObject>* outlineColor) override;
|
| @@ -177,8 +177,8 @@ public:
|
| void willModifyDOMAttr(Element*, const AtomicString& oldValue, const AtomicString& newValue);
|
| void didModifyDOMAttr(Element*, const QualifiedName&, const AtomicString& value);
|
| void didRemoveDOMAttr(Element*, const QualifiedName&);
|
| - void styleAttributeInvalidated(const WillBeHeapVector<RawPtrWillBeMember<Element> >& elements);
|
| - void contentDistributionInvalidated(const WillBeHeapVector<RawPtrWillBeMember<Element> >& elements);
|
| + void styleAttributeInvalidated(const WillBeHeapVector<RawPtrWillBeMember<Element>>& elements);
|
| + void contentDistributionInvalidated(const WillBeHeapVector<RawPtrWillBeMember<Element>>& elements);
|
| void characterDataModified(CharacterData*);
|
| void didInvalidateStyleAttr(Node*);
|
| void didPushShadowRoot(Element* host, ShadowRoot*);
|
| @@ -243,10 +243,10 @@ private:
|
| void invalidateFrameOwnerElement(LocalFrame*);
|
|
|
| PassRefPtr<TypeBuilder::DOM::Node> buildObjectForNode(Node*, int depth, NodeToIdMap*);
|
| - PassRefPtr<TypeBuilder::Array<String> > buildArrayForElementAttributes(Element*);
|
| - PassRefPtr<TypeBuilder::Array<TypeBuilder::DOM::Node> > buildArrayForContainerChildren(Node* container, int depth, NodeToIdMap* nodesMap);
|
| + PassRefPtr<TypeBuilder::Array<String>> buildArrayForElementAttributes(Element*);
|
| + PassRefPtr<TypeBuilder::Array<TypeBuilder::DOM::Node>> buildArrayForContainerChildren(Node* container, int depth, NodeToIdMap* nodesMap);
|
| PassRefPtr<TypeBuilder::DOM::EventListener> buildObjectForEventListener(const RegisteredEventListener&, const AtomicString& eventType, Node*, const String* objectGroupId);
|
| - PassRefPtr<TypeBuilder::Array<TypeBuilder::DOM::Node> > buildArrayForPseudoElements(Element*, NodeToIdMap* nodesMap);
|
| + PassRefPtr<TypeBuilder::Array<TypeBuilder::DOM::Node>> buildArrayForPseudoElements(Element*, NodeToIdMap* nodesMap);
|
|
|
| Node* nodeForPath(const String& path);
|
|
|
| @@ -265,15 +265,15 @@ private:
|
| RawPtrWillBeMember<DOMListener> m_domListener;
|
| OwnPtrWillBeMember<NodeToIdMap> m_documentNodeToIdMap;
|
| // Owns node mappings for dangling nodes.
|
| - WillBeHeapVector<OwnPtrWillBeMember<NodeToIdMap> > m_danglingNodeToIdMaps;
|
| - WillBeHeapHashMap<int, RawPtrWillBeMember<Node> > m_idToNode;
|
| - WillBeHeapHashMap<int, RawPtrWillBeMember<NodeToIdMap> > m_idToNodesMap;
|
| + WillBeHeapVector<OwnPtrWillBeMember<NodeToIdMap>> m_danglingNodeToIdMaps;
|
| + WillBeHeapHashMap<int, RawPtrWillBeMember<Node>> m_idToNode;
|
| + WillBeHeapHashMap<int, RawPtrWillBeMember<NodeToIdMap>> m_idToNodesMap;
|
| HashSet<int> m_childrenRequested;
|
| HashSet<int> m_distributedNodesRequested;
|
| HashMap<int, int> m_cachedChildCount;
|
| int m_lastNodeId;
|
| RefPtrWillBeMember<Document> m_document;
|
| - typedef WillBeHeapHashMap<String, WillBeHeapVector<RefPtrWillBeMember<Node> > > SearchResults;
|
| + typedef WillBeHeapHashMap<String, WillBeHeapVector<RefPtrWillBeMember<Node>>> SearchResults;
|
| SearchResults m_searchResults;
|
| OwnPtrWillBeMember<InspectorRevalidateDOMTask> m_revalidateTask;
|
| SearchMode m_searchingForNode;
|
|
|