Make DOM.getChildNodes & DOM.getDocument optionally pierce iframe boundaries

third_party/WebKit/Source/core/inspector/InspectorDOMAgent.cpp

 /*
  * Copyright (C) 2009 Apple Inc. All rights reserved.
  * Copyright (C) 2011 Google Inc. All rights reserved.
  * Copyright (C) 2009 Joseph Pecoraro
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  *
  * 1.  Redistributions of source code must retain the above copyright
@@ skipping 236 matching lines @@
     v8_inspector::V8InspectorSession* v8Session,
     Client* client)
     : m_isolate(isolate),
       m_inspectedFrames(inspectedFrames),
       m_v8Session(v8Session),
       m_client(client),
       m_domListener(nullptr),
       m_documentNodeToIdMap(new NodeToIdMap()),
       m_lastNodeId(1),
       m_suppressAttributeModifiedEvent(false),
+      m_traverseFrames(false),
       m_backendNodeIdToInspect(0) {}
 
 InspectorDOMAgent::~InspectorDOMAgent() {}
 
 void InspectorDOMAgent::restore() {
   if (!enabled())
     return;
   innerEnable();
 }
 
@@ skipping 232 matching lines @@
   setSearchingForNode(errorString, NotSearching,
                       Maybe<protocol::DOM::HighlightConfig>());
   m_instrumentingAgents->removeInspectorDOMAgent(this);
   m_history.clear();
   m_domEditor.clear();
   setDocument(nullptr);
 }
 
 void InspectorDOMAgent::getDocument(
     ErrorString* errorString,
+    const Maybe<int>& depth,
+    const Maybe<bool>& traverseFrames,
     std::unique_ptr<protocol::DOM::Node>* root) {
   // Backward compatibility. Mark agent as enabled when it requests document.
   if (!enabled())
     innerEnable();
 
   if (!m_document) {
     *errorString = "Document is not available";
     return;
   }
 
   discardFrontendBindings();
 
-  *root = buildObjectForNode(m_document.get(), 2, m_documentNodeToIdMap.get());
+  m_traverseFrames = traverseFrames.fromMaybe(false);

[pfeldman, 2016/10/07 19:35:12]

You should plumb it, it is sessional, not a property of the agent.

[alex clarke (OOO till 29th), 2016/10/11 12:05:12]

Done.

+
+  *root = buildObjectForNode(m_document.get(), depth.fromMaybe(2),
+                             m_documentNodeToIdMap.get());
 }
 
 void InspectorDOMAgent::pushChildNodesToFrontend(int nodeId, int depth) {
   Node* node = nodeForId(nodeId);
   if (!node || (!node->isElementNode() && !node->isDocumentNode() &&
                 !node->isDocumentFragment()))
     return;
 
   NodeToIdMap* nodeMap = m_idToNodesMap.get(nodeId);
 
@@ skipping 65 matching lines @@
       for (unsigned i = 0; i < classNameList.size(); ++i)
         uniqueNames.add(classNameList[i]);
     }
   }
   for (const String& className : uniqueNames)
     (*classNames)->addItem(className);
 }
 
 void InspectorDOMAgent::requestChildNodes(ErrorString* errorString,
                                           int nodeId,
-                                          const Maybe<int>& depth) {
+                                          const Maybe<int>& depth,
+                                          const Maybe<bool>& traverseFrames) {
   int sanitizedDepth = depth.fromMaybe(1);
   if (sanitizedDepth == 0 || sanitizedDepth < -1) {
     *errorString =
         "Please provide a positive integer as a depth or -1 for entire subtree";
     return;
   }
   if (sanitizedDepth == -1)
     sanitizedDepth = INT_MAX;
 
+  // Cached results may not be valid if |m_traverseFrames| changes.
+  if (m_traverseFrames != traverseFrames.fromMaybe(false)) {
+    m_traverseFrames = traverseFrames.fromMaybe(false);
+    m_childrenRequested.clear();
+  }
+
   pushChildNodesToFrontend(nodeId, sanitizedDepth);
 }
 
 void InspectorDOMAgent::querySelector(ErrorString* errorString,
                                       int nodeId,
                                       const String& selectors,
                                       int* elementId) {
   *elementId = 0;
   Node* node = assertNode(errorString, nodeId);
   if (!node || !node->isContainerNode())
@@ skipping 973 matching lines @@
     Element* element = toElement(node);
     value->setAttributes(buildArrayForElementAttributes(element));
 
     if (node->isFrameOwnerElement()) {
       HTMLFrameOwnerElement* frameOwner = toHTMLFrameOwnerElement(node);
       if (LocalFrame* frame = frameOwner->contentFrame() &&
                                       frameOwner->contentFrame()->isLocalFrame()
                                   ? toLocalFrame(frameOwner->contentFrame())
                                   : nullptr)
         value->setFrameId(IdentifiersFactory::frameId(frame));
-      if (Document* doc = frameOwner->contentDocument())
-        value->setContentDocument(buildObjectForNode(doc, 0, nodesMap));
+      if (Document* doc = frameOwner->contentDocument()) {
+        value->setContentDocument(
+            buildObjectForNode(doc, m_traverseFrames ? -1 : 0, nodesMap));

[pfeldman, 2016/10/07 19:35:12]

You should still respect the depth here.

[alex clarke (OOO till 29th), 2016/10/11 12:05:12]

Done.

+      }
     }
 
     if (node->parentNode() && node->parentNode()->isDocumentNode()) {
       LocalFrame* frame = node->document().frame();
       if (frame)
         value->setFrameId(IdentifiersFactory::frameId(frame));
     }
 
     ElementShadow* shadow = element->shadow();
     if (shadow) {
@@ skipping 639 matching lines @@
   ScriptState::Scope scope(scriptState);
   return m_v8Session->wrapObject(scriptState->context(),
                                  nodeV8Value(scriptState->context(), node),
                                  toV8InspectorStringView(objectGroup));
 }
 
 bool InspectorDOMAgent::pushDocumentUponHandlelessOperation(
     ErrorString* errorString) {
   if (!m_documentNodeToIdMap->contains(m_document)) {
     std::unique_ptr<protocol::DOM::Node> root;
-    getDocument(errorString, &root);
+    getDocument(errorString, Maybe<int>(), Maybe<bool>(), &root);
     return errorString->isEmpty();
   }
   return true;
 }
 
 DEFINE_TRACE(InspectorDOMAgent) {
   visitor->trace(m_domListener);
   visitor->trace(m_inspectedFrames);
   visitor->trace(m_documentNodeToIdMap);
   visitor->trace(m_danglingNodeToIdMaps);
   visitor->trace(m_idToNode);
   visitor->trace(m_idToNodesMap);
   visitor->trace(m_document);
   visitor->trace(m_revalidateTask);
   visitor->trace(m_searchResults);
   visitor->trace(m_history);
   visitor->trace(m_domEditor);
   InspectorBaseAgent::trace(visitor);
 }
 
 }  // namespace blink