Merge f-t to m-c, a=merge

devtools/client/inspector/test/browser.ini

@@ -34,6 +34,7 @@ support-files =
   doc_inspector_search-svg.html
   doc_inspector_select-last-selected-01.html
   doc_inspector_select-last-selected-02.html
+  doc_inspector_svg.svg
   head.js
   shared-head.js
   !/devtools/client/commandline/test/helpers.js
@@ -120,6 +121,8 @@ subsuite = clipboard
 subsuite = clipboard
 [browser_inspector_menu-03-paste-items.js]
 subsuite = clipboard
+[browser_inspector_menu-03-paste-items-svg.js]
+subsuite = clipboard
 [browser_inspector_menu-04-use-in-console.js]
 [browser_inspector_menu-05-attribute-items.js]
 [browser_inspector_menu-06-other.js]

devtools/client/inspector/test/browser_inspector_menu-03-paste-items-svg.js

@@ -0,0 +1,42 @@
+/* vim: set ts=2 et sw=2 tw=80: */
+/* Any copyright is dedicated to the Public Domain.
+http://creativecommons.org/publicdomain/zero/1.0/ */
+"use strict";
+
+// Test that HTML can be pasted in SVG elements.
+
+const TEST_URL = URL_ROOT + "doc_inspector_svg.svg";
+const PASTE_AS_FIRST_CHILD = '<circle xmlns="http://www.w3.org/2000/svg" cx="42" cy="42" r="5"/>';
+const PASTE_AS_LAST_CHILD = '<circle xmlns="http://www.w3.org/2000/svg" cx="42" cy="42" r="15"/>';
+
+add_task(function* () {
+  let clipboard = require("sdk/clipboard");
+
+  let { inspector, testActor } = yield openInspectorForURL(TEST_URL);
+
+  let refSelector = "svg";
+  let oldHTML = yield testActor.getProperty(refSelector, "innerHTML");
+  yield selectNode(refSelector, inspector);
+  let markupTagLine = getContainerForSelector(refSelector, inspector).tagLine;
+
+  yield pasteContent("node-menu-pastefirstchild", PASTE_AS_FIRST_CHILD);
+  yield pasteContent("node-menu-pastelastchild", PASTE_AS_LAST_CHILD);
+
+  let html = yield testActor.getProperty(refSelector, "innerHTML");
+  let expectedHtml = PASTE_AS_FIRST_CHILD + oldHTML + PASTE_AS_LAST_CHILD;
+  is(html, expectedHtml, "The innerHTML of the SVG node is correct");
+
+  // Helpers
+  function* pasteContent(menuId, clipboardData) {
+    let allMenuItems = openContextMenuAndGetAllItems(inspector, {
+      target: markupTagLine,
+    });
+    info(`Testing ${menuId} for ${clipboardData}`);
+    clipboard.set(clipboardData);
+
+    let onMutation = inspector.once("markupmutation");
+    allMenuItems.find(item => item.id === menuId).click();
+    info("Waiting for mutation to occur");
+    yield onMutation;
+  }
+});

devtools/server/actors/inspector.js

@@ -1987,18 +1987,12 @@ var WalkerActor = protocol.ActorClassWithSpec(walkerSpec, {
     }
 
     let rawNode = node.rawNode;
-    // Don't insert anything adjacent to the document element,
-    // the head or the body.
-    if (node.isDocumentElement()) {
-      throw new Error("Can't insert adjacent element to the root.");
-    }
-
     let isInsertAsSibling = position === "beforeBegin" ||
       position === "afterEnd";
-    if ((rawNode.tagName === "BODY" || rawNode.tagName === "HEAD") &&
-      isInsertAsSibling) {
-      throw new Error("Can't insert element before or after the body " +
-        "or the head.");
+
+    // Don't insert anything adjacent to the document element.
+    if (isInsertAsSibling && node.isDocumentElement()) {
+      throw new Error("Can't insert adjacent element to the root.");
     }
 
     let rawParentNode = rawNode.parentNode;