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
parent 6f00b60a
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> 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. Make zoom multiplier float instead of double to match RenderStyle::effectiveZoom etc. and thus avoid unnecessary precision conversions.
...@@ -1314,14 +1314,6 @@ ...@@ -1314,14 +1314,6 @@
"description": "Returns event listeners relevant to the node.", "description": "Returns event listeners relevant to the node.",
"hidden": true "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", "name": "getOuterHTML",
"parameters": [ "parameters": [
......
...@@ -1441,15 +1441,6 @@ Node* InspectorDOMAgent::nodeForPath(const String& path) ...@@ -1441,15 +1441,6 @@ Node* InspectorDOMAgent::nodeForPath(const String& path)
return node; 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) void InspectorDOMAgent::pushNodeByPathToFrontend(ErrorString*, const String& path, int* nodeId)
{ {
if (Node* node = nodeForPath(path)) if (Node* node = nodeForPath(path))
......
...@@ -162,7 +162,6 @@ public: ...@@ -162,7 +162,6 @@ public:
Node* nodeForId(int nodeId); Node* nodeForId(int nodeId);
int boundNodeId(Node*); int boundNodeId(Node*);
void copyNode(ErrorString*, int nodeId);
void setDOMListener(DOMListener*); void setDOMListener(DOMListener*);
static String documentURLString(Document*); static String documentURLString(Document*);
......
...@@ -269,12 +269,14 @@ WebInspector.DOMNode.prototype = { ...@@ -269,12 +269,14 @@ WebInspector.DOMNode.prototype = {
DOMAgent.removeNode(this.id, WebInspector.domAgent._markRevision(this, callback)); DOMAgent.removeNode(this.id, WebInspector.domAgent._markRevision(this, callback));
}, },
/** copyNode: function()
* @param {function(?Protocol.Error)=} callback
*/
copyNode: function(callback)
{ {
DOMAgent.copyNode(this.id, callback); function copy(error, text)
{
if (!error)
InspectorFrontendHost.copyText(text);
}
DOMAgent.getOuterHTML(this.id, copy);
}, },
/** /**
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment