Backed out changeset d6a124bce670 (bug 1263439) for eslint failures
authorCarsten "Tomcat" Book <cbook@mozilla.com>
Wed, 13 Apr 2016 12:50:10 +0200
changeset 292969 ae00188ceb4d69c2a803fec5f264f52072fcd89c
parent 292968 f6c99ce0e2a7cfe63ca21f534529f4f5b8ff6b56
child 292970 2727f90565801275fe44e04be95c8822c023cbf2
push id18674
push usercbook@mozilla.com
push dateWed, 13 Apr 2016 10:50:20 +0000
treeherderfx-team@ae00188ceb4d [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
bugs1263439
milestone48.0a1
backs outd6a124bce6703f44b28e538510202c42a117d9b2
Backed out changeset d6a124bce670 (bug 1263439) for eslint failures
devtools/client/inspector/rules/test/browser.ini
devtools/client/inspector/rules/test/browser_rules_blob_stylesheet.js
devtools/client/inspector/rules/test/doc_blob_stylesheet.html
devtools/server/actors/stylesheets.js
--- a/devtools/client/inspector/rules/test/browser.ini
+++ b/devtools/client/inspector/rules/test/browser.ini
@@ -1,14 +1,13 @@
 [DEFAULT]
 tags = devtools
 subsuite = devtools
 support-files =
   doc_author-sheet.html
-  doc_blob_stylesheet.html
   doc_content_stylesheet.html
   doc_content_stylesheet_imported.css
   doc_content_stylesheet_imported2.css
   doc_content_stylesheet_linked.css
   doc_content_stylesheet_script.css
   doc_copystyles.css
   doc_copystyles.html
   doc_cssom.html
@@ -51,17 +50,16 @@ support-files =
 [browser_rules_add-rule_02.js]
 [browser_rules_add-rule_03.js]
 [browser_rules_add-rule_04.js]
 [browser_rules_add-rule_05.js]
 [browser_rules_add-rule_pseudo_class.js]
 [browser_rules_authored.js]
 [browser_rules_authored_color.js]
 [browser_rules_authored_override.js]
-[browser_rules_blob_stylesheet.js]
 [browser_rules_colorpicker-and-image-tooltip_01.js]
 [browser_rules_colorpicker-and-image-tooltip_02.js]
 [browser_rules_colorpicker-appears-on-swatch-click.js]
 [browser_rules_colorpicker-commit-on-ENTER.js]
 [browser_rules_colorpicker-edit-gradient.js]
 [browser_rules_colorpicker-hides-on-tooltip.js]
 [browser_rules_colorpicker-multiple-changes.js]
 [browser_rules_colorpicker-release-outside-frame.js]
deleted file mode 100644
--- a/devtools/client/inspector/rules/test/browser_rules_blob_stylesheet.js
+++ /dev/null
@@ -1,20 +0,0 @@
-/* Any copyright is dedicated to the Public Domain.
- http://creativecommons.org/publicdomain/zero/1.0/ */
-
-"use strict";
-
-// Test that the rule-view content is correct for stylesheet generated
-// with createObjectURL(cssBlob)
-const TEST_URL = URL_ROOT + "doc_blob_stylesheet.html";
-
-add_task(function*() {
-  yield addTab(TEST_URL);
-  let {inspector, view} = yield openRuleView();
-
-  yield selectNode("h1", inspector);
-  is(view.element.querySelectorAll("#noResults").length, 0,
-    "The no-results element is not displayed");
-
-  is(view.element.querySelectorAll(".ruleview-rule").length, 2,
-    "There are 2 displayed rules");
-});
deleted file mode 100644
--- a/devtools/client/inspector/rules/test/doc_blob_stylesheet.html
+++ /dev/null
@@ -1,31 +0,0 @@
-<!-- Any copyright is dedicated to the Public Domain.
-     http://creativecommons.org/publicdomain/zero/1.0/ -->
-<!doctype html>
-</html>
-<html>
-<head>
-  <meta charset="utf-8">
-  <title>Blob stylesheet sourcemap</title>
-</head>
-<body>
-<h1>Test</h1>
-<script>
-var cssContent = `body {
-  background-color: black;
-}
-body > h1 {
-  color: white;
-}
-/*# sourceMappingURL=data:application/json;base64,ewoidmVyc2lvbiI6IDMsCiJtYXBwaW5ncyI6ICJBQUFBLElBQUs7RUFDSCxnQkFBZ0IsRUFBRSxLQUFLOztBQUN2QixTQUFPO0VBQ0wsS0FBSyxFQUFFLEtBQUsiLAoic291cmNlcyI6IFsidGVzdC5zY3NzIl0sCiJzb3VyY2VzQ29udGVudCI6IFsiYm9keSB7XG4gIGJhY2tncm91bmQtY29sb3I6IGJsYWNrO1xuICAmID4gaDEge1xuICAgIGNvbG9yOiB3aGl0ZTsgIFxuICB9XG59XG4iXSwKIm5hbWVzIjogW10sCiJmaWxlIjogInRlc3QuY3NzIgp9Cg== */`;
-var cssBlob = new Blob([cssContent], {type: 'text/css'});
-var url = URL.createObjectURL(cssBlob);
-
-var head  = document.querySelector('head');
-var link  = document.createElement('link');
-link.rel  = 'stylesheet';
-link.type = 'text/css';
-link.href = url;
-head.appendChild(link);
-</script>
-</body>
-</html>
--- a/devtools/server/actors/stylesheets.js
+++ b/devtools/server/actors/stylesheets.js
@@ -798,19 +798,16 @@ var StyleSheetActor = protocol.ActorClas
     }
     this._originalSources = null;
   },
 
   /**
    * Sets the source map's sourceRoot to be relative to the source map url.
    */
   _setSourceMapRoot: function(aSourceMap, aAbsSourceMapURL, aScriptURL) {
-    if (aScriptURL.startsWith("blob:")) {
-      aScriptURL = aScriptURL.replace("blob:", "");
-    }
     const base = dirname(
       aAbsSourceMapURL.startsWith("data:")
         ? aScriptURL
         : aAbsSourceMapURL);
     aSourceMap.sourceRoot = aSourceMap.sourceRoot
       ? normalize(aSourceMap.sourceRoot, base)
       : base;
   },