Bug 1237335 - Move markup view into the Inspector directory r=pbro
☠☠ backed out by a236b6aa15d6 ☠ ☠
authorGabriel Luong <gabriel.luong@gmail.com>
Wed, 06 Jan 2016 22:20:31 -0800
changeset 278942 9c6a36040f0621db6848ff267439a71f7770ad5a
parent 278941 1982e6826fb8ee4ce1840f239982c870cafa9c92
child 278943 bf76987436044bcd74057ab3880b8b51ae25b179
push id69924
push usercbook@mozilla.com
push dateThu, 07 Jan 2016 11:20:40 +0000
treeherdermozilla-inbound@9768993a4e2b [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewerspbro
bugs1237335
milestone46.0a1
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Bug 1237335 - Move markup view into the Inspector directory r=pbro
devtools/client/inspector/inspector-panel.js
devtools/client/inspector/markup/html-editor.js
devtools/client/inspector/markup/markup.css
devtools/client/inspector/markup/markup.js
devtools/client/inspector/markup/markup.xhtml
devtools/client/inspector/markup/moz.build
devtools/client/inspector/markup/test/.eslintrc
devtools/client/inspector/markup/test/actor_events_form.js
devtools/client/inspector/markup/test/browser.ini
devtools/client/inspector/markup/test/browser_markup_anonymous_01.js
devtools/client/inspector/markup/test/browser_markup_anonymous_02.js
devtools/client/inspector/markup/test/browser_markup_anonymous_03.js
devtools/client/inspector/markup/test/browser_markup_anonymous_04.js
devtools/client/inspector/markup/test/browser_markup_copy_image_data.js
devtools/client/inspector/markup/test/browser_markup_css_completion_style_attribute.js
devtools/client/inspector/markup/test/browser_markup_dragdrop_autoscroll.js
devtools/client/inspector/markup/test/browser_markup_dragdrop_distance.js
devtools/client/inspector/markup/test/browser_markup_dragdrop_dragRootNode.js
devtools/client/inspector/markup/test/browser_markup_dragdrop_escapeKeyPress.js
devtools/client/inspector/markup/test/browser_markup_dragdrop_invalidNodes.js
devtools/client/inspector/markup/test/browser_markup_dragdrop_reorder.js
devtools/client/inspector/markup/test/browser_markup_dragdrop_tooltip.js
devtools/client/inspector/markup/test/browser_markup_events-overflow.js
devtools/client/inspector/markup/test/browser_markup_events.js
devtools/client/inspector/markup/test/browser_markup_events_form.js
devtools/client/inspector/markup/test/browser_markup_events_jquery_1.0.js
devtools/client/inspector/markup/test/browser_markup_events_jquery_1.1.js
devtools/client/inspector/markup/test/browser_markup_events_jquery_1.11.1.js
devtools/client/inspector/markup/test/browser_markup_events_jquery_1.2.js
devtools/client/inspector/markup/test/browser_markup_events_jquery_1.3.js
devtools/client/inspector/markup/test/browser_markup_events_jquery_1.4.js
devtools/client/inspector/markup/test/browser_markup_events_jquery_1.6.js
devtools/client/inspector/markup/test/browser_markup_events_jquery_1.7.js
devtools/client/inspector/markup/test/browser_markup_events_jquery_2.1.1.js
devtools/client/inspector/markup/test/browser_markup_html_edit_01.js
devtools/client/inspector/markup/test/browser_markup_html_edit_02.js
devtools/client/inspector/markup/test/browser_markup_html_edit_03.js
devtools/client/inspector/markup/test/browser_markup_image_tooltip.js
devtools/client/inspector/markup/test/browser_markup_image_tooltip_mutations.js
devtools/client/inspector/markup/test/browser_markup_keybindings_01.js
devtools/client/inspector/markup/test/browser_markup_keybindings_02.js
devtools/client/inspector/markup/test/browser_markup_keybindings_03.js
devtools/client/inspector/markup/test/browser_markup_keybindings_04.js
devtools/client/inspector/markup/test/browser_markup_keybindings_delete_attributes.js
devtools/client/inspector/markup/test/browser_markup_links_01.js
devtools/client/inspector/markup/test/browser_markup_links_02.js
devtools/client/inspector/markup/test/browser_markup_links_03.js
devtools/client/inspector/markup/test/browser_markup_links_04.js
devtools/client/inspector/markup/test/browser_markup_links_05.js
devtools/client/inspector/markup/test/browser_markup_links_06.js
devtools/client/inspector/markup/test/browser_markup_links_07.js
devtools/client/inspector/markup/test/browser_markup_load_01.js
devtools/client/inspector/markup/test/browser_markup_mutation_01.js
devtools/client/inspector/markup/test/browser_markup_mutation_02.js
devtools/client/inspector/markup/test/browser_markup_navigation.js
devtools/client/inspector/markup/test/browser_markup_node_not_displayed_01.js
devtools/client/inspector/markup/test/browser_markup_node_not_displayed_02.js
devtools/client/inspector/markup/test/browser_markup_pagesize_01.js
devtools/client/inspector/markup/test/browser_markup_pagesize_02.js
devtools/client/inspector/markup/test/browser_markup_remove_xul_attributes.js
devtools/client/inspector/markup/test/browser_markup_search_01.js
devtools/client/inspector/markup/test/browser_markup_tag_edit_01.js
devtools/client/inspector/markup/test/browser_markup_tag_edit_02.js
devtools/client/inspector/markup/test/browser_markup_tag_edit_03.js
devtools/client/inspector/markup/test/browser_markup_tag_edit_04.js
devtools/client/inspector/markup/test/browser_markup_tag_edit_05.js
devtools/client/inspector/markup/test/browser_markup_tag_edit_06.js
devtools/client/inspector/markup/test/browser_markup_tag_edit_07.js
devtools/client/inspector/markup/test/browser_markup_tag_edit_08.js
devtools/client/inspector/markup/test/browser_markup_tag_edit_09.js
devtools/client/inspector/markup/test/browser_markup_tag_edit_10.js
devtools/client/inspector/markup/test/browser_markup_tag_edit_11.js
devtools/client/inspector/markup/test/browser_markup_tag_edit_12.js
devtools/client/inspector/markup/test/browser_markup_tag_edit_13-other.js
devtools/client/inspector/markup/test/browser_markup_textcontent_edit_01.js
devtools/client/inspector/markup/test/browser_markup_toggle_01.js
devtools/client/inspector/markup/test/browser_markup_toggle_02.js
devtools/client/inspector/markup/test/browser_markup_toggle_03.js
devtools/client/inspector/markup/test/browser_markup_update-on-navigtion.js
devtools/client/inspector/markup/test/doc_markup_anonymous.html
devtools/client/inspector/markup/test/doc_markup_dragdrop.html
devtools/client/inspector/markup/test/doc_markup_dragdrop_autoscroll.html
devtools/client/inspector/markup/test/doc_markup_edit.html
devtools/client/inspector/markup/test/doc_markup_events-overflow.html
devtools/client/inspector/markup/test/doc_markup_events.html
devtools/client/inspector/markup/test/doc_markup_events_form.html
devtools/client/inspector/markup/test/doc_markup_events_jquery.html
devtools/client/inspector/markup/test/doc_markup_flashing.html
devtools/client/inspector/markup/test/doc_markup_links.html
devtools/client/inspector/markup/test/doc_markup_mutation.html
devtools/client/inspector/markup/test/doc_markup_navigation.html
devtools/client/inspector/markup/test/doc_markup_not_displayed.html
devtools/client/inspector/markup/test/doc_markup_pagesize_01.html
devtools/client/inspector/markup/test/doc_markup_pagesize_02.html
devtools/client/inspector/markup/test/doc_markup_search.html
devtools/client/inspector/markup/test/doc_markup_svg_attributes.html
devtools/client/inspector/markup/test/doc_markup_toggle.html
devtools/client/inspector/markup/test/doc_markup_tooltip.png
devtools/client/inspector/markup/test/doc_markup_xul.xul
devtools/client/inspector/markup/test/head.js
devtools/client/inspector/markup/test/helper_attributes_test_runner.js
devtools/client/inspector/markup/test/helper_events_test_runner.js
devtools/client/inspector/markup/test/helper_outerhtml_test_runner.js
devtools/client/inspector/markup/test/lib_jquery_1.0.js
devtools/client/inspector/markup/test/lib_jquery_1.1.js
devtools/client/inspector/markup/test/lib_jquery_1.11.1_min.js
devtools/client/inspector/markup/test/lib_jquery_1.2_min.js
devtools/client/inspector/markup/test/lib_jquery_1.3_min.js
devtools/client/inspector/markup/test/lib_jquery_1.4_min.js
devtools/client/inspector/markup/test/lib_jquery_1.6_min.js
devtools/client/inspector/markup/test/lib_jquery_1.7_min.js
devtools/client/inspector/markup/test/lib_jquery_2.1.1_min.js
devtools/client/inspector/moz.build
devtools/client/jar.mn
devtools/client/markupview/html-editor.js
devtools/client/markupview/markup-view.css
devtools/client/markupview/markup-view.js
devtools/client/markupview/markup-view.xhtml
devtools/client/markupview/moz.build
devtools/client/markupview/test/.eslintrc
devtools/client/markupview/test/actor_events_form.js
devtools/client/markupview/test/browser.ini
devtools/client/markupview/test/browser_markupview_anonymous_01.js
devtools/client/markupview/test/browser_markupview_anonymous_02.js
devtools/client/markupview/test/browser_markupview_anonymous_03.js
devtools/client/markupview/test/browser_markupview_anonymous_04.js
devtools/client/markupview/test/browser_markupview_copy_image_data.js
devtools/client/markupview/test/browser_markupview_css_completion_style_attribute.js
devtools/client/markupview/test/browser_markupview_dragdrop_autoscroll.js
devtools/client/markupview/test/browser_markupview_dragdrop_distance.js
devtools/client/markupview/test/browser_markupview_dragdrop_dragRootNode.js
devtools/client/markupview/test/browser_markupview_dragdrop_escapeKeyPress.js
devtools/client/markupview/test/browser_markupview_dragdrop_invalidNodes.js
devtools/client/markupview/test/browser_markupview_dragdrop_reorder.js
devtools/client/markupview/test/browser_markupview_dragdrop_tooltip.js
devtools/client/markupview/test/browser_markupview_events-overflow.js
devtools/client/markupview/test/browser_markupview_events.js
devtools/client/markupview/test/browser_markupview_events_form.js
devtools/client/markupview/test/browser_markupview_events_jquery_1.0.js
devtools/client/markupview/test/browser_markupview_events_jquery_1.1.js
devtools/client/markupview/test/browser_markupview_events_jquery_1.11.1.js
devtools/client/markupview/test/browser_markupview_events_jquery_1.2.js
devtools/client/markupview/test/browser_markupview_events_jquery_1.3.js
devtools/client/markupview/test/browser_markupview_events_jquery_1.4.js
devtools/client/markupview/test/browser_markupview_events_jquery_1.6.js
devtools/client/markupview/test/browser_markupview_events_jquery_1.7.js
devtools/client/markupview/test/browser_markupview_events_jquery_2.1.1.js
devtools/client/markupview/test/browser_markupview_html_edit_01.js
devtools/client/markupview/test/browser_markupview_html_edit_02.js
devtools/client/markupview/test/browser_markupview_html_edit_03.js
devtools/client/markupview/test/browser_markupview_image_tooltip.js
devtools/client/markupview/test/browser_markupview_image_tooltip_mutations.js
devtools/client/markupview/test/browser_markupview_keybindings_01.js
devtools/client/markupview/test/browser_markupview_keybindings_02.js
devtools/client/markupview/test/browser_markupview_keybindings_03.js
devtools/client/markupview/test/browser_markupview_keybindings_04.js
devtools/client/markupview/test/browser_markupview_keybindings_delete_attributes.js
devtools/client/markupview/test/browser_markupview_links_01.js
devtools/client/markupview/test/browser_markupview_links_02.js
devtools/client/markupview/test/browser_markupview_links_03.js
devtools/client/markupview/test/browser_markupview_links_04.js
devtools/client/markupview/test/browser_markupview_links_05.js
devtools/client/markupview/test/browser_markupview_links_06.js
devtools/client/markupview/test/browser_markupview_links_07.js
devtools/client/markupview/test/browser_markupview_load_01.js
devtools/client/markupview/test/browser_markupview_mutation_01.js
devtools/client/markupview/test/browser_markupview_mutation_02.js
devtools/client/markupview/test/browser_markupview_navigation.js
devtools/client/markupview/test/browser_markupview_node_not_displayed_01.js
devtools/client/markupview/test/browser_markupview_node_not_displayed_02.js
devtools/client/markupview/test/browser_markupview_pagesize_01.js
devtools/client/markupview/test/browser_markupview_pagesize_02.js
devtools/client/markupview/test/browser_markupview_remove_xul_attributes.js
devtools/client/markupview/test/browser_markupview_search_01.js
devtools/client/markupview/test/browser_markupview_tag_edit_01.js
devtools/client/markupview/test/browser_markupview_tag_edit_02.js
devtools/client/markupview/test/browser_markupview_tag_edit_03.js
devtools/client/markupview/test/browser_markupview_tag_edit_04.js
devtools/client/markupview/test/browser_markupview_tag_edit_05.js
devtools/client/markupview/test/browser_markupview_tag_edit_06.js
devtools/client/markupview/test/browser_markupview_tag_edit_07.js
devtools/client/markupview/test/browser_markupview_tag_edit_08.js
devtools/client/markupview/test/browser_markupview_tag_edit_09.js
devtools/client/markupview/test/browser_markupview_tag_edit_10.js
devtools/client/markupview/test/browser_markupview_tag_edit_11.js
devtools/client/markupview/test/browser_markupview_tag_edit_12.js
devtools/client/markupview/test/browser_markupview_tag_edit_13-other.js
devtools/client/markupview/test/browser_markupview_textcontent_edit_01.js
devtools/client/markupview/test/browser_markupview_toggle_01.js
devtools/client/markupview/test/browser_markupview_toggle_02.js
devtools/client/markupview/test/browser_markupview_toggle_03.js
devtools/client/markupview/test/browser_markupview_update-on-navigtion.js
devtools/client/markupview/test/doc_markup_anonymous.html
devtools/client/markupview/test/doc_markup_dragdrop.html
devtools/client/markupview/test/doc_markup_dragdrop_autoscroll.html
devtools/client/markupview/test/doc_markup_edit.html
devtools/client/markupview/test/doc_markup_events-overflow.html
devtools/client/markupview/test/doc_markup_events.html
devtools/client/markupview/test/doc_markup_events_form.html
devtools/client/markupview/test/doc_markup_events_jquery.html
devtools/client/markupview/test/doc_markup_flashing.html
devtools/client/markupview/test/doc_markup_links.html
devtools/client/markupview/test/doc_markup_mutation.html
devtools/client/markupview/test/doc_markup_navigation.html
devtools/client/markupview/test/doc_markup_not_displayed.html
devtools/client/markupview/test/doc_markup_pagesize_01.html
devtools/client/markupview/test/doc_markup_pagesize_02.html
devtools/client/markupview/test/doc_markup_search.html
devtools/client/markupview/test/doc_markup_svg_attributes.html
devtools/client/markupview/test/doc_markup_toggle.html
devtools/client/markupview/test/doc_markup_tooltip.png
devtools/client/markupview/test/doc_markup_xul.xul
devtools/client/markupview/test/head.js
devtools/client/markupview/test/helper_attributes_test_runner.js
devtools/client/markupview/test/helper_events_test_runner.js
devtools/client/markupview/test/helper_outerhtml_test_runner.js
devtools/client/markupview/test/lib_jquery_1.0.js
devtools/client/markupview/test/lib_jquery_1.1.js
devtools/client/markupview/test/lib_jquery_1.11.1_min.js
devtools/client/markupview/test/lib_jquery_1.2_min.js
devtools/client/markupview/test/lib_jquery_1.3_min.js
devtools/client/markupview/test/lib_jquery_1.4_min.js
devtools/client/markupview/test/lib_jquery_1.6_min.js
devtools/client/markupview/test/lib_jquery_1.7_min.js
devtools/client/markupview/test/lib_jquery_2.1.1_min.js
devtools/client/moz.build
devtools/client/themes/markup-view.css
devtools/client/themes/markup.css
--- a/devtools/client/inspector/inspector-panel.js
+++ b/devtools/client/inspector/inspector-panel.js
@@ -10,17 +10,17 @@ Cu.import("resource://gre/modules/Servic
 
 var promise = require("promise");
 var EventEmitter = require("devtools/shared/event-emitter");
 var clipboard = require("sdk/clipboard");
 var {HostType} = require("devtools/client/framework/toolbox").Toolbox;
 
 loader.lazyRequireGetter(this, "CSS", "CSS");
 
-loader.lazyGetter(this, "MarkupView", () => require("devtools/client/markupview/markup-view").MarkupView);
+loader.lazyGetter(this, "MarkupView", () => require("devtools/client/inspector/markup/markup").MarkupView);
 loader.lazyGetter(this, "HTMLBreadcrumbs", () => require("devtools/client/inspector/breadcrumbs").HTMLBreadcrumbs);
 loader.lazyGetter(this, "ToolSidebar", () => require("devtools/client/framework/sidebar").ToolSidebar);
 loader.lazyGetter(this, "InspectorSearch", () => require("devtools/client/inspector/inspector-search").InspectorSearch);
 
 loader.lazyGetter(this, "strings", () => {
   return Services.strings.createBundle("chrome://devtools/locale/inspector.properties");
 });
 loader.lazyGetter(this, "toolboxStrings", () => {
@@ -919,17 +919,17 @@ InspectorPanel.prototype = {
     this._markupFrame.setAttribute("tooltip", "aHTMLTooltip");
     this._markupFrame.setAttribute("context", "inspector-node-popup");
 
     // This is needed to enable tooltips inside the iframe document.
     this._markupFrame.addEventListener("load", this._onMarkupFrameLoad, true);
 
     this._markupBox.setAttribute("collapsed", true);
     this._markupBox.appendChild(this._markupFrame);
-    this._markupFrame.setAttribute("src", "chrome://devtools/content/markupview/markup-view.xhtml");
+    this._markupFrame.setAttribute("src", "chrome://devtools/content/inspector/markup/markup.xhtml");
     this._markupFrame.setAttribute("aria-label", strings.GetStringFromName("inspector.panelLabel.markupView"));
   },
 
   _onMarkupFrameLoad: function() {
     this._markupFrame.removeEventListener("load", this._onMarkupFrameLoad, true);
 
     this._markupFrame.contentWindow.focus();
 
rename from devtools/client/markupview/html-editor.js
rename to devtools/client/inspector/markup/html-editor.js
rename from devtools/client/markupview/markup-view.css
rename to devtools/client/inspector/markup/markup.css
rename from devtools/client/markupview/markup-view.js
rename to devtools/client/inspector/markup/markup.js
--- a/devtools/client/markupview/markup-view.js
+++ b/devtools/client/inspector/markup/markup.js
@@ -16,17 +16,17 @@ const NEW_SELECTION_HIGHLIGHTER_TIMER = 
 const DRAG_DROP_AUTOSCROLL_EDGE_DISTANCE = 50;
 const DRAG_DROP_MIN_AUTOSCROLL_SPEED = 5;
 const DRAG_DROP_MAX_AUTOSCROLL_SPEED = 15;
 const DRAG_DROP_MIN_INITIAL_DISTANCE = 10;
 const AUTOCOMPLETE_POPUP_PANEL_ID = "markupview_autoCompletePopup";
 
 const {UndoStack} = require("devtools/client/shared/undo");
 const {editableField, InplaceEditor} = require("devtools/client/shared/inplace-editor");
-const {HTMLEditor} = require("devtools/client/markupview/html-editor");
+const {HTMLEditor} = require("devtools/client/inspector/markup/html-editor");
 const promise = require("promise");
 const {Tooltip} = require("devtools/client/shared/widgets/Tooltip");
 const EventEmitter = require("devtools/shared/event-emitter");
 const Heritage = require("sdk/core/heritage");
 const {setTimeout, clearTimeout, setInterval, clearInterval} = require("sdk/timers");
 const {parseAttribute} = require("devtools/client/shared/node-attribute-parser");
 const ELLIPSIS = Services.prefs.getComplexValue("intl.ellipsis", Ci.nsIPrefLocalizedString).data;
 const {Task} = require("resource://gre/modules/Task.jsm");
rename from devtools/client/markupview/markup-view.xhtml
rename to devtools/client/inspector/markup/markup.xhtml
--- a/devtools/client/markupview/markup-view.xhtml
+++ b/devtools/client/inspector/markup/markup.xhtml
@@ -2,18 +2,18 @@
 <!-- This Source Code Form is subject to the terms of the Mozilla Public
    - License, v. 2.0. If a copy of the MPL was not distributed with this
    - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
 <!DOCTYPE html>
 
 <html xmlns="http://www.w3.org/1999/xhtml">
 <head>
   <meta http-equiv="Content-Type" content="text/html; charset=UTF-8"/>
-  <link rel="stylesheet" href="chrome://devtools/content/markupview/markup-view.css" type="text/css"/>
-  <link rel="stylesheet" href="chrome://devtools/skin/markup-view.css" type="text/css"/>
+  <link rel="stylesheet" href="chrome://devtools/content/inspector/markup/markup.css" type="text/css"/>
+  <link rel="stylesheet" href="chrome://devtools/skin/markup.css" type="text/css"/>
   <link rel="stylesheet" href="chrome://devtools/skin/common.css" type="text/css"/>
 
   <script type="application/javascript;version=1.8"
           src="chrome://devtools/content/shared/theme-switching.js"/>
 
 </head>
 <body class="theme-body devtools-monospace" role="application">
 
rename from devtools/client/markupview/moz.build
rename to devtools/client/inspector/markup/moz.build
--- a/devtools/client/markupview/moz.build
+++ b/devtools/client/inspector/markup/moz.build
@@ -1,12 +1,12 @@
 # -*- Mode: python; c-basic-offset: 4; indent-tabs-mode: nil; tab-width: 40 -*-
 # vim: set filetype=python:
 # This Source Code Form is subject to the terms of the Mozilla Public
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-BROWSER_CHROME_MANIFESTS += ['test/browser.ini']
-
 DevToolsModules(
     'html-editor.js',
-    'markup-view.js',
+    'markup.js',
 )
+
+BROWSER_CHROME_MANIFESTS += ['test/browser.ini']
rename from devtools/client/markupview/test/.eslintrc
rename to devtools/client/inspector/markup/test/.eslintrc
--- a/devtools/client/markupview/test/.eslintrc
+++ b/devtools/client/inspector/markup/test/.eslintrc
@@ -1,4 +1,4 @@
 {
   // Extend from the shared list of defined globals for mochitests.
-  "extends": "../../../.eslintrc.mochitests"
+  "extends": "../../../../.eslintrc.mochitests"
 }
rename from devtools/client/markupview/test/actor_events_form.js
rename to devtools/client/inspector/markup/test/actor_events_form.js
rename from devtools/client/markupview/test/browser.ini
rename to devtools/client/inspector/markup/test/browser.ini
--- a/devtools/client/markupview/test/browser.ini
+++ b/devtools/client/inspector/markup/test/browser.ini
@@ -32,93 +32,93 @@ support-files =
   lib_jquery_1.2_min.js
   lib_jquery_1.3_min.js
   lib_jquery_1.4_min.js
   lib_jquery_1.6_min.js
   lib_jquery_1.7_min.js
   lib_jquery_1.11.1_min.js
   lib_jquery_2.1.1_min.js
 
-[browser_markupview_anonymous_01.js]
-[browser_markupview_anonymous_02.js]
+[browser_markup_anonymous_01.js]
+[browser_markup_anonymous_02.js]
 skip-if = e10s # scratchpad.xul is not loading in e10s window
-[browser_markupview_anonymous_03.js]
-[browser_markupview_anonymous_04.js]
-[browser_markupview_copy_image_data.js]
-[browser_markupview_css_completion_style_attribute.js]
-[browser_markupview_dragdrop_autoscroll.js]
+[browser_markup_anonymous_03.js]
+[browser_markup_anonymous_04.js]
+[browser_markup_copy_image_data.js]
+[browser_markup_css_completion_style_attribute.js]
+[browser_markup_dragdrop_autoscroll.js]
 skip-if = e10s && os == 'win'
-[browser_markupview_dragdrop_distance.js]
-[browser_markupview_dragdrop_dragRootNode.js]
-[browser_markupview_dragdrop_escapeKeyPress.js]
-[browser_markupview_dragdrop_invalidNodes.js]
-[browser_markupview_dragdrop_reorder.js]
-[browser_markupview_dragdrop_tooltip.js]
-[browser_markupview_events.js]
+[browser_markup_dragdrop_distance.js]
+[browser_markup_dragdrop_dragRootNode.js]
+[browser_markup_dragdrop_escapeKeyPress.js]
+[browser_markup_dragdrop_invalidNodes.js]
+[browser_markup_dragdrop_reorder.js]
+[browser_markup_dragdrop_tooltip.js]
+[browser_markup_events.js]
 skip-if = e10s # Bug 1040751 - CodeMirror editor.destroy() isn't e10s compatible
-[browser_markupview_events_form.js]
-# [browser_markupview_events-overflow.js]
+[browser_markup_events_form.js]
+# [browser_markup_events-overflow.js]
 # skip-if = e10s # Bug 1040751 - CodeMirror editor.destroy() isn't e10s compatible
 # disabled - See bug 1177550
-[browser_markupview_events_jquery_1.0.js]
+[browser_markup_events_jquery_1.0.js]
 skip-if = e10s # Bug 1040751 - CodeMirror editor.destroy() isn't e10s compatible
-[browser_markupview_events_jquery_1.1.js]
+[browser_markup_events_jquery_1.1.js]
 skip-if = e10s # Bug 1040751 - CodeMirror editor.destroy() isn't e10s compatible
-[browser_markupview_events_jquery_1.2.js]
+[browser_markup_events_jquery_1.2.js]
 skip-if = e10s # Bug 1040751 - CodeMirror editor.destroy() isn't e10s compatible
-[browser_markupview_events_jquery_1.3.js]
+[browser_markup_events_jquery_1.3.js]
 skip-if = e10s # Bug 1040751 - CodeMirror editor.destroy() isn't e10s compatible
-[browser_markupview_events_jquery_1.4.js]
+[browser_markup_events_jquery_1.4.js]
 skip-if = e10s # Bug 1040751 - CodeMirror editor.destroy() isn't e10s compatible
-[browser_markupview_events_jquery_1.6.js]
+[browser_markup_events_jquery_1.6.js]
 skip-if = e10s # Bug 1040751 - CodeMirror editor.destroy() isn't e10s compatible
-[browser_markupview_events_jquery_1.7.js]
+[browser_markup_events_jquery_1.7.js]
 skip-if = e10s # Bug 1040751 - CodeMirror editor.destroy() isn't e10s compatible
-[browser_markupview_events_jquery_1.11.1.js]
+[browser_markup_events_jquery_1.11.1.js]
 skip-if = e10s # Bug 1040751 - CodeMirror editor.destroy() isn't e10s compatible
-[browser_markupview_events_jquery_2.1.1.js]
+[browser_markup_events_jquery_2.1.1.js]
 skip-if = e10s # Bug 1040751 - CodeMirror editor.destroy() isn't e10s compatible
-[browser_markupview_links_01.js]
-[browser_markupview_links_02.js]
-[browser_markupview_links_03.js]
-[browser_markupview_links_04.js]
-[browser_markupview_links_05.js]
-[browser_markupview_links_06.js]
-[browser_markupview_links_07.js]
-[browser_markupview_load_01.js]
-[browser_markupview_html_edit_01.js]
-[browser_markupview_html_edit_02.js]
-[browser_markupview_html_edit_03.js]
-[browser_markupview_image_tooltip.js]
-[browser_markupview_image_tooltip_mutations.js]
-[browser_markupview_keybindings_01.js]
-[browser_markupview_keybindings_02.js]
-[browser_markupview_keybindings_03.js]
-[browser_markupview_keybindings_04.js]
-[browser_markupview_keybindings_delete_attributes.js]
-[browser_markupview_mutation_01.js]
-[browser_markupview_mutation_02.js]
-[browser_markupview_navigation.js]
-[browser_markupview_node_not_displayed_01.js]
-[browser_markupview_node_not_displayed_02.js]
-[browser_markupview_pagesize_01.js]
-[browser_markupview_pagesize_02.js]
-[browser_markupview_remove_xul_attributes.js]
+[browser_markup_links_01.js]
+[browser_markup_links_02.js]
+[browser_markup_links_03.js]
+[browser_markup_links_04.js]
+[browser_markup_links_05.js]
+[browser_markup_links_06.js]
+[browser_markup_links_07.js]
+[browser_markup_load_01.js]
+[browser_markup_html_edit_01.js]
+[browser_markup_html_edit_02.js]
+[browser_markup_html_edit_03.js]
+[browser_markup_image_tooltip.js]
+[browser_markup_image_tooltip_mutations.js]
+[browser_markup_keybindings_01.js]
+[browser_markup_keybindings_02.js]
+[browser_markup_keybindings_03.js]
+[browser_markup_keybindings_04.js]
+[browser_markup_keybindings_delete_attributes.js]
+[browser_markup_mutation_01.js]
+[browser_markup_mutation_02.js]
+[browser_markup_navigation.js]
+[browser_markup_node_not_displayed_01.js]
+[browser_markup_node_not_displayed_02.js]
+[browser_markup_pagesize_01.js]
+[browser_markup_pagesize_02.js]
+[browser_markup_remove_xul_attributes.js]
 skip-if = e10s # Bug 1036409 - The last selected node isn't reselected
-[browser_markupview_search_01.js]
-[browser_markupview_tag_edit_01.js]
-[browser_markupview_tag_edit_02.js]
-[browser_markupview_tag_edit_03.js]
-[browser_markupview_tag_edit_04.js]
-[browser_markupview_tag_edit_05.js]
-[browser_markupview_tag_edit_06.js]
-[browser_markupview_tag_edit_07.js]
-[browser_markupview_tag_edit_08.js]
-[browser_markupview_tag_edit_09.js]
-[browser_markupview_tag_edit_10.js]
-[browser_markupview_tag_edit_11.js]
-[browser_markupview_tag_edit_12.js]
-[browser_markupview_tag_edit_13-other.js]
-[browser_markupview_textcontent_edit_01.js]
-[browser_markupview_toggle_01.js]
-[browser_markupview_toggle_02.js]
-[browser_markupview_toggle_03.js]
-[browser_markupview_update-on-navigtion.js]
+[browser_markup_search_01.js]
+[browser_markup_tag_edit_01.js]
+[browser_markup_tag_edit_02.js]
+[browser_markup_tag_edit_03.js]
+[browser_markup_tag_edit_04.js]
+[browser_markup_tag_edit_05.js]
+[browser_markup_tag_edit_06.js]
+[browser_markup_tag_edit_07.js]
+[browser_markup_tag_edit_08.js]
+[browser_markup_tag_edit_09.js]
+[browser_markup_tag_edit_10.js]
+[browser_markup_tag_edit_11.js]
+[browser_markup_tag_edit_12.js]
+[browser_markup_tag_edit_13-other.js]
+[browser_markup_textcontent_edit_01.js]
+[browser_markup_toggle_01.js]
+[browser_markup_toggle_02.js]
+[browser_markup_toggle_03.js]
+[browser_markup_update-on-navigtion.js]
rename from devtools/client/markupview/test/browser_markupview_anonymous_01.js
rename to devtools/client/inspector/markup/test/browser_markup_anonymous_01.js
rename from devtools/client/markupview/test/browser_markupview_anonymous_02.js
rename to devtools/client/inspector/markup/test/browser_markup_anonymous_02.js
rename from devtools/client/markupview/test/browser_markupview_anonymous_03.js
rename to devtools/client/inspector/markup/test/browser_markup_anonymous_03.js
rename from devtools/client/markupview/test/browser_markupview_anonymous_04.js
rename to devtools/client/inspector/markup/test/browser_markup_anonymous_04.js
rename from devtools/client/markupview/test/browser_markupview_copy_image_data.js
rename to devtools/client/inspector/markup/test/browser_markup_copy_image_data.js
rename from devtools/client/markupview/test/browser_markupview_css_completion_style_attribute.js
rename to devtools/client/inspector/markup/test/browser_markup_css_completion_style_attribute.js
rename from devtools/client/markupview/test/browser_markupview_dragdrop_autoscroll.js
rename to devtools/client/inspector/markup/test/browser_markup_dragdrop_autoscroll.js
rename from devtools/client/markupview/test/browser_markupview_dragdrop_distance.js
rename to devtools/client/inspector/markup/test/browser_markup_dragdrop_distance.js
rename from devtools/client/markupview/test/browser_markupview_dragdrop_dragRootNode.js
rename to devtools/client/inspector/markup/test/browser_markup_dragdrop_dragRootNode.js
rename from devtools/client/markupview/test/browser_markupview_dragdrop_escapeKeyPress.js
rename to devtools/client/inspector/markup/test/browser_markup_dragdrop_escapeKeyPress.js
rename from devtools/client/markupview/test/browser_markupview_dragdrop_invalidNodes.js
rename to devtools/client/inspector/markup/test/browser_markup_dragdrop_invalidNodes.js
rename from devtools/client/markupview/test/browser_markupview_dragdrop_reorder.js
rename to devtools/client/inspector/markup/test/browser_markup_dragdrop_reorder.js
rename from devtools/client/markupview/test/browser_markupview_dragdrop_tooltip.js
rename to devtools/client/inspector/markup/test/browser_markup_dragdrop_tooltip.js
rename from devtools/client/markupview/test/browser_markupview_events-overflow.js
rename to devtools/client/inspector/markup/test/browser_markup_events-overflow.js
rename from devtools/client/markupview/test/browser_markupview_events.js
rename to devtools/client/inspector/markup/test/browser_markup_events.js
rename from devtools/client/markupview/test/browser_markupview_events_form.js
rename to devtools/client/inspector/markup/test/browser_markup_events_form.js
rename from devtools/client/markupview/test/browser_markupview_events_jquery_1.0.js
rename to devtools/client/inspector/markup/test/browser_markup_events_jquery_1.0.js
rename from devtools/client/markupview/test/browser_markupview_events_jquery_1.1.js
rename to devtools/client/inspector/markup/test/browser_markup_events_jquery_1.1.js
rename from devtools/client/markupview/test/browser_markupview_events_jquery_1.11.1.js
rename to devtools/client/inspector/markup/test/browser_markup_events_jquery_1.11.1.js
rename from devtools/client/markupview/test/browser_markupview_events_jquery_1.2.js
rename to devtools/client/inspector/markup/test/browser_markup_events_jquery_1.2.js
rename from devtools/client/markupview/test/browser_markupview_events_jquery_1.3.js
rename to devtools/client/inspector/markup/test/browser_markup_events_jquery_1.3.js
rename from devtools/client/markupview/test/browser_markupview_events_jquery_1.4.js
rename to devtools/client/inspector/markup/test/browser_markup_events_jquery_1.4.js
rename from devtools/client/markupview/test/browser_markupview_events_jquery_1.6.js
rename to devtools/client/inspector/markup/test/browser_markup_events_jquery_1.6.js
rename from devtools/client/markupview/test/browser_markupview_events_jquery_1.7.js
rename to devtools/client/inspector/markup/test/browser_markup_events_jquery_1.7.js
rename from devtools/client/markupview/test/browser_markupview_events_jquery_2.1.1.js
rename to devtools/client/inspector/markup/test/browser_markup_events_jquery_2.1.1.js
rename from devtools/client/markupview/test/browser_markupview_html_edit_01.js
rename to devtools/client/inspector/markup/test/browser_markup_html_edit_01.js
rename from devtools/client/markupview/test/browser_markupview_html_edit_02.js
rename to devtools/client/inspector/markup/test/browser_markup_html_edit_02.js
rename from devtools/client/markupview/test/browser_markupview_html_edit_03.js
rename to devtools/client/inspector/markup/test/browser_markup_html_edit_03.js
rename from devtools/client/markupview/test/browser_markupview_image_tooltip.js
rename to devtools/client/inspector/markup/test/browser_markup_image_tooltip.js
rename from devtools/client/markupview/test/browser_markupview_image_tooltip_mutations.js
rename to devtools/client/inspector/markup/test/browser_markup_image_tooltip_mutations.js
rename from devtools/client/markupview/test/browser_markupview_keybindings_01.js
rename to devtools/client/inspector/markup/test/browser_markup_keybindings_01.js
rename from devtools/client/markupview/test/browser_markupview_keybindings_02.js
rename to devtools/client/inspector/markup/test/browser_markup_keybindings_02.js
rename from devtools/client/markupview/test/browser_markupview_keybindings_03.js
rename to devtools/client/inspector/markup/test/browser_markup_keybindings_03.js
rename from devtools/client/markupview/test/browser_markupview_keybindings_04.js
rename to devtools/client/inspector/markup/test/browser_markup_keybindings_04.js
rename from devtools/client/markupview/test/browser_markupview_keybindings_delete_attributes.js
rename to devtools/client/inspector/markup/test/browser_markup_keybindings_delete_attributes.js
rename from devtools/client/markupview/test/browser_markupview_links_01.js
rename to devtools/client/inspector/markup/test/browser_markup_links_01.js
rename from devtools/client/markupview/test/browser_markupview_links_02.js
rename to devtools/client/inspector/markup/test/browser_markup_links_02.js
rename from devtools/client/markupview/test/browser_markupview_links_03.js
rename to devtools/client/inspector/markup/test/browser_markup_links_03.js
rename from devtools/client/markupview/test/browser_markupview_links_04.js
rename to devtools/client/inspector/markup/test/browser_markup_links_04.js
rename from devtools/client/markupview/test/browser_markupview_links_05.js
rename to devtools/client/inspector/markup/test/browser_markup_links_05.js
rename from devtools/client/markupview/test/browser_markupview_links_06.js
rename to devtools/client/inspector/markup/test/browser_markup_links_06.js
rename from devtools/client/markupview/test/browser_markupview_links_07.js
rename to devtools/client/inspector/markup/test/browser_markup_links_07.js
rename from devtools/client/markupview/test/browser_markupview_load_01.js
rename to devtools/client/inspector/markup/test/browser_markup_load_01.js
rename from devtools/client/markupview/test/browser_markupview_mutation_01.js
rename to devtools/client/inspector/markup/test/browser_markup_mutation_01.js
rename from devtools/client/markupview/test/browser_markupview_mutation_02.js
rename to devtools/client/inspector/markup/test/browser_markup_mutation_02.js
rename from devtools/client/markupview/test/browser_markupview_navigation.js
rename to devtools/client/inspector/markup/test/browser_markup_navigation.js
rename from devtools/client/markupview/test/browser_markupview_node_not_displayed_01.js
rename to devtools/client/inspector/markup/test/browser_markup_node_not_displayed_01.js
rename from devtools/client/markupview/test/browser_markupview_node_not_displayed_02.js
rename to devtools/client/inspector/markup/test/browser_markup_node_not_displayed_02.js
rename from devtools/client/markupview/test/browser_markupview_pagesize_01.js
rename to devtools/client/inspector/markup/test/browser_markup_pagesize_01.js
rename from devtools/client/markupview/test/browser_markupview_pagesize_02.js
rename to devtools/client/inspector/markup/test/browser_markup_pagesize_02.js
rename from devtools/client/markupview/test/browser_markupview_remove_xul_attributes.js
rename to devtools/client/inspector/markup/test/browser_markup_remove_xul_attributes.js
rename from devtools/client/markupview/test/browser_markupview_search_01.js
rename to devtools/client/inspector/markup/test/browser_markup_search_01.js
rename from devtools/client/markupview/test/browser_markupview_tag_edit_01.js
rename to devtools/client/inspector/markup/test/browser_markup_tag_edit_01.js
rename from devtools/client/markupview/test/browser_markupview_tag_edit_02.js
rename to devtools/client/inspector/markup/test/browser_markup_tag_edit_02.js
rename from devtools/client/markupview/test/browser_markupview_tag_edit_03.js
rename to devtools/client/inspector/markup/test/browser_markup_tag_edit_03.js
rename from devtools/client/markupview/test/browser_markupview_tag_edit_04.js
rename to devtools/client/inspector/markup/test/browser_markup_tag_edit_04.js
rename from devtools/client/markupview/test/browser_markupview_tag_edit_05.js
rename to devtools/client/inspector/markup/test/browser_markup_tag_edit_05.js
rename from devtools/client/markupview/test/browser_markupview_tag_edit_06.js
rename to devtools/client/inspector/markup/test/browser_markup_tag_edit_06.js
rename from devtools/client/markupview/test/browser_markupview_tag_edit_07.js
rename to devtools/client/inspector/markup/test/browser_markup_tag_edit_07.js
rename from devtools/client/markupview/test/browser_markupview_tag_edit_08.js
rename to devtools/client/inspector/markup/test/browser_markup_tag_edit_08.js
rename from devtools/client/markupview/test/browser_markupview_tag_edit_09.js
rename to devtools/client/inspector/markup/test/browser_markup_tag_edit_09.js
rename from devtools/client/markupview/test/browser_markupview_tag_edit_10.js
rename to devtools/client/inspector/markup/test/browser_markup_tag_edit_10.js
rename from devtools/client/markupview/test/browser_markupview_tag_edit_11.js
rename to devtools/client/inspector/markup/test/browser_markup_tag_edit_11.js
rename from devtools/client/markupview/test/browser_markupview_tag_edit_12.js
rename to devtools/client/inspector/markup/test/browser_markup_tag_edit_12.js
rename from devtools/client/markupview/test/browser_markupview_tag_edit_13-other.js
rename to devtools/client/inspector/markup/test/browser_markup_tag_edit_13-other.js
rename from devtools/client/markupview/test/browser_markupview_textcontent_edit_01.js
rename to devtools/client/inspector/markup/test/browser_markup_textcontent_edit_01.js
rename from devtools/client/markupview/test/browser_markupview_toggle_01.js
rename to devtools/client/inspector/markup/test/browser_markup_toggle_01.js
rename from devtools/client/markupview/test/browser_markupview_toggle_02.js
rename to devtools/client/inspector/markup/test/browser_markup_toggle_02.js
rename from devtools/client/markupview/test/browser_markupview_toggle_03.js
rename to devtools/client/inspector/markup/test/browser_markup_toggle_03.js
rename from devtools/client/markupview/test/browser_markupview_update-on-navigtion.js
rename to devtools/client/inspector/markup/test/browser_markup_update-on-navigtion.js
rename from devtools/client/markupview/test/doc_markup_anonymous.html
rename to devtools/client/inspector/markup/test/doc_markup_anonymous.html
rename from devtools/client/markupview/test/doc_markup_dragdrop.html
rename to devtools/client/inspector/markup/test/doc_markup_dragdrop.html
rename from devtools/client/markupview/test/doc_markup_dragdrop_autoscroll.html
rename to devtools/client/inspector/markup/test/doc_markup_dragdrop_autoscroll.html
rename from devtools/client/markupview/test/doc_markup_edit.html
rename to devtools/client/inspector/markup/test/doc_markup_edit.html
rename from devtools/client/markupview/test/doc_markup_events-overflow.html
rename to devtools/client/inspector/markup/test/doc_markup_events-overflow.html
rename from devtools/client/markupview/test/doc_markup_events.html
rename to devtools/client/inspector/markup/test/doc_markup_events.html
rename from devtools/client/markupview/test/doc_markup_events_form.html
rename to devtools/client/inspector/markup/test/doc_markup_events_form.html
rename from devtools/client/markupview/test/doc_markup_events_jquery.html
rename to devtools/client/inspector/markup/test/doc_markup_events_jquery.html
rename from devtools/client/markupview/test/doc_markup_flashing.html
rename to devtools/client/inspector/markup/test/doc_markup_flashing.html
rename from devtools/client/markupview/test/doc_markup_links.html
rename to devtools/client/inspector/markup/test/doc_markup_links.html
rename from devtools/client/markupview/test/doc_markup_mutation.html
rename to devtools/client/inspector/markup/test/doc_markup_mutation.html
rename from devtools/client/markupview/test/doc_markup_navigation.html
rename to devtools/client/inspector/markup/test/doc_markup_navigation.html
rename from devtools/client/markupview/test/doc_markup_not_displayed.html
rename to devtools/client/inspector/markup/test/doc_markup_not_displayed.html
rename from devtools/client/markupview/test/doc_markup_pagesize_01.html
rename to devtools/client/inspector/markup/test/doc_markup_pagesize_01.html
rename from devtools/client/markupview/test/doc_markup_pagesize_02.html
rename to devtools/client/inspector/markup/test/doc_markup_pagesize_02.html
rename from devtools/client/markupview/test/doc_markup_search.html
rename to devtools/client/inspector/markup/test/doc_markup_search.html
rename from devtools/client/markupview/test/doc_markup_svg_attributes.html
rename to devtools/client/inspector/markup/test/doc_markup_svg_attributes.html
rename from devtools/client/markupview/test/doc_markup_toggle.html
rename to devtools/client/inspector/markup/test/doc_markup_toggle.html
rename from devtools/client/markupview/test/doc_markup_tooltip.png
rename to devtools/client/inspector/markup/test/doc_markup_tooltip.png
rename from devtools/client/markupview/test/doc_markup_xul.xul
rename to devtools/client/inspector/markup/test/doc_markup_xul.xul
rename from devtools/client/markupview/test/head.js
rename to devtools/client/inspector/markup/test/head.js
--- a/devtools/client/markupview/test/head.js
+++ b/devtools/client/inspector/markup/test/head.js
@@ -20,17 +20,17 @@ waitForExplicitFinish();
 // lines.
 SimpleTest.requestCompleteLog();
 
 // Uncomment this pref to dump all devtools emitted events to the console.
 // Services.prefs.setBoolPref("devtools.dump.emit", true);
 
 // Import helpers registering the test-actor in remote targets
 var testDir = gTestPath.substr(0, gTestPath.lastIndexOf("/"));
-Services.scriptloader.loadSubScript(testDir + "../../../shared/test/test-actor-registry.js", this);
+Services.scriptloader.loadSubScript(testDir + "../../../../shared/test/test-actor-registry.js", this);
 
 // Set the testing flag on DevToolsUtils and reset it when the test ends
 DevToolsUtils.testing = true;
 registerCleanupFunction(() => DevToolsUtils.testing = false);
 
 // Clear preferences that may be set during the course of tests.
 registerCleanupFunction(() => {
   Services.prefs.clearUserPref("devtools.inspector.htmlPanelOpen");
@@ -47,19 +47,22 @@ registerCleanupFunction(function*() {
   let target = TargetFactory.forTab(gBrowser.selectedTab);
   yield gDevTools.closeToolbox(target);
 
   while (gBrowser.tabs.length > 1) {
     gBrowser.removeCurrentTab();
   }
 });
 
-const TEST_URL_ROOT = "http://mochi.test:8888/browser/devtools/client/markupview/test/";
-const CHROME_BASE = "chrome://mochitests/content/browser/devtools/client/markupview/test/";
-const COMMON_FRAME_SCRIPT_URL = "chrome://devtools/content/shared/frame-script-utils.js";
+const TEST_URL_ROOT =
+  "http://example.com/browser/devtools/client/inspector/markup/test/";
+const CHROME_BASE =
+  "chrome://mochitests/content/browser/devtools/client/inspector/markup/test/";
+const COMMON_FRAME_SCRIPT_URL =
+  "chrome://devtools/content/shared/frame-script-utils.js";
 
 /**
  * Add a new test tab in the browser and load the given url.
  * @param {String} url The url to be loaded in the new tab
  * @return a promise that resolves to the tab object when the url is loaded
  */
 function addTab(url) {
   info("Adding a new tab with URL: '" + url + "'");
rename from devtools/client/markupview/test/helper_attributes_test_runner.js
rename to devtools/client/inspector/markup/test/helper_attributes_test_runner.js
rename from devtools/client/markupview/test/helper_events_test_runner.js
rename to devtools/client/inspector/markup/test/helper_events_test_runner.js
rename from devtools/client/markupview/test/helper_outerhtml_test_runner.js
rename to devtools/client/inspector/markup/test/helper_outerhtml_test_runner.js
rename from devtools/client/markupview/test/lib_jquery_1.0.js
rename to devtools/client/inspector/markup/test/lib_jquery_1.0.js
rename from devtools/client/markupview/test/lib_jquery_1.1.js
rename to devtools/client/inspector/markup/test/lib_jquery_1.1.js
rename from devtools/client/markupview/test/lib_jquery_1.11.1_min.js
rename to devtools/client/inspector/markup/test/lib_jquery_1.11.1_min.js
rename from devtools/client/markupview/test/lib_jquery_1.2_min.js
rename to devtools/client/inspector/markup/test/lib_jquery_1.2_min.js
rename from devtools/client/markupview/test/lib_jquery_1.3_min.js
rename to devtools/client/inspector/markup/test/lib_jquery_1.3_min.js
rename from devtools/client/markupview/test/lib_jquery_1.4_min.js
rename to devtools/client/inspector/markup/test/lib_jquery_1.4_min.js
rename from devtools/client/markupview/test/lib_jquery_1.6_min.js
rename to devtools/client/inspector/markup/test/lib_jquery_1.6_min.js
rename from devtools/client/markupview/test/lib_jquery_1.7_min.js
rename to devtools/client/inspector/markup/test/lib_jquery_1.7_min.js
rename from devtools/client/markupview/test/lib_jquery_2.1.1_min.js
rename to devtools/client/inspector/markup/test/lib_jquery_2.1.1_min.js
--- a/devtools/client/inspector/moz.build
+++ b/devtools/client/inspector/moz.build
@@ -1,16 +1,17 @@
 # This Source Code Form is subject to the terms of the Mozilla Public
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 DIRS += [
     'computed',
     'fonts',
     'layout',
+    'markup',
     'rules'
 ]
 
 DevToolsModules(
     'breadcrumbs.js',
     'inspector-commands.js',
     'inspector-panel.js',
     'inspector-search.js'
--- a/devtools/client/jar.mn
+++ b/devtools/client/jar.mn
@@ -3,18 +3,16 @@
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 devtools.jar:
 %   content devtools %content/
     content/shared/vendor/d3.js (shared/vendor/d3.js)
     content/shared/vendor/dagre-d3.js (shared/vendor/dagre-d3.js)
     content/shared/widgets/widgets.css (shared/widgets/widgets.css)
     content/shared/widgets/VariablesView.xul (shared/widgets/VariablesView.xul)
-    content/markupview/markup-view.xhtml (markupview/markup-view.xhtml)
-    content/markupview/markup-view.css (markupview/markup-view.css)
     content/projecteditor/chrome/content/projecteditor.xul (projecteditor/chrome/content/projecteditor.xul)
     content/projecteditor/lib/helpers/readdir.js (projecteditor/lib/helpers/readdir.js)
     content/projecteditor/chrome/content/projecteditor-loader.xul (projecteditor/chrome/content/projecteditor-loader.xul)
     content/projecteditor/chrome/content/projecteditor-test.xul (projecteditor/chrome/content/projecteditor-test.xul)
     content/projecteditor/chrome/content/projecteditor-loader.js (projecteditor/chrome/content/projecteditor-loader.js)
     content/netmonitor/netmonitor.xul (netmonitor/netmonitor.xul)
     content/netmonitor/netmonitor.css (netmonitor/netmonitor.css)
     content/netmonitor/netmonitor-controller.js (netmonitor/netmonitor-controller.js)
@@ -24,23 +22,25 @@ devtools.jar:
     content/scratchpad/scratchpad.js (scratchpad/scratchpad.js)
     content/shared/splitview.css (shared/splitview.css)
     content/shared/theme-switching.js (shared/theme-switching.js)
     content/shared/frame-script-utils.js (shared/frame-script-utils.js)
     content/styleeditor/styleeditor.xul (styleeditor/styleeditor.xul)
     content/styleeditor/styleeditor.css (styleeditor/styleeditor.css)
     content/storage/storage.xul (storage/storage.xul)
     content/inspector/computed/computed.xhtml (inspector/computed/computed.xhtml)
-    content/inspector/rules/rules.xhtml (inspector/rules/rules.xhtml)
-    content/inspector/rules/rules.css (inspector/rules/rules.css)
+    content/inspector/fonts/fonts.css (inspector/fonts/fonts.css)
+    content/inspector/fonts/fonts.js (inspector/fonts/fonts.js)
+    content/inspector/fonts/fonts.xhtml (inspector/fonts/fonts.xhtml)
     content/inspector/layout/layout.js (inspector/layout/layout.js)
     content/inspector/layout/layout.xhtml (inspector/layout/layout.xhtml)
-    content/inspector/fonts/fonts.js (inspector/fonts/fonts.js)
-    content/inspector/fonts/fonts.xhtml (inspector/fonts/fonts.xhtml)
-    content/inspector/fonts/fonts.css (inspector/fonts/fonts.css)
+    content/inspector/markup/markup.css (inspector/markup/markup.css)
+    content/inspector/markup/markup.xhtml (inspector/markup/markup.xhtml)
+    content/inspector/rules/rules.css (inspector/rules/rules.css)
+    content/inspector/rules/rules.xhtml (inspector/rules/rules.xhtml)
     content/animationinspector/animation-controller.js (animationinspector/animation-controller.js)
     content/animationinspector/animation-panel.js (animationinspector/animation-panel.js)
     content/animationinspector/animation-inspector.xhtml (animationinspector/animation-inspector.xhtml)
     content/sourceeditor/codemirror/addon/comment/comment.js (sourceeditor/codemirror/addon/comment/comment.js)
     content/sourceeditor/codemirror/addon/edit/trailingspace.js (sourceeditor/codemirror/addon/edit/trailingspace.js)
     content/sourceeditor/codemirror/addon/edit/matchbrackets.js (sourceeditor/codemirror/addon/edit/matchbrackets.js)
     content/sourceeditor/codemirror/addon/edit/closebrackets.js (sourceeditor/codemirror/addon/edit/closebrackets.js)
     content/sourceeditor/codemirror/addon/dialog/dialog.js (sourceeditor/codemirror/addon/dialog/dialog.js)
@@ -190,17 +190,17 @@ devtools.jar:
     skin/images/command-console.png (themes/images/command-console.png)
     skin/images/command-console@2x.png (themes/images/command-console@2x.png)
     skin/images/command-eyedropper.png (themes/images/command-eyedropper.png)
     skin/images/command-eyedropper@2x.png (themes/images/command-eyedropper@2x.png)
     skin/images/command-rulers.png (themes/images/command-rulers.png)
     skin/images/command-rulers@2x.png (themes/images/command-rulers@2x.png)
     skin/images/command-measure.png (themes/images/command-measure.png)
     skin/images/command-measure@2x.png (themes/images/command-measure@2x.png)
-    skin/markup-view.css (themes/markup-view.css)
+    skin/markup.css (themes/markup.css)
     skin/images/editor-error.png (themes/images/editor-error.png)
     skin/images/editor-breakpoint.png (themes/images/editor-breakpoint.png)
     skin/images/editor-breakpoint@2x.png (themes/images/editor-breakpoint@2x.png)
     skin/images/editor-debug-location.png (themes/images/editor-debug-location.png)
     skin/images/editor-debug-location@2x.png (themes/images/editor-debug-location@2x.png)
 *   skin/webconsole.css (themes/webconsole.css)
     skin/images/webconsole.svg (themes/images/webconsole.svg)
     skin/images/breadcrumbs-divider@2x.png (themes/images/breadcrumbs-divider@2x.png)
--- a/devtools/client/moz.build
+++ b/devtools/client/moz.build
@@ -12,17 +12,16 @@ DIRS += [
     'canvasdebugger',
     'commandline',
     'debugger',
     'eyedropper',
     'framework',
     'inspector',
     'jsonview',
     'locales',
-    'markupview',
     'memory',
     'netmonitor',
     'performance',
     'preferences',
     'projecteditor',
     'promisedebugger',
     'responsivedesign',
     'scratchpad',
rename from devtools/client/themes/markup-view.css
rename to devtools/client/themes/markup.css