Backed out changeset 9c6a36040f06 (bug 1237335) for widespread devtools bustage

--HG--
rename : devtools/client/inspector/markup/html-editor.js => devtools/client/markupview/html-editor.js
rename : devtools/client/inspector/markup/markup.css => devtools/client/markupview/markup-view.css
rename : devtools/client/inspector/markup/markup.js => devtools/client/markupview/markup-view.js
rename : devtools/client/inspector/markup/markup.xhtml => devtools/client/markupview/markup-view.xhtml
rename : devtools/client/inspector/markup/moz.build => devtools/client/markupview/moz.build
rename : devtools/client/inspector/markup/test/.eslintrc => devtools/client/markupview/test/.eslintrc
rename : devtools/client/inspector/markup/test/actor_events_form.js => devtools/client/markupview/test/actor_events_form.js
rename : devtools/client/inspector/markup/test/browser.ini => devtools/client/markupview/test/browser.ini
rename : devtools/client/inspector/markup/test/browser_markup_anonymous_01.js => devtools/client/markupview/test/browser_markupview_anonymous_01.js
rename : devtools/client/inspector/markup/test/browser_markup_anonymous_02.js => devtools/client/markupview/test/browser_markupview_anonymous_02.js
rename : devtools/client/inspector/markup/test/browser_markup_anonymous_03.js => devtools/client/markupview/test/browser_markupview_anonymous_03.js
rename : devtools/client/inspector/markup/test/browser_markup_anonymous_04.js => devtools/client/markupview/test/browser_markupview_anonymous_04.js
rename : devtools/client/inspector/markup/test/browser_markup_copy_image_data.js => devtools/client/markupview/test/browser_markupview_copy_image_data.js
rename : devtools/client/inspector/markup/test/browser_markup_css_completion_style_attribute.js => devtools/client/markupview/test/browser_markupview_css_completion_style_attribute.js
rename : devtools/client/inspector/markup/test/browser_markup_dragdrop_autoscroll.js => devtools/client/markupview/test/browser_markupview_dragdrop_autoscroll.js
rename : devtools/client/inspector/markup/test/browser_markup_dragdrop_distance.js => devtools/client/markupview/test/browser_markupview_dragdrop_distance.js
rename : devtools/client/inspector/markup/test/browser_markup_dragdrop_dragRootNode.js => devtools/client/markupview/test/browser_markupview_dragdrop_dragRootNode.js
rename : devtools/client/inspector/markup/test/browser_markup_dragdrop_escapeKeyPress.js => devtools/client/markupview/test/browser_markupview_dragdrop_escapeKeyPress.js
rename : devtools/client/inspector/markup/test/browser_markup_dragdrop_invalidNodes.js => devtools/client/markupview/test/browser_markupview_dragdrop_invalidNodes.js
rename : devtools/client/inspector/markup/test/browser_markup_dragdrop_reorder.js => devtools/client/markupview/test/browser_markupview_dragdrop_reorder.js
rename : devtools/client/inspector/markup/test/browser_markup_dragdrop_tooltip.js => devtools/client/markupview/test/browser_markupview_dragdrop_tooltip.js
rename : devtools/client/inspector/markup/test/browser_markup_events-overflow.js => devtools/client/markupview/test/browser_markupview_events-overflow.js
rename : devtools/client/inspector/markup/test/browser_markup_events.js => devtools/client/markupview/test/browser_markupview_events.js
rename : devtools/client/inspector/markup/test/browser_markup_events_form.js => devtools/client/markupview/test/browser_markupview_events_form.js
rename : devtools/client/inspector/markup/test/browser_markup_events_jquery_1.0.js => devtools/client/markupview/test/browser_markupview_events_jquery_1.0.js
rename : devtools/client/inspector/markup/test/browser_markup_events_jquery_1.1.js => devtools/client/markupview/test/browser_markupview_events_jquery_1.1.js
rename : devtools/client/inspector/markup/test/browser_markup_events_jquery_1.11.1.js => devtools/client/markupview/test/browser_markupview_events_jquery_1.11.1.js
rename : devtools/client/inspector/markup/test/browser_markup_events_jquery_1.2.js => devtools/client/markupview/test/browser_markupview_events_jquery_1.2.js
rename : devtools/client/inspector/markup/test/browser_markup_events_jquery_1.3.js => devtools/client/markupview/test/browser_markupview_events_jquery_1.3.js
rename : devtools/client/inspector/markup/test/browser_markup_events_jquery_1.4.js => devtools/client/markupview/test/browser_markupview_events_jquery_1.4.js
rename : devtools/client/inspector/markup/test/browser_markup_events_jquery_1.6.js => devtools/client/markupview/test/browser_markupview_events_jquery_1.6.js
rename : devtools/client/inspector/markup/test/browser_markup_events_jquery_1.7.js => devtools/client/markupview/test/browser_markupview_events_jquery_1.7.js
rename : devtools/client/inspector/markup/test/browser_markup_events_jquery_2.1.1.js => devtools/client/markupview/test/browser_markupview_events_jquery_2.1.1.js
rename : devtools/client/inspector/markup/test/browser_markup_html_edit_01.js => devtools/client/markupview/test/browser_markupview_html_edit_01.js
rename : devtools/client/inspector/markup/test/browser_markup_html_edit_02.js => devtools/client/markupview/test/browser_markupview_html_edit_02.js
rename : devtools/client/inspector/markup/test/browser_markup_html_edit_03.js => devtools/client/markupview/test/browser_markupview_html_edit_03.js
rename : devtools/client/inspector/markup/test/browser_markup_image_tooltip.js => devtools/client/markupview/test/browser_markupview_image_tooltip.js
rename : devtools/client/inspector/markup/test/browser_markup_image_tooltip_mutations.js => devtools/client/markupview/test/browser_markupview_image_tooltip_mutations.js
rename : devtools/client/inspector/markup/test/browser_markup_keybindings_01.js => devtools/client/markupview/test/browser_markupview_keybindings_01.js
rename : devtools/client/inspector/markup/test/browser_markup_keybindings_02.js => devtools/client/markupview/test/browser_markupview_keybindings_02.js
rename : devtools/client/inspector/markup/test/browser_markup_keybindings_03.js => devtools/client/markupview/test/browser_markupview_keybindings_03.js
rename : devtools/client/inspector/markup/test/browser_markup_keybindings_04.js => devtools/client/markupview/test/browser_markupview_keybindings_04.js
rename : devtools/client/inspector/markup/test/browser_markup_keybindings_delete_attributes.js => devtools/client/markupview/test/browser_markupview_keybindings_delete_attributes.js
rename : devtools/client/inspector/markup/test/browser_markup_links_01.js => devtools/client/markupview/test/browser_markupview_links_01.js
rename : devtools/client/inspector/markup/test/browser_markup_links_02.js => devtools/client/markupview/test/browser_markupview_links_02.js
rename : devtools/client/inspector/markup/test/browser_markup_links_03.js => devtools/client/markupview/test/browser_markupview_links_03.js
rename : devtools/client/inspector/markup/test/browser_markup_links_04.js => devtools/client/markupview/test/browser_markupview_links_04.js
rename : devtools/client/inspector/markup/test/browser_markup_links_05.js => devtools/client/markupview/test/browser_markupview_links_05.js
rename : devtools/client/inspector/markup/test/browser_markup_links_06.js => devtools/client/markupview/test/browser_markupview_links_06.js
rename : devtools/client/inspector/markup/test/browser_markup_links_07.js => devtools/client/markupview/test/browser_markupview_links_07.js
rename : devtools/client/inspector/markup/test/browser_markup_load_01.js => devtools/client/markupview/test/browser_markupview_load_01.js
rename : devtools/client/inspector/markup/test/browser_markup_mutation_01.js => devtools/client/markupview/test/browser_markupview_mutation_01.js
rename : devtools/client/inspector/markup/test/browser_markup_mutation_02.js => devtools/client/markupview/test/browser_markupview_mutation_02.js
rename : devtools/client/inspector/markup/test/browser_markup_navigation.js => devtools/client/markupview/test/browser_markupview_navigation.js
rename : devtools/client/inspector/markup/test/browser_markup_node_not_displayed_01.js => devtools/client/markupview/test/browser_markupview_node_not_displayed_01.js
rename : devtools/client/inspector/markup/test/browser_markup_node_not_displayed_02.js => devtools/client/markupview/test/browser_markupview_node_not_displayed_02.js
rename : devtools/client/inspector/markup/test/browser_markup_pagesize_01.js => devtools/client/markupview/test/browser_markupview_pagesize_01.js
rename : devtools/client/inspector/markup/test/browser_markup_pagesize_02.js => devtools/client/markupview/test/browser_markupview_pagesize_02.js
rename : devtools/client/inspector/markup/test/browser_markup_remove_xul_attributes.js => devtools/client/markupview/test/browser_markupview_remove_xul_attributes.js
rename : devtools/client/inspector/markup/test/browser_markup_search_01.js => devtools/client/markupview/test/browser_markupview_search_01.js
rename : devtools/client/inspector/markup/test/browser_markup_tag_edit_01.js => devtools/client/markupview/test/browser_markupview_tag_edit_01.js
rename : devtools/client/inspector/markup/test/browser_markup_tag_edit_02.js => devtools/client/markupview/test/browser_markupview_tag_edit_02.js
rename : devtools/client/inspector/markup/test/browser_markup_tag_edit_03.js => devtools/client/markupview/test/browser_markupview_tag_edit_03.js
rename : devtools/client/inspector/markup/test/browser_markup_tag_edit_04.js => devtools/client/markupview/test/browser_markupview_tag_edit_04.js
rename : devtools/client/inspector/markup/test/browser_markup_tag_edit_05.js => devtools/client/markupview/test/browser_markupview_tag_edit_05.js
rename : devtools/client/inspector/markup/test/browser_markup_tag_edit_06.js => devtools/client/markupview/test/browser_markupview_tag_edit_06.js
rename : devtools/client/inspector/markup/test/browser_markup_tag_edit_07.js => devtools/client/markupview/test/browser_markupview_tag_edit_07.js
rename : devtools/client/inspector/markup/test/browser_markup_tag_edit_08.js => devtools/client/markupview/test/browser_markupview_tag_edit_08.js
rename : devtools/client/inspector/markup/test/browser_markup_tag_edit_09.js => devtools/client/markupview/test/browser_markupview_tag_edit_09.js
rename : devtools/client/inspector/markup/test/browser_markup_tag_edit_10.js => devtools/client/markupview/test/browser_markupview_tag_edit_10.js
rename : devtools/client/inspector/markup/test/browser_markup_tag_edit_11.js => devtools/client/markupview/test/browser_markupview_tag_edit_11.js
rename : devtools/client/inspector/markup/test/browser_markup_tag_edit_12.js => devtools/client/markupview/test/browser_markupview_tag_edit_12.js
rename : devtools/client/inspector/markup/test/browser_markup_tag_edit_13-other.js => devtools/client/markupview/test/browser_markupview_tag_edit_13-other.js
rename : devtools/client/inspector/markup/test/browser_markup_textcontent_edit_01.js => devtools/client/markupview/test/browser_markupview_textcontent_edit_01.js
rename : devtools/client/inspector/markup/test/browser_markup_toggle_01.js => devtools/client/markupview/test/browser_markupview_toggle_01.js
rename : devtools/client/inspector/markup/test/browser_markup_toggle_02.js => devtools/client/markupview/test/browser_markupview_toggle_02.js
rename : devtools/client/inspector/markup/test/browser_markup_toggle_03.js => devtools/client/markupview/test/browser_markupview_toggle_03.js
rename : devtools/client/inspector/markup/test/browser_markup_update-on-navigtion.js => devtools/client/markupview/test/browser_markupview_update-on-navigtion.js
rename : devtools/client/inspector/markup/test/doc_markup_anonymous.html => devtools/client/markupview/test/doc_markup_anonymous.html
rename : devtools/client/inspector/markup/test/doc_markup_dragdrop.html => devtools/client/markupview/test/doc_markup_dragdrop.html
rename : devtools/client/inspector/markup/test/doc_markup_dragdrop_autoscroll.html => devtools/client/markupview/test/doc_markup_dragdrop_autoscroll.html
rename : devtools/client/inspector/markup/test/doc_markup_edit.html => devtools/client/markupview/test/doc_markup_edit.html
rename : devtools/client/inspector/markup/test/doc_markup_events-overflow.html => devtools/client/markupview/test/doc_markup_events-overflow.html
rename : devtools/client/inspector/markup/test/doc_markup_events.html => devtools/client/markupview/test/doc_markup_events.html
rename : devtools/client/inspector/markup/test/doc_markup_events_form.html => devtools/client/markupview/test/doc_markup_events_form.html
rename : devtools/client/inspector/markup/test/doc_markup_events_jquery.html => devtools/client/markupview/test/doc_markup_events_jquery.html
rename : devtools/client/inspector/markup/test/doc_markup_flashing.html => devtools/client/markupview/test/doc_markup_flashing.html
rename : devtools/client/inspector/markup/test/doc_markup_links.html => devtools/client/markupview/test/doc_markup_links.html
rename : devtools/client/inspector/markup/test/doc_markup_mutation.html => devtools/client/markupview/test/doc_markup_mutation.html
rename : devtools/client/inspector/markup/test/doc_markup_navigation.html => devtools/client/markupview/test/doc_markup_navigation.html
rename : devtools/client/inspector/markup/test/doc_markup_not_displayed.html => devtools/client/markupview/test/doc_markup_not_displayed.html
rename : devtools/client/inspector/markup/test/doc_markup_pagesize_01.html => devtools/client/markupview/test/doc_markup_pagesize_01.html
rename : devtools/client/inspector/markup/test/doc_markup_pagesize_02.html => devtools/client/markupview/test/doc_markup_pagesize_02.html
rename : devtools/client/inspector/markup/test/doc_markup_search.html => devtools/client/markupview/test/doc_markup_search.html
rename : devtools/client/inspector/markup/test/doc_markup_svg_attributes.html => devtools/client/markupview/test/doc_markup_svg_attributes.html
rename : devtools/client/inspector/markup/test/doc_markup_toggle.html => devtools/client/markupview/test/doc_markup_toggle.html
rename : devtools/client/inspector/markup/test/doc_markup_tooltip.png => devtools/client/markupview/test/doc_markup_tooltip.png
rename : devtools/client/inspector/markup/test/doc_markup_xul.xul => devtools/client/markupview/test/doc_markup_xul.xul
rename : devtools/client/inspector/markup/test/head.js => devtools/client/markupview/test/head.js
rename : devtools/client/inspector/markup/test/helper_attributes_test_runner.js => devtools/client/markupview/test/helper_attributes_test_runner.js
rename : devtools/client/inspector/markup/test/helper_events_test_runner.js => devtools/client/markupview/test/helper_events_test_runner.js
rename : devtools/client/inspector/markup/test/helper_outerhtml_test_runner.js => devtools/client/markupview/test/helper_outerhtml_test_runner.js
rename : devtools/client/inspector/markup/test/lib_jquery_1.0.js => devtools/client/markupview/test/lib_jquery_1.0.js
rename : devtools/client/inspector/markup/test/lib_jquery_1.1.js => devtools/client/markupview/test/lib_jquery_1.1.js
rename : devtools/client/inspector/markup/test/lib_jquery_1.11.1_min.js => devtools/client/markupview/test/lib_jquery_1.11.1_min.js
rename : devtools/client/inspector/markup/test/lib_jquery_1.2_min.js => devtools/client/markupview/test/lib_jquery_1.2_min.js
rename : devtools/client/inspector/markup/test/lib_jquery_1.3_min.js => devtools/client/markupview/test/lib_jquery_1.3_min.js
rename : devtools/client/inspector/markup/test/lib_jquery_1.4_min.js => devtools/client/markupview/test/lib_jquery_1.4_min.js
rename : devtools/client/inspector/markup/test/lib_jquery_1.6_min.js => devtools/client/markupview/test/lib_jquery_1.6_min.js
rename : devtools/client/inspector/markup/test/lib_jquery_1.7_min.js => devtools/client/markupview/test/lib_jquery_1.7_min.js
rename : devtools/client/inspector/markup/test/lib_jquery_2.1.1_min.js => devtools/client/markupview/test/lib_jquery_2.1.1_min.js
rename : devtools/client/themes/markup.css => devtools/client/themes/markup-view.css
extra : commitid : FbjJ4GQ2Lv9

