From 688f5952cb7f21aca0a60fa8b2d73fcc845e7d8b Mon Sep 17 00:00:00 2001 From: "Carsten \"Tomcat\" Book" Date: Thu, 11 Dec 2014 08:49:48 +0100 Subject: [PATCH] Backed out changeset 932daea51104 (bug 1104623) --- dom/workers/moz.build | 2 - dom/workers/test/browser.ini | 4 -- dom/workers/test/browser_bug1104623.js | 51 -------------------------- 3 files changed, 57 deletions(-) delete mode 100644 dom/workers/test/browser.ini delete mode 100644 dom/workers/test/browser_bug1104623.js diff --git a/dom/workers/moz.build b/dom/workers/moz.build index dea3ce2f7b6d..7d3dbb7085c4 100644 --- a/dom/workers/moz.build +++ b/dom/workers/moz.build @@ -107,5 +107,3 @@ MOCHITEST_MANIFESTS += [ MOCHITEST_CHROME_MANIFESTS += ['test/chrome.ini'] XPCSHELL_TESTS_MANIFESTS += ['test/xpcshell/xpcshell.ini'] - -BROWSER_CHROME_MANIFESTS += ['test/browser.ini'] diff --git a/dom/workers/test/browser.ini b/dom/workers/test/browser.ini deleted file mode 100644 index 54fc0dde8487..000000000000 --- a/dom/workers/test/browser.ini +++ /dev/null @@ -1,4 +0,0 @@ -[DEFAULT] - -[browser_bug1104623.js] -run-if = buildapp == 'browser' diff --git a/dom/workers/test/browser_bug1104623.js b/dom/workers/test/browser_bug1104623.js deleted file mode 100644 index 539c3f343020..000000000000 --- a/dom/workers/test/browser_bug1104623.js +++ /dev/null @@ -1,51 +0,0 @@ -/* 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/. */ - -function whenBrowserLoaded(aBrowser, aCallback) { - aBrowser.addEventListener("load", function onLoad(event) { - if (event.target == aBrowser.contentDocument) { - aBrowser.removeEventListener("load", onLoad, true); - executeSoon(aCallback); - } - }, true); -} - -function test() { - waitForExplicitFinish(); - - let testURL = "chrome://mochitests/content/chrome/dom/base/test/file_empty.html"; - - let tab = gBrowser.addTab(testURL); - gBrowser.selectedTab = tab; - - whenBrowserLoaded(tab.linkedBrowser, function() { - let doc = tab.linkedBrowser.contentDocument; - let contentWin = tab.linkedBrowser.contentWindow; - - let blob = new contentWin.Blob(['onmessage = function() { postMessage(true); }']); - ok(blob, "Blob has been created"); - - let blobURL = contentWin.URL.createObjectURL(blob); - ok(blobURL, "Blob URL has been created"); - - let worker = new contentWin.Worker(blobURL); - ok(worker, "Worker has been created"); - - worker.onerror = function(error) { - ok(false, "Worker.onerror:" + error.message); - contentWin.URL.revokeObjectURL(blob); - gBrowser.removeTab(tab); - executeSoon(finish); - } - - worker.onmessage = function() { - ok(true, "Worker.onmessage"); - gBrowser.removeTab(tab); - contentWin.URL.revokeObjectURL(blob); - executeSoon(finish); - } - - worker.postMessage(true); - }); -}