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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: Source/core/inspector/InspectorDOMAgent.cpp

Issue 884753003: Fix template angle bracket syntax in inspector (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Some more fixes Created 5 years, 11 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 | « Source/core/inspector/InspectorDOMAgent.h ('k') | Source/core/inspector/InspectorDOMDebuggerAgent.cpp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: Source/core/inspector/InspectorDOMAgent.cpp
diff --git a/Source/core/inspector/InspectorDOMAgent.cpp b/Source/core/inspector/InspectorDOMAgent.cpp
index cb4a199fc7f5f99d70c0e7fffe32519538416493..bcf53c78897ea1d4db6511d89f7867aa753de4ca 100644
--- a/Source/core/inspector/InspectorDOMAgent.cpp
+++ b/Source/core/inspector/InspectorDOMAgent.cpp
@@ -194,8 +194,8 @@ public:
private:
RawPtrWillBeMember<InspectorDOMAgent> m_domAgent;
Timer<InspectorRevalidateDOMTask> m_timer;
- WillBeHeapHashSet<RefPtrWillBeMember<Element> > m_styleAttrInvalidatedElements;
- WillBeHeapHashSet<RefPtrWillBeMember<Element> > m_contentDistributionInvalidatedElements;
+ WillBeHeapHashSet<RefPtrWillBeMember<Element>> m_styleAttrInvalidatedElements;
+ WillBeHeapHashSet<RefPtrWillBeMember<Element>> m_contentDistributionInvalidatedElements;
};
InspectorRevalidateDOMTask::InspectorRevalidateDOMTask(InspectorDOMAgent* domAgent)
@@ -221,7 +221,7 @@ void InspectorRevalidateDOMTask::scheduleContentDistributionRevalidationFor(Elem
void InspectorRevalidateDOMTask::onTimer(Timer<InspectorRevalidateDOMTask>*)
{
// The timer is stopped on m_domAgent destruction, so this method will never be called after m_domAgent has been destroyed.
- WillBeHeapVector<RawPtrWillBeMember<Element> > elements;
+ WillBeHeapVector<RawPtrWillBeMember<Element>> elements;
for (auto& attribute : m_styleAttrInvalidatedElements)
elements.append(attribute.get());
m_domAgent->styleAttributeInvalidated(elements);
@@ -310,9 +310,9 @@ void InspectorDOMAgent::restore()
innerEnable();
}
-WillBeHeapVector<RawPtrWillBeMember<Document> > InspectorDOMAgent::documents()
+WillBeHeapVector<RawPtrWillBeMember<Document>> InspectorDOMAgent::documents()
{
- WillBeHeapVector<RawPtrWillBeMember<Document> > result;
+ WillBeHeapVector<RawPtrWillBeMember<Document>> result;
for (Frame* frame = m_document->frame(); frame; frame = frame->tree().traverseNext()) {
if (!frame->isLocalFrame())
continue;
@@ -601,7 +601,7 @@ void InspectorDOMAgent::pushChildNodesToFrontend(int nodeId, int depth)
return;
}
- RefPtr<TypeBuilder::Array<TypeBuilder::DOM::Node> > children = buildArrayForContainerChildren(node, depth, nodeMap);
+ RefPtr<TypeBuilder::Array<TypeBuilder::DOM::Node>> children = buildArrayForContainerChildren(node, depth, nodeMap);
m_frontend->setChildNodes(nodeId, children.release());
}
@@ -626,7 +626,7 @@ Node* InspectorDOMAgent::nodeForId(int id)
if (!id)
return nullptr;
- WillBeHeapHashMap<int, RawPtrWillBeMember<Node> >::iterator it = m_idToNode.find(id);
+ WillBeHeapHashMap<int, RawPtrWillBeMember<Node>>::iterator it = m_idToNode.find(id);
if (it != m_idToNode.end())
return it->value;
return nullptr;
@@ -650,7 +650,7 @@ void InspectorDOMAgent::requestChildNodes(ErrorString* errorString, int nodeId,
pushChildNodesToFrontend(nodeId, sanitizedDepth);
}
-void InspectorDOMAgent::requestShadowHostDistributedNodes(ErrorString* errorString, int nodeId, RefPtr<TypeBuilder::Array<TypeBuilder::DOM::InsertionPointDistribution> >& insertionPointDistributions)
+void InspectorDOMAgent::requestShadowHostDistributedNodes(ErrorString* errorString, int nodeId, RefPtr<TypeBuilder::Array<TypeBuilder::DOM::InsertionPointDistribution>>& insertionPointDistributions)
{
Node* shadowHost = assertNode(errorString, nodeId);
if (!shadowHost)
@@ -665,13 +665,13 @@ void InspectorDOMAgent::requestShadowHostDistributedNodes(ErrorString* errorStri
insertionPointDistributions = TypeBuilder::Array<TypeBuilder::DOM::InsertionPointDistribution>::create();
for (ShadowRoot* root = shadowHost->youngestShadowRoot(); root; root = root->olderShadowRoot()) {
- const WillBeHeapVector<RefPtrWillBeMember<InsertionPoint> >& insertionPoints = root->descendantInsertionPoints();
+ const WillBeHeapVector<RefPtrWillBeMember<InsertionPoint>>& insertionPoints = root->descendantInsertionPoints();
for (const auto& it : insertionPoints) {
InsertionPoint* insertionPoint = it.get();
int insertionPointId = pushNodePathToFrontend(insertionPoint, nodeMap);
ASSERT(insertionPointId);
- RefPtr<TypeBuilder::Array<TypeBuilder::DOM::DistributedNode> > distributedNodes = TypeBuilder::Array<TypeBuilder::DOM::DistributedNode>::create();
+ RefPtr<TypeBuilder::Array<TypeBuilder::DOM::DistributedNode>> distributedNodes = TypeBuilder::Array<TypeBuilder::DOM::DistributedNode>::create();
for (size_t i = 0; i < insertionPoint->size(); ++i) {
Node* distributedNode = insertionPoint->at(i);
if (isWhitespace(distributedNode))
@@ -683,7 +683,7 @@ void InspectorDOMAgent::requestShadowHostDistributedNodes(ErrorString* errorStri
RefPtr<TypeBuilder::DOM::DistributedNode> distributedNodeObject = TypeBuilder::DOM::DistributedNode::create()
.setNodeId(distributedNodeId);
- RefPtr<TypeBuilder::Array<int> > destinationInsertionPointIds = TypeBuilder::Array<int>::create();
+ RefPtr<TypeBuilder::Array<int>> destinationInsertionPointIds = TypeBuilder::Array<int>::create();
WillBeHeapVector<RawPtrWillBeMember<InsertionPoint>, 8> destinationInsertionPoints;
collectDestinationInsertionPoints(*distributedNode, destinationInsertionPoints);
// If this node has only one destination insertion point (often), then we already know it and don't need any additional information.
@@ -726,7 +726,7 @@ void InspectorDOMAgent::querySelector(ErrorString* errorString, int nodeId, cons
*elementId = pushNodePathToFrontend(element.get());
}
-void InspectorDOMAgent::querySelectorAll(ErrorString* errorString, int nodeId, const String& selectors, RefPtr<TypeBuilder::Array<int> >& result)
+void InspectorDOMAgent::querySelectorAll(ErrorString* errorString, int nodeId, const String& selectors, RefPtr<TypeBuilder::Array<int>>& result)
{
Node* node = assertNode(errorString, nodeId);
if (!node || !node->isContainerNode())
@@ -760,7 +760,7 @@ int InspectorDOMAgent::pushNodePathToFrontend(Node* nodeToPush, NodeToIdMap* nod
return result;
Node* node = nodeToPush;
- WillBeHeapVector<RawPtrWillBeMember<Node> > path;
+ WillBeHeapVector<RawPtrWillBeMember<Node>> path;
while (true) {
Node* parent = innerParentNode(node);
@@ -797,7 +797,7 @@ int InspectorDOMAgent::pushNodePathToFrontend(Node* nodeToPush)
OwnPtrWillBeRawPtr<NodeToIdMap> newMap = adoptPtrWillBeNoop(new NodeToIdMap);
NodeToIdMap* danglingMap = newMap.get();
m_danglingNodeToIdMaps.append(newMap.release());
- RefPtr<TypeBuilder::Array<TypeBuilder::DOM::Node> > children = TypeBuilder::Array<TypeBuilder::DOM::Node>::create();
+ RefPtr<TypeBuilder::Array<TypeBuilder::DOM::Node>> children = TypeBuilder::Array<TypeBuilder::DOM::Node>::create();
children->addItem(buildObjectForNode(node, 0, danglingMap));
m_frontend->setChildNodes(0, children);
@@ -979,7 +979,7 @@ void InspectorDOMAgent::setNodeValue(ErrorString* errorString, int nodeId, const
m_domEditor->replaceWholeText(toText(node), value, errorString);
}
-void InspectorDOMAgent::getEventListenersForNode(ErrorString* errorString, int nodeId, const String* objectGroup, RefPtr<TypeBuilder::Array<TypeBuilder::DOM::EventListener> >& listenersArray)
+void InspectorDOMAgent::getEventListenersForNode(ErrorString* errorString, int nodeId, const String* objectGroup, RefPtr<TypeBuilder::Array<TypeBuilder::DOM::EventListener>>& listenersArray)
{
listenersArray = TypeBuilder::Array<TypeBuilder::DOM::EventListener>::create();
Node* node = assertNode(errorString, nodeId);
@@ -1113,8 +1113,8 @@ void InspectorDOMAgent::performSearch(ErrorString*, const String& whitespaceTrim
if (endQuoteFound)
attributeQuery = attributeQuery.left(attributeQuery.length() - 1);
- WillBeHeapVector<RawPtrWillBeMember<Document> > docs = documents();
- WillBeHeapListHashSet<RawPtrWillBeMember<Node> > resultCollector;
+ WillBeHeapVector<RawPtrWillBeMember<Document>> docs = documents();
+ WillBeHeapListHashSet<RawPtrWillBeMember<Node>> resultCollector;
for (Document* document : docs) {
Node* documentElement = document->documentElement();
@@ -1199,7 +1199,7 @@ void InspectorDOMAgent::performSearch(ErrorString*, const String& whitespaceTrim
}
*searchId = IdentifiersFactory::createIdentifier();
- WillBeHeapVector<RefPtrWillBeMember<Node> >* resultsIt = &m_searchResults.add(*searchId, WillBeHeapVector<RefPtrWillBeMember<Node> >()).storedValue->value;
+ WillBeHeapVector<RefPtrWillBeMember<Node>>* resultsIt = &m_searchResults.add(*searchId, WillBeHeapVector<RefPtrWillBeMember<Node>>()).storedValue->value;
for (auto& result : resultCollector)
resultsIt->append(result);
@@ -1207,7 +1207,7 @@ void InspectorDOMAgent::performSearch(ErrorString*, const String& whitespaceTrim
*resultCount = resultsIt->size();
}
-void InspectorDOMAgent::getSearchResults(ErrorString* errorString, const String& searchId, int fromIndex, int toIndex, RefPtr<TypeBuilder::Array<int> >& nodeIds)
+void InspectorDOMAgent::getSearchResults(ErrorString* errorString, const String& searchId, int fromIndex, int toIndex, RefPtr<TypeBuilder::Array<int>>& nodeIds)
{
SearchResults::iterator it = m_searchResults.find(searchId);
if (it == m_searchResults.end()) {
@@ -1600,7 +1600,7 @@ void InspectorDOMAgent::resolveNode(ErrorString* errorString, int nodeId, const
result = object;
}
-void InspectorDOMAgent::getAttributes(ErrorString* errorString, int nodeId, RefPtr<TypeBuilder::Array<String> >& result)
+void InspectorDOMAgent::getAttributes(ErrorString* errorString, int nodeId, RefPtr<TypeBuilder::Array<String>>& result)
{
Element* element = assertElement(errorString, nodeId);
if (!element)
@@ -1690,7 +1690,7 @@ PassRefPtr<TypeBuilder::DOM::Node> InspectorDOMAgent::buildObjectForNode(Node* n
ElementShadow* shadow = element->shadow();
if (shadow) {
- RefPtr<TypeBuilder::Array<TypeBuilder::DOM::Node> > shadowRoots = TypeBuilder::Array<TypeBuilder::DOM::Node>::create();
+ RefPtr<TypeBuilder::Array<TypeBuilder::DOM::Node>> shadowRoots = TypeBuilder::Array<TypeBuilder::DOM::Node>::create();
for (ShadowRoot* root = shadow->youngestShadowRoot(); root; root = root->olderShadowRoot())
shadowRoots->addItem(buildObjectForNode(root, 0, nodesMap));
value->setShadowRoots(shadowRoots);
@@ -1717,7 +1717,7 @@ PassRefPtr<TypeBuilder::DOM::Node> InspectorDOMAgent::buildObjectForNode(Node* n
value->setPseudoType(TypeBuilder::DOM::PseudoType::After);
break;
default: {
- RefPtr<TypeBuilder::Array<TypeBuilder::DOM::Node> > pseudoElements = buildArrayForPseudoElements(element, nodesMap);
+ RefPtr<TypeBuilder::Array<TypeBuilder::DOM::Node>> pseudoElements = buildArrayForPseudoElements(element, nodesMap);
if (pseudoElements) {
value->setPseudoElements(pseudoElements.release());
forcePushChildren = true;
@@ -1749,7 +1749,7 @@ PassRefPtr<TypeBuilder::DOM::Node> InspectorDOMAgent::buildObjectForNode(Node* n
m_cachedChildCount.set(id, nodeCount);
if (forcePushChildren && !depth)
depth = 1;
- RefPtr<TypeBuilder::Array<TypeBuilder::DOM::Node> > children = buildArrayForContainerChildren(node, depth, nodesMap);
+ RefPtr<TypeBuilder::Array<TypeBuilder::DOM::Node>> children = buildArrayForContainerChildren(node, depth, nodesMap);
if (children->length() > 0 || depth) // Push children along with shadow in any case.
value->setChildren(children.release());
}
@@ -1757,9 +1757,9 @@ PassRefPtr<TypeBuilder::DOM::Node> InspectorDOMAgent::buildObjectForNode(Node* n
return value.release();
}
-PassRefPtr<TypeBuilder::Array<String> > InspectorDOMAgent::buildArrayForElementAttributes(Element* element)
+PassRefPtr<TypeBuilder::Array<String>> InspectorDOMAgent::buildArrayForElementAttributes(Element* element)
{
- RefPtr<TypeBuilder::Array<String> > attributesValue = TypeBuilder::Array<String>::create();
+ RefPtr<TypeBuilder::Array<String>> attributesValue = TypeBuilder::Array<String>::create();
// Go through all attributes and serialize them.
AttributeCollection attributes = element->attributes();
for (auto& attribute : attributes) {
@@ -1770,9 +1770,9 @@ PassRefPtr<TypeBuilder::Array<String> > InspectorDOMAgent::buildArrayForElementA
return attributesValue.release();
}
-PassRefPtr<TypeBuilder::Array<TypeBuilder::DOM::Node> > InspectorDOMAgent::buildArrayForContainerChildren(Node* container, int depth, NodeToIdMap* nodesMap)
+PassRefPtr<TypeBuilder::Array<TypeBuilder::DOM::Node>> InspectorDOMAgent::buildArrayForContainerChildren(Node* container, int depth, NodeToIdMap* nodesMap)
{
- RefPtr<TypeBuilder::Array<TypeBuilder::DOM::Node> > children = TypeBuilder::Array<TypeBuilder::DOM::Node>::create();
+ RefPtr<TypeBuilder::Array<TypeBuilder::DOM::Node>> children = TypeBuilder::Array<TypeBuilder::DOM::Node>::create();
if (depth == 0) {
// Special-case the only text child - pretend that container's children have been requested.
Node* firstChild = container->firstChild();
@@ -1837,12 +1837,12 @@ PassRefPtr<TypeBuilder::DOM::EventListener> InspectorDOMAgent::buildObjectForEve
return value.release();
}
-PassRefPtr<TypeBuilder::Array<TypeBuilder::DOM::Node> > InspectorDOMAgent::buildArrayForPseudoElements(Element* element, NodeToIdMap* nodesMap)
+PassRefPtr<TypeBuilder::Array<TypeBuilder::DOM::Node>> InspectorDOMAgent::buildArrayForPseudoElements(Element* element, NodeToIdMap* nodesMap)
{
if (!element->pseudoElement(BEFORE) && !element->pseudoElement(AFTER))
return nullptr;
- RefPtr<TypeBuilder::Array<TypeBuilder::DOM::Node> > pseudoElements = TypeBuilder::Array<TypeBuilder::DOM::Node>::create();
+ RefPtr<TypeBuilder::Array<TypeBuilder::DOM::Node>> pseudoElements = TypeBuilder::Array<TypeBuilder::DOM::Node>::create();
if (element->pseudoElement(BEFORE))
pseudoElements->addItem(buildObjectForNode(element->pseudoElement(BEFORE), 0, nodesMap));
if (element->pseudoElement(AFTER))
@@ -2040,9 +2040,9 @@ void InspectorDOMAgent::didRemoveDOMAttr(Element* element, const QualifiedName&
m_frontend->attributeRemoved(id, name.toString());
}
-void InspectorDOMAgent::styleAttributeInvalidated(const WillBeHeapVector<RawPtrWillBeMember<Element> >& elements)
+void InspectorDOMAgent::styleAttributeInvalidated(const WillBeHeapVector<RawPtrWillBeMember<Element>>& elements)
{
- RefPtr<TypeBuilder::Array<int> > nodeIds = TypeBuilder::Array<int>::create();
+ RefPtr<TypeBuilder::Array<int>> nodeIds = TypeBuilder::Array<int>::create();
for (unsigned i = 0, size = elements.size(); i < size; ++i) {
Element* element = elements.at(i);
int id = boundNodeId(element);
@@ -2057,9 +2057,9 @@ void InspectorDOMAgent::styleAttributeInvalidated(const WillBeHeapVector<RawPtrW
m_frontend->inlineStyleInvalidated(nodeIds.release());
}
-void InspectorDOMAgent::contentDistributionInvalidated(const WillBeHeapVector<RawPtrWillBeMember<Element> >& elements)
+void InspectorDOMAgent::contentDistributionInvalidated(const WillBeHeapVector<RawPtrWillBeMember<Element>>& elements)
{
- RefPtr<TypeBuilder::Array<int> > nodeIds = TypeBuilder::Array<int>::create();
+ RefPtr<TypeBuilder::Array<int>> nodeIds = TypeBuilder::Array<int>::create();
for (const auto& it : elements) {
Element* element = it.get();
int id = boundNodeId(element);
@@ -2234,7 +2234,7 @@ void InspectorDOMAgent::pushNodeByPathToFrontend(ErrorString* errorString, const
*errorString = "No node with given path found";
}
-void InspectorDOMAgent::pushNodesByBackendIdsToFrontend(ErrorString* errorString, const RefPtr<JSONArray>& backendNodeIds, RefPtr<TypeBuilder::Array<int> >& result)
+void InspectorDOMAgent::pushNodesByBackendIdsToFrontend(ErrorString* errorString, const RefPtr<JSONArray>& backendNodeIds, RefPtr<TypeBuilder::Array<int>>& result)
{
result = TypeBuilder::Array<int>::create();
for (const auto& backendNode : *backendNodeIds) {
« no previous file with comments | « Source/core/inspector/InspectorDOMAgent.h ('k') | Source/core/inspector/InspectorDOMDebuggerAgent.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698