devtools/client/inspector/inspector-panel.js

@@ -15,7 +15,7 @@ var {HostType} = require("devtools/client/framework/toolbox").Toolbox;
 
 loader.lazyRequireGetter(this, "CSS", "CSS");
 
-loader.lazyGetter(this, "MarkupView", () => require("devtools/client/inspector/markup/markup").MarkupView);
+loader.lazyGetter(this, "MarkupView", () => require("devtools/client/markupview/markup-view").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);
@@ -924,7 +924,7 @@ InspectorPanel.prototype = {
 
     this._markupBox.setAttribute("collapsed", true);
     this._markupBox.appendChild(this._markupFrame);
-    this._markupFrame.setAttribute("src", "chrome://devtools/content/inspector/markup/markup.xhtml");
+    this._markupFrame.setAttribute("src", "chrome://devtools/content/markupview/markup-view.xhtml");
     this._markupFrame.setAttribute("aria-label", strings.GetStringFromName("inspector.panelLabel.markupView"));
   },
 

devtools/client/inspector/markup/test/browser.ini

@@ -1,124 +0,0 @@
-[DEFAULT]
-tags = devtools
-subsuite = devtools
-support-files =
-  actor_events_form.js
-  doc_markup_anonymous.html
-  doc_markup_dragdrop.html
-  doc_markup_dragdrop_autoscroll.html
-  doc_markup_edit.html
-  doc_markup_events.html
-  doc_markup_events_form.html
-  doc_markup_events_jquery.html
-  doc_markup_events-overflow.html
-  doc_markup_flashing.html
-  doc_markup_links.html
-  doc_markup_mutation.html
-  doc_markup_navigation.html
-  doc_markup_not_displayed.html
-  doc_markup_pagesize_01.html
-  doc_markup_pagesize_02.html
-  doc_markup_search.html
-  doc_markup_svg_attributes.html
-  doc_markup_toggle.html
-  doc_markup_tooltip.png
-  doc_markup_xul.xul
-  head.js
-  helper_attributes_test_runner.js
-  helper_events_test_runner.js
-  helper_outerhtml_test_runner.js
-  lib_jquery_1.0.js
-  lib_jquery_1.1.js
-  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_markup_anonymous_01.js]
-[browser_markup_anonymous_02.js]
-skip-if = e10s # scratchpad.xul is not loading in e10s window
-[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_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_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_markup_events_jquery_1.0.js]
-skip-if = e10s # Bug 1040751 - CodeMirror editor.destroy() isn't e10s compatible
-[browser_markup_events_jquery_1.1.js]
-skip-if = e10s # Bug 1040751 - CodeMirror editor.destroy() isn't e10s compatible
-[browser_markup_events_jquery_1.2.js]
-skip-if = e10s # Bug 1040751 - CodeMirror editor.destroy() isn't e10s compatible
-[browser_markup_events_jquery_1.3.js]
-skip-if = e10s # Bug 1040751 - CodeMirror editor.destroy() isn't e10s compatible
-[browser_markup_events_jquery_1.4.js]
-skip-if = e10s # Bug 1040751 - CodeMirror editor.destroy() isn't e10s compatible
-[browser_markup_events_jquery_1.6.js]
-skip-if = e10s # Bug 1040751 - CodeMirror editor.destroy() isn't e10s compatible
-[browser_markup_events_jquery_1.7.js]
-skip-if = e10s # Bug 1040751 - CodeMirror editor.destroy() isn't e10s compatible
-[browser_markup_events_jquery_1.11.1.js]
-skip-if = e10s # Bug 1040751 - CodeMirror editor.destroy() isn't e10s compatible
-[browser_markup_events_jquery_2.1.1.js]
-skip-if = e10s # Bug 1040751 - CodeMirror editor.destroy() isn't e10s compatible
-[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_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]

