Web Inspector: Make "Copy as HTML" use the same copy functions as other copy methods.

https://bugs.webkit.org/show_bug.cgi?id=76706

Patch by Konrad Piascik <kpiascik@rim.com> on 2012-01-23
Reviewed by Pavel Feldman.

Changed DOMAgent.copyNode to call getOuterHTML and use the callback function to
return the text to InspectorFrontendHost.copyText.  This will make all copy
functions use the same code path.

Not testable.

* inspector/Inspector.json:
* inspector/InspectorDOMAgent.cpp:
* inspector/InspectorDOMAgent.h:
* inspector/front-end/DOMAgent.js:
(WebInspector.DOMNode.prototype.copyNode.copy):
(WebInspector.DOMNode.prototype.copyNode):

git-svn-id: http://svn.webkit.org/repository/webkit/trunk@105679 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/Source/WebCore/ChangeLog b/Source/WebCore/ChangeLog
index 1634144..525b816 100644 (file)
--- a/Source/WebCore/ChangeLog
+++ b/Source/WebCore/ChangeLog
@@ -1,3 +1,23 @@
+2012-01-23  Konrad Piascik  <kpiascik@rim.com>
+
+        Web Inspector: Make "Copy as HTML" use the same copy functions as other copy methods.
+        https://bugs.webkit.org/show_bug.cgi?id=76706
+
+        Reviewed by Pavel Feldman.
+
+        Changed DOMAgent.copyNode to call getOuterHTML and use the callback function to
+        return the text to InspectorFrontendHost.copyText.  This will make all copy
+        functions use the same code path.
+
+        Not testable.
+
+        * inspector/Inspector.json:
+        * inspector/InspectorDOMAgent.cpp:
+        * inspector/InspectorDOMAgent.h:
+        * inspector/front-end/DOMAgent.js:
+        (WebInspector.DOMNode.prototype.copyNode.copy):
+        (WebInspector.DOMNode.prototype.copyNode):
+
 2012-01-23  Luke Macpherson   <macpherson@chromium.org>
 
         Make zoom multiplier float instead of double to match RenderStyle::effectiveZoom etc. and thus avoid unnecessary precision conversions.

diff --git a/Source/WebCore/inspector/Inspector.json b/Source/WebCore/inspector/Inspector.json
index 5de2882..bf3b207 100644 (file)
--- a/Source/WebCore/inspector/Inspector.json
+++ b/Source/WebCore/inspector/Inspector.json
@@ -1315,14 +1315,6 @@
                 "hidden": true
             },
             {
-                "name": "copyNode",
-                "parameters": [
-                    { "name": "nodeId", "$ref": "NodeId", "description": "Id of the node to copy." }
-                ],
-                "description": "Copies node's HTML markup into the clipboard.",
-                "hidden": true
-            },
-            {
                 "name": "getOuterHTML",
                 "parameters": [
                     { "name": "nodeId", "$ref": "NodeId", "description": "Id of the node to get markup for." }

diff --git a/Source/WebCore/inspector/InspectorDOMAgent.cpp b/Source/WebCore/inspector/InspectorDOMAgent.cpp
index 0cd323f..28c0f3b 100644 (file)
--- a/Source/WebCore/inspector/InspectorDOMAgent.cpp
+++ b/Source/WebCore/inspector/InspectorDOMAgent.cpp
@@ -1441,15 +1441,6 @@ Node* InspectorDOMAgent::nodeForPath(const String& path)
     return node;
 }
 
-void InspectorDOMAgent::copyNode(ErrorString*, int nodeId)
-{
-    Node* node = nodeForId(nodeId);
-    if (!node)
-        return;
-    String markup = createMarkup(node);
-    Pasteboard::generalPasteboard()->writePlainText(markup);
-}
-
 void InspectorDOMAgent::pushNodeByPathToFrontend(ErrorString*, const String& path, int* nodeId)
 {
     if (Node* node = nodeForPath(path))

diff --git a/Source/WebCore/inspector/InspectorDOMAgent.h b/Source/WebCore/inspector/InspectorDOMAgent.h
index 9109ea2..01c49dc 100644 (file)
--- a/Source/WebCore/inspector/InspectorDOMAgent.h
+++ b/Source/WebCore/inspector/InspectorDOMAgent.h
@@ -162,7 +162,6 @@ public:
 
     Node* nodeForId(int nodeId);
     int boundNodeId(Node*);
-    void copyNode(ErrorString*, int nodeId);
     void setDOMListener(DOMListener*);
 
     static String documentURLString(Document*);

diff --git a/Source/WebCore/inspector/front-end/DOMAgent.js b/Source/WebCore/inspector/front-end/DOMAgent.js
index abca727..0473235 100644 (file)
--- a/Source/WebCore/inspector/front-end/DOMAgent.js
+++ b/Source/WebCore/inspector/front-end/DOMAgent.js
@@ -269,12 +269,14 @@ WebInspector.DOMNode.prototype = {
         DOMAgent.removeNode(this.id, WebInspector.domAgent._markRevision(this, callback));
     },
 
-    /**
-     * @param {function(?Protocol.Error)=} callback
-     */
-    copyNode: function(callback)
+    copyNode: function()
     {
-        DOMAgent.copyNode(this.id, callback);
+        function copy(error, text)
+        {
+            if (!error)
+                InspectorFrontendHost.copyText(text);
+        }
+        DOMAgent.getOuterHTML(this.id, copy);
     },
 
     /**