Changeset 90626 in webkit

Timestamp:

Jul 8, 2011 6:25:21 AM (13 years ago)

Author:

pfeldman@chromium.org

Message:

Web Inspector: add support for drag'n'drop of non-elements (comments, text, etc.)
​https://bugs.webkit.org/show_bug.cgi?id=64163

Reviewed by Yury Semikhatsky.

• inspector/Inspector.json:
• inspector/InspectorDOMAgent.cpp:

(WebCore::InspectorDOMAgent::moveTo):

• inspector/front-end/ElementsTreeOutline.js:

(WebInspector.ElementsTreeOutline.prototype._isValidDragSourceOrTarget):

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• inspector/Inspector.json (modified) (1 diff)
• inspector/InspectorDOMAgent.cpp (modified) (2 diffs)
• inspector/front-end/ElementsTreeOutline.js (modified) (1 diff)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2011-07-08  Pavel Feldman  <pfeldman@google.com>
+
+        Web Inspector: add support for drag'n'drop of non-elements (comments, text, etc.)
+        https://bugs.webkit.org/show_bug.cgi?id=64163
+
+        Reviewed by Yury Semikhatsky.
+
+        * inspector/Inspector.json:
+        * inspector/InspectorDOMAgent.cpp:
+        (WebCore::InspectorDOMAgent::moveTo):
+        * inspector/front-end/ElementsTreeOutline.js:
+        (WebInspector.ElementsTreeOutline.prototype._isValidDragSourceOrTarget):
+
 2011-07-08  Andrey Kosyakov  <caseq@chromium.org>
 

trunk/Source/WebCore/inspector/Inspector.json

@@ -1029 +1029 @@
                 "parameters": [
                     { "name": "nodeId", "type": "integer", "description": "Id of the node to drop." },
-                    { "name": "targetNodeId", "type": "integer", "description": "Id of the node to drop into." },
+                    { "name": "targetElementId", "type": "integer", "description": "Id of the element to drop into." },
                     { "name": "anchorNodeId", "type": "integer", "optional": true, "description": "Drop node before given one." }
                 ],

trunk/Source/WebCore/inspector/InspectorDOMAgent.cpp

@@ -1033 +1033 @@
 }
 
-void InspectorDOMAgent::moveTo(ErrorString* error, int nodeId, int targetNodeId, const int* const anchorNodeId, int* newNodeId)
-{
-    Element* element = assertElement(error, nodeId);
-    if (!element)
-        return;
-
-    Element* targetElement = assertElement(error, targetNodeId);
+void InspectorDOMAgent::moveTo(ErrorString* error, int nodeId, int targetElementId, const int* const anchorNodeId, int* newNodeId)
+{
+    Node* node = assertNode(error, nodeId);
+    if (!node)
+        return;
+
+    Element* targetElement = assertElement(error, targetElementId);
     if (!targetElement)
         return;
 
-    Element* anchorElement = 0;
+    Node* anchorNode = 0;
     if (anchorNodeId && *anchorNodeId) {
-        anchorElement = assertElement(error, *anchorNodeId);
-        if (!anchorElement)
+        anchorNode = assertNode(error, *anchorNodeId);
+        if (!anchorNode)
             return;
-        if (anchorElement->parentNode() != targetElement) {
-            *error = "Anchor node must be child of the target node.";
+        if (anchorNode->parentNode() != targetElement) {
+            *error = "Anchor node must be child of the target element.";
             return;
         }
@@ -1055 +1055 @@
 
     ExceptionCode ec = 0;
-    bool success = targetElement->insertBefore(element, anchorElement, ec);
+    bool success = targetElement->insertBefore(node, anchorNode, ec);
     if (ec || !success) {
         *error = "Could not drop node.";
         return;
     }
-    *newNodeId = pushNodePathToFrontend(element);
+    *newNodeId = pushNodePathToFrontend(node);
 }
 

trunk/Source/WebCore/inspector/front-end/ElementsTreeOutline.js

@@ -325 +325 @@
             return false;
 
-        if (node.nodeType() !== Node.ELEMENT_NODE)
-            return false;
-
         if (!node.parentNode || node.parentNode.nodeType() !== Node.ELEMENT_NODE)
             return false;