devtools/client/inspector/moz.build

@@ -6,7 +6,6 @@ DIRS += [
     'computed',
     'fonts',
     'layout',
-    'markup',
     'rules'
 ]
 

devtools/client/jar.mn

@@ -8,6 +8,8 @@ devtools.jar:
     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)
@@ -27,15 +29,13 @@ devtools.jar:
     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/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/rules/rules.xhtml (inspector/rules/rules.xhtml)
+    content/inspector/rules/rules.css (inspector/rules/rules.css)
     content/inspector/layout/layout.js (inspector/layout/layout.js)
     content/inspector/layout/layout.xhtml (inspector/layout/layout.xhtml)
-    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/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/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)
@@ -195,7 +195,7 @@ devtools.jar:
     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.css (themes/markup.css)
+    skin/markup-view.css (themes/markup-view.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)

devtools/client/markupview/markup-view.js

@@ -21,7 +21,7 @@ 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/inspector/markup/html-editor");
+const {HTMLEditor} = require("devtools/client/markupview/html-editor");
 const promise = require("promise");
 const {Tooltip} = require("devtools/client/shared/widgets/Tooltip");
 const EventEmitter = require("devtools/shared/event-emitter");

devtools/client/markupview/markup-view.xhtml

@@ -7,8 +7,8 @@
 <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/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/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/skin/common.css" type="text/css"/>
 
   <script type="application/javascript;version=1.8"

