Merge WebKit r47420

1 files changed, 9 insertions, 8 deletions

diff --git a/WebCore/inspector/InspectorDOMAgent.h b/WebCore/inspector/InspectorDOMAgent.h
index 28c3a22..67b2be8 100644
--- a/WebCore/inspector/InspectorDOMAgent.h
+++ b/WebCore/inspector/InspectorDOMAgent.h
@@ -42,6 +42,7 @@
 #include <wtf/RefPtr.h>
 
 namespace WebCore {
+    class ContainerNode;
     class Element;
     class Event;
     class Document;
@@ -56,13 +57,13 @@ namespace WebCore {
         ~InspectorDOMAgent();
 
         // Methods called from the frontend.
-        void getChildNodes(long callId, long elementId);
+        void getChildNodes(long callId, long nodeId);
         void setAttribute(long callId, long elementId, const String& name, const String& value);
         void removeAttribute(long callId, long elementId, const String& name);
-        void setTextNodeValue(long callId, long elementId, const String& value);
+        void setTextNodeValue(long callId, long nodeId, const String& value);
 
         // Methods called from the InspectorController.
-        void setDocument(Document* document);
+        bool setDocument(Document* document);
 
         Node* nodeForId(long nodeId);
         long idForNode(Node* node);
@@ -77,12 +78,12 @@ namespace WebCore {
         long bind(Node* node);
         void unbind(Node* node);
 
-        void pushDocumentElementToFrontend();
-        void pushChildNodesToFrontend(long elementId);
+        void pushDocumentToFrontend();
+        void pushChildNodesToFrontend(long nodeId);
 
         ScriptObject buildObjectForNode(Node* node, int depth);
-        ScriptArray buildArrayForElementAttributes(Element* elemen);
-        ScriptArray buildArrayForElementChildren(Element* element, int depth);
+        ScriptArray buildArrayForElementAttributes(Element* element);
+        ScriptArray buildArrayForContainerChildren(Node* container, int depth);
 
         // We represent embedded doms as a part of the same hierarchy. Hence we treat children of frame owners differently.
         // We also skip whitespace text nodes conditionally. Following methods encapsulate these specifics.
@@ -90,7 +91,7 @@ namespace WebCore {
         Node* innerNextSibling(Node* node);
         Node* innerPreviousSibling(Node* node);
         int innerChildNodeCount(Node* node);
-        Element* innerParentElement(Node* node);
+        Node* innerParentNode(Node* node);
         bool isWhitespace(Node* node);
 
         Document* mainFrameDocument();