From 20d3b56640ad82f0b54b4d5699db9feb68ad0dba Mon Sep 17 00:00:00 2001 From: "Carsten \"Tomcat\" Book" Date: Tue, 9 Sep 2014 11:14:51 +0200 Subject: [PATCH] Backed out changeset f3643ddd721f (bug 1050376) --- docshell/test/browser/browser.ini | 2 - .../browser/browser_timelineMarkers-01.js | 46 ------- .../browser/browser_timelineMarkers-02.js | 112 ------------------ 3 files changed, 160 deletions(-) delete mode 100644 docshell/test/browser/browser_timelineMarkers-01.js delete mode 100644 docshell/test/browser/browser_timelineMarkers-02.js diff --git a/docshell/test/browser/browser.ini b/docshell/test/browser/browser.ini index c21b9654822..fea87f9644e 100644 --- a/docshell/test/browser/browser.ini +++ b/docshell/test/browser/browser.ini @@ -97,5 +97,3 @@ skip-if = e10s skip-if = e10s # Bug ?????? - event handler checks event.target is the content document and test e10s-utils doesn't do that. [browser_search_notification.js] skip-if = e10s -[browser_timelineMarkers-01.js] -[browser_timelineMarkers-02.js] diff --git a/docshell/test/browser/browser_timelineMarkers-01.js b/docshell/test/browser/browser_timelineMarkers-01.js deleted file mode 100644 index cd66f87fe09..00000000000 --- a/docshell/test/browser/browser_timelineMarkers-01.js +++ /dev/null @@ -1,46 +0,0 @@ -/* Any copyright is dedicated to the Public Domain. - http://creativecommons.org/publicdomain/zero/1.0/ */ - -"use strict"; - -// Test that the docShell has the right profile timeline API - -let test = Task.async(function*() { - waitForExplicitFinish(); - - yield openUrl("data:text/html;charset=utf-8,Test page"); - - let docShell = content.QueryInterface(Ci.nsIInterfaceRequestor) - .getInterface(Ci.nsIWebNavigation) - .QueryInterface(Ci.nsIDocShell); - - ok("recordProfileTimelineMarkers" in docShell, - "The recordProfileTimelineMarkers attribute exists"); - ok("popProfileTimelineMarkers" in docShell, - "The popProfileTimelineMarkers function exists"); - ok(docShell.recordProfileTimelineMarkers === false, - "recordProfileTimelineMarkers is false by default"); - ok(docShell.popProfileTimelineMarkers().length === 0, - "There are no markers by default"); - - docShell.recordProfileTimelineMarkers = true; - ok(docShell.recordProfileTimelineMarkers === true, - "recordProfileTimelineMarkers can be set to true"); - - docShell.recordProfileTimelineMarkers = false; - ok(docShell.recordProfileTimelineMarkers === false, - "recordProfileTimelineMarkers can be set to false"); - - gBrowser.removeCurrentTab(); - finish(); -}); - -function openUrl(url) { - return new Promise(function(resolve, reject) { - gBrowser.selectedTab = gBrowser.addTab(url); - gBrowser.selectedBrowser.addEventListener("load", function onload() { - gBrowser.selectedBrowser.removeEventListener("load", onload, true); - waitForFocus(resolve, content); - }, true); - }); -} diff --git a/docshell/test/browser/browser_timelineMarkers-02.js b/docshell/test/browser/browser_timelineMarkers-02.js deleted file mode 100644 index bace8178a56..00000000000 --- a/docshell/test/browser/browser_timelineMarkers-02.js +++ /dev/null @@ -1,112 +0,0 @@ -/* Any copyright is dedicated to the Public Domain. - http://creativecommons.org/publicdomain/zero/1.0/ */ - -"use strict"; - -// Test that the docShell profile timeline API returns the right markers when -// restyles, reflows and paints occur - -let URL = 'data:text/html;charset=utf-8,' + - '
'; - -let TESTS = [{ - desc: "Changing the width of the test element", - setup: function(div) { - div.style.width = "10px"; - }, - check: function(markers) { - ok(markers.length > 0, "markers were returned"); - ok(markers.some(m => m.name == "Reflow"), "markers includes Reflow"); - ok(markers.some(m => m.name == "Paint"), "markers includes Paint"); - ok(markers.some(m => m.name == "Styles"), "markers includes Restyle"); - } -}, { - desc: "Changing the test element's background color", - setup: function(div) { - div.style.backgroundColor = "green"; - }, - check: function(markers) { - ok(markers.length > 0, "markers were returned"); - ok(!markers.some(m => m.name == "Reflow"), "markers doesn't include Reflow"); - ok(markers.some(m => m.name == "Paint"), "markers includes Paint"); - ok(markers.some(m => m.name == "Styles"), "markers includes Restyle"); - } -}, { - desc: "Changing the test element's classname", - setup: function(div) { - div.className = "x"; - }, - check: function(markers) { - ok(markers.length > 0, "markers were returned"); - ok(!markers.some(m => m.name == "Reflow"), "markers doesn't include Reflow"); - ok(!markers.some(m => m.name == "Paint"), "markers doesn't include Paint"); - ok(markers.some(m => m.name == "Styles"), "markers includes Restyle"); - } -}]; - -let test = Task.async(function*() { - waitForExplicitFinish(); - - yield openUrl(URL); - - let docShell = content.QueryInterface(Ci.nsIInterfaceRequestor) - .getInterface(Ci.nsIWebNavigation) - .QueryInterface(Ci.nsIDocShell); - let div = content.document.querySelector("div"); - - info("Start recording"); - docShell.recordProfileTimelineMarkers = true; - - for (let {desc, setup, check} of TESTS) { - info("Running test: " + desc); - - info("Flushing the previous markers if any"); - docShell.popProfileTimelineMarkers(); - - info("Running the test setup function"); - let onMarkers = waitForMarkers(docShell); - setup(div); - - info("Waiting for new markers on the docShell"); - let markers = yield onMarkers; - - info("Running the test check function"); - check(markers); - } - - info("Stop recording"); - docShell.recordProfileTimelineMarkers = false; - - gBrowser.removeCurrentTab(); - finish(); -}); - -function openUrl(url) { - return new Promise(function(resolve, reject) { - gBrowser.selectedTab = gBrowser.addTab(url); - gBrowser.selectedBrowser.addEventListener("load", function onload() { - gBrowser.selectedBrowser.removeEventListener("load", onload, true); - waitForFocus(resolve, content); - }, true); - }); -} - -function waitForMarkers(docshell) { - return new Promise(function(resolve, reject) { - let waitIterationCount = 0; - let maxWaitIterationCount = 10; // Wait for 2sec maximum - - let interval = setInterval(() => { - let markers = docshell.popProfileTimelineMarkers(); - if (markers.length > 0) { - clearInterval(interval); - resolve(markers); - } - if (waitIterationCount > maxWaitIterationCount) { - clearInterval(interval); - resolve([]); - } - waitIterationCount++; - }, 200); - }); -}