devtools/client/markupview/moz.build

@@ -4,9 +4,9 @@
 # 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.js',
+    'markup-view.js',
 )
-
-BROWSER_CHROME_MANIFESTS += ['test/browser.ini']

devtools/client/markupview/test/.eslintrc

@@ -1,4 +1,4 @@
 {
   // Extend from the shared list of defined globals for mochitests.
-  "extends": "../../../../.eslintrc.mochitests"
+  "extends": "../../../.eslintrc.mochitests"
 }

devtools/client/markupview/test/browser.ini

@@ -0,0 +1,124 @@
+[DEFAULT]
+tags = devtools
+subsuite = devtools
+support-files =
+  actor_events_form.js
+  doc_markup_anonymous.html
+  doc_markup_dragdrop.html
+  doc_markup_dragdrop_autoscroll.html
+  doc_markup_edit.html
+  doc_markup_events.html
+  doc_markup_events_form.html
+  doc_markup_events_jquery.html
+  doc_markup_events-overflow.html
+  doc_markup_flashing.html
+  doc_markup_links.html
+  doc_markup_mutation.html
+  doc_markup_navigation.html
+  doc_markup_not_displayed.html
+  doc_markup_pagesize_01.html
+  doc_markup_pagesize_02.html
+  doc_markup_search.html
+  doc_markup_svg_attributes.html
+  doc_markup_toggle.html
+  doc_markup_tooltip.png
+  doc_markup_xul.xul
+  head.js
+  helper_attributes_test_runner.js
+  helper_events_test_runner.js
+  helper_outerhtml_test_runner.js
+  lib_jquery_1.0.js
+  lib_jquery_1.1.js
+  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]
+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]
+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]
+skip-if = e10s # Bug 1040751 - CodeMirror editor.destroy() isn't e10s compatible
+[browser_markupview_events_form.js]
+# [browser_markupview_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]
+skip-if = e10s # Bug 1040751 - CodeMirror editor.destroy() isn't e10s compatible
+[browser_markupview_events_jquery_1.1.js]
+skip-if = e10s # Bug 1040751 - CodeMirror editor.destroy() isn't e10s compatible
+[browser_markupview_events_jquery_1.2.js]
+skip-if = e10s # Bug 1040751 - CodeMirror editor.destroy() isn't e10s compatible
+[browser_markupview_events_jquery_1.3.js]
+skip-if = e10s # Bug 1040751 - CodeMirror editor.destroy() isn't e10s compatible
+[browser_markupview_events_jquery_1.4.js]
+skip-if = e10s # Bug 1040751 - CodeMirror editor.destroy() isn't e10s compatible
+[browser_markupview_events_jquery_1.6.js]
+skip-if = e10s # Bug 1040751 - CodeMirror editor.destroy() isn't e10s compatible
+[browser_markupview_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]
+skip-if = e10s # Bug 1040751 - CodeMirror editor.destroy() isn't e10s compatible
+[browser_markupview_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]
+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]