Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-10-08 19:04:45 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bug 1111276 - Replace gBrowser.selectedTab.linkedBrowser with gBrowser.selectedBrowser. r=dao

Browse Source 
--HG--
extra : rebase_source : d7ef16a16f884458d99dff05efb370694d2ea5e3
This commit is contained in:
abdelrhman 2014-12-15 22:05:46 +01:00
parent 3c7f55c8ce
commit 3990efb3f1
34 changed files with 69 additions and 69 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
addon-sdk/source/test/addons/page-mod-debugger-post/main.js
View File

@ -92,7 +92,7 @@ function testDebuggerStatement([aGrip, aResponse]) {
ok(true, 'the page-mod was attached to ' + mod.tab.url);
require('sdk/timers').setTimeout(function() {
let debuggee = getMostRecentBrowserWindow().gBrowser.selectedTab.linkedBrowser.contentWindow.wrappedJSObject;
let debuggee = getMostRecentBrowserWindow().gBrowser.selectedBrowser.contentWindow.wrappedJSObject;
debuggee.runDebuggerStatement();
ok(true, 'called runDebuggerStatement');
}, 500)

2
addon-sdk/source/test/addons/page-mod-debugger-pre/main.js
View File

@ -91,7 +91,7 @@ function testDebuggerStatement([aGrip, aResponse]) {
});
});
let debuggee = getMostRecentBrowserWindow().gBrowser.selectedTab.linkedBrowser.contentWindow.wrappedJSObject;
let debuggee = getMostRecentBrowserWindow().gBrowser.selectedBrowser.contentWindow.wrappedJSObject;
debuggee.runDebuggerStatement();
ok(true, 'called runDebuggerStatement');

22
browser/base/content/test/general/browser_aboutHome.js
View File

@ -50,7 +50,7 @@ let gTests = [
setup: function () { },
run: function ()
{
let doc = gBrowser.selectedTab.linkedBrowser.contentDocument;
let doc = gBrowser.selectedBrowser.contentDocument;
let snippetsElt = doc.getElementById("snippets");
ok(snippetsElt, "Found snippets element")
is(snippetsElt.getElementsByTagName("span").length, 1,
@ -67,7 +67,7 @@ let gTests = [
},
run: function (aSnippetsMap)
{
let doc = gBrowser.selectedTab.linkedBrowser.contentDocument;
let doc = gBrowser.selectedBrowser.contentDocument;
let snippetsElt = doc.getElementById("snippets");
ok(snippetsElt, "Found snippets element");
@ -110,7 +110,7 @@ let gTests = [
let doc = gBrowser.contentDocument;
let engineName = doc.documentElement.getAttribute("searchEngineName");
is(engine.name, engineName, "Engine name in DOM should match engine we just added");
let mm = gBrowser.selectedTab.linkedBrowser.messageManager;
let mm = gBrowser.selectedBrowser.messageManager;
mm.loadFrameScript(TEST_CONTENT_HELPER, false);
@ -175,7 +175,7 @@ let gTests = [
},
run: function (aSnippetsMap)
{
let doc = gBrowser.selectedTab.linkedBrowser.contentDocument;
let doc = gBrowser.selectedBrowser.contentDocument;
let snippetsElt = doc.getElementById("snippets");
ok(snippetsElt, "Found snippets element");
@ -198,7 +198,7 @@ let gTests = [
setup: function () { },
run: function (aSnippetsMap)
{
let doc = gBrowser.selectedTab.linkedBrowser.contentDocument;
let doc = gBrowser.selectedBrowser.contentDocument;
let showRights = AboutHomeUtils.showKnowYourRights;
ok(showRights, "AboutHomeUtils.showKnowYourRights should be TRUE");
@ -220,7 +220,7 @@ let gTests = [
setup: function () { },
run: function (aSnippetsMap)
{
let doc = gBrowser.selectedTab.linkedBrowser.contentDocument;
let doc = gBrowser.selectedBrowser.contentDocument;
let rightsData = AboutHomeUtils.knowYourRightsData;
ok(!rightsData, "AboutHomeUtils.knowYourRightsData should be FALSE");
@ -252,7 +252,7 @@ let gTests = [
// Ready to execute the tests!
let needle = "Search for something awesome.";
let document = gBrowser.selectedTab.linkedBrowser.contentDocument;
let document = gBrowser.selectedBrowser.contentDocument;
let searchText = document.getElementById("searchText");
// We're about to change the search engine. Once the change has
@ -304,7 +304,7 @@ let gTests = [
{
let deferred = Promise.defer();
let browser = gBrowser.selectedTab.linkedBrowser;
let browser = gBrowser.selectedBrowser;
waitForLoad(() => {
let button = browser.contentDocument.getElementById("settings");
ok(button, "Found settings button in test page");
@ -387,7 +387,7 @@ let gTests = [
CustomizableUI.removeWidgetFromArea("search-container");
},
run: Task.async(function* () {
let doc = gBrowser.selectedTab.linkedBrowser.contentDocument;
let doc = gBrowser.selectedBrowser.contentDocument;
let logo = doc.getElementById("brandLogo");
let searchInput = doc.getElementById("searchText");
@ -404,7 +404,7 @@ let gTests = [
desc: "Cmd+k should focus the search box in the toolbar when it's present",
setup: function () {},
run: Task.async(function* () {
let logo = gBrowser.selectedTab.linkedBrowser.contentDocument.getElementById("brandLogo");
let logo = gBrowser.selectedBrowser.contentDocument.getElementById("brandLogo");
let doc = window.document;
let searchInput = doc.getElementById("searchbar").textbox.inputField;
@ -420,7 +420,7 @@ let gTests = [
desc: "Sync button should open about:accounts page with `abouthome` entrypoint",
setup: function () {},
run: Task.async(function* () {
let syncButton = gBrowser.selectedTab.linkedBrowser.contentDocument.getElementById("sync");
let syncButton = gBrowser.selectedBrowser.contentDocument.getElementById("sync");
yield EventUtils.synthesizeMouseAtCenter(syncButton, {}, gBrowser.contentWindow);
yield promiseTabLoadEvent(gBrowser.selectedTab, null, "load");

8
browser/base/content/test/general/browser_aboutSyncProgress.js
View File

@ -11,7 +11,7 @@ let gTests = [ {
Services.prefs.setCharPref("services.sync.firstSync", "newAccount");
},
run: function () {
let doc = gBrowser.selectedTab.linkedBrowser.contentDocument;
let doc = gBrowser.selectedBrowser.contentDocument;
let progressBar = doc.getElementById("uploadProgressBar");
let win = doc.defaultView;
@ -28,7 +28,7 @@ let gTests = [ {
Ci.nsIPrefBranch.PREF_INVALID, "pref DNE" );
},
run: function () {
let doc = gBrowser.selectedTab.linkedBrowser.contentDocument;
let doc = gBrowser.selectedBrowser.contentDocument;
let progressBar = doc.getElementById("uploadProgressBar");
let win = doc.defaultView;
@ -42,7 +42,7 @@ let gTests = [ {
setup: function () {
},
run: function () {
let doc = gBrowser.selectedTab.linkedBrowser.contentDocument;
let doc = gBrowser.selectedBrowser.contentDocument;
let progressBar = doc.getElementById("uploadProgressBar");
Services.obs.notifyObservers(null, "weave:engine:sync:finish", null);
@ -64,7 +64,7 @@ let gTests = [ {
gBrowser.tabContainer.removeEventListener("TabClose", onTabClosed, false);
executeSoon(runNextTest);
}
let doc = gBrowser.selectedTab.linkedBrowser.contentDocument;
let doc = gBrowser.selectedBrowser.contentDocument;
let button = doc.getElementById('closeButton');
let window = doc.defaultView;
gBrowser.tabContainer.addEventListener("TabClose", onTabClosed, false);

22
browser/base/content/test/general/browser_bug561636.js
View File

@ -89,7 +89,7 @@ function()
}, true);
gBrowser.selectedTab = tab;
gBrowser.selectedTab.linkedBrowser.loadURI(uri);
gBrowser.selectedBrowser.loadURI(uri);
},
/**
@ -124,7 +124,7 @@ function()
}, true);
gBrowser.selectedTab = tab;
gBrowser.selectedTab.linkedBrowser.loadURI(uri);
gBrowser.selectedBrowser.loadURI(uri);
},
/**
@ -159,7 +159,7 @@ function()
}, true);
gBrowser.selectedTab = tab;
gBrowser.selectedTab.linkedBrowser.loadURI(uri);
gBrowser.selectedBrowser.loadURI(uri);
},
/**
@ -200,7 +200,7 @@ function()
}, true);
gBrowser.selectedTab = tab;
gBrowser.selectedTab.linkedBrowser.loadURI(uri);
gBrowser.selectedBrowser.loadURI(uri);
},
/**
@ -241,7 +241,7 @@ function()
}, true);
gBrowser.selectedTab = tab;
gBrowser.selectedTab.linkedBrowser.loadURI(uri);
gBrowser.selectedBrowser.loadURI(uri);
},
/**
@ -282,7 +282,7 @@ function()
}, true);
gBrowser.selectedTab = tab;
gBrowser.selectedTab.linkedBrowser.loadURI(uri);
gBrowser.selectedBrowser.loadURI(uri);
},
/**
@ -322,7 +322,7 @@ function()
}, true);
gBrowser.selectedTab = tab;
gBrowser.selectedTab.linkedBrowser.loadURI(uri);
gBrowser.selectedBrowser.loadURI(uri);
},
/**
@ -364,7 +364,7 @@ function()
}, true);
gBrowser.selectedTab = tab;
gBrowser.selectedTab.linkedBrowser.loadURI(uri);
gBrowser.selectedBrowser.loadURI(uri);
},
/**
@ -405,7 +405,7 @@ function()
let browser = e.currentTarget;
browser.removeEventListener("load", arguments.callee, true);
isnot(gBrowser.selectedTab.linkedBrowser, browser,
isnot(gBrowser.selectedBrowser, browser,
"This tab should have been loaded in background");
executeSoon(function() {
browser.contentDocument.getElementById('s').click();
@ -449,7 +449,7 @@ function()
}, true);
gBrowser.selectedTab = tab;
gBrowser.selectedTab.linkedBrowser.loadURI(uri);
gBrowser.selectedBrowser.loadURI(uri);
},
/**
@ -498,7 +498,7 @@ function()
}, true);
gBrowser.selectedTab = tab;
gBrowser.selectedTab.linkedBrowser.loadURI(uri);
gBrowser.selectedBrowser.loadURI(uri);
},
];

2
browser/base/content/test/general/browser_bug595507.js
View File

@ -36,5 +36,5 @@ function test()
}, true);
gBrowser.selectedTab = tab;
gBrowser.selectedTab.linkedBrowser.loadURI(uri);
gBrowser.selectedBrowser.loadURI(uri);
}

2
browser/base/content/test/general/browser_devices_get_user_media.js
View File

@ -799,7 +799,7 @@ let gTests = [
run: function checkNoAlwaysOnHttp() {
// Load an http page instead of the https version.
let deferred = Promise.defer();
let browser = gBrowser.selectedTab.linkedBrowser;
let browser = gBrowser.selectedBrowser;
browser.addEventListener("load", function onload() {
browser.removeEventListener("load", onload, true);
deferred.resolve();

4
browser/base/content/test/general/browser_notification_tab_switching.js
View File

@ -46,7 +46,7 @@ function onLoad() {
setTimeout(waitUntilNewWindowHasFocus, 50);
} else {
// Focus another window so that new window gets blur event.
gBrowser.selectedTab.linkedBrowser.contentWindow.focus();
gBrowser.selectedBrowser.contentWindow.focus();
}
}
win.newWindow.focus();
@ -88,7 +88,7 @@ function openSecondNotification() {
function onTabSelect() {
gBrowser.tabContainer.removeEventListener("TabSelect", onTabSelect);
is(gBrowser.selectedTab.linkedBrowser.contentWindow.location.href, notificationURL,
is(gBrowser.selectedBrowser.contentWindow.location.href, notificationURL,
"Notification tab should be selected.");
finish();

2
browser/base/content/test/newtab/browser_newtab_bug991210.js
View File

@ -18,7 +18,7 @@ function runTests() {
// wait until about:newtab loads before calling provider callback
addNewTabPageTab();
let browser = gWindow.gBrowser.selectedTab.linkedBrowser;
let browser = gWindow.gBrowser.selectedBrowser;
yield browser.addEventListener("load", function onLoad() {
browser.removeEventListener("load", onLoad, true);
// afterLoadProvider.callback has to be called asynchronously to make grid

4
browser/base/content/test/social/browser_aboutHome_activation.js
View File

@ -67,7 +67,7 @@ let gTests = [
run: function (aSnippetsMap)
{
let deferred = Promise.defer();
let doc = gBrowser.selectedTab.linkedBrowser.contentDocument;
let doc = gBrowser.selectedBrowser.contentDocument;
let snippetsElt = doc.getElementById("snippets");
ok(snippetsElt, "Found snippets element");
@ -99,7 +99,7 @@ let gTests = [
run: function (aSnippetsMap)
{
let deferred = Promise.defer();
let doc = gBrowser.selectedTab.linkedBrowser.contentDocument;
let doc = gBrowser.selectedBrowser.contentDocument;
let snippetsElt = doc.getElementById("snippets");
ok(snippetsElt, "Found snippets element");

2
browser/base/content/test/social/browser_social_marks.js
View File

@ -64,7 +64,7 @@ var tests = {
testButtonDisabledOnActivate: function(next) {
// starting on about:blank page, share should be visible but disabled when
// adding provider
is(gBrowser.selectedTab.linkedBrowser.currentURI.spec, "about:blank");
is(gBrowser.selectedBrowser.currentURI.spec, "about:blank");
SocialService.addProvider(manifest2, function(provider) {
is(provider.origin, manifest2.origin, "provider is installed");
let id = SocialMarks._toolbarHelper.idFromOrigin(manifest2.origin);

6
browser/components/customizableui/test/browser_967000_button_sync.js
View File

@ -31,15 +31,15 @@ function openAboutAccountsFromMenuPanel(entryPoint) {
let deferred = Promise.defer();
let handler = (e) => {
if (e.originalTarget != gBrowser.selectedTab.linkedBrowser.contentDocument ||
if (e.originalTarget != gBrowser.selectedBrowser.contentDocument ||
e.target.location.href == "about:blank") {
info("Skipping spurious 'load' event for " + e.target.location.href);
return;
}
gBrowser.selectedTab.linkedBrowser.removeEventListener("load", handler, true);
gBrowser.selectedBrowser.removeEventListener("load", handler, true);
deferred.resolve();
}
gBrowser.selectedTab.linkedBrowser.addEventListener("load", handler, true);
gBrowser.selectedBrowser.addEventListener("load", handler, true);
syncButton.click();
yield deferred.promise;

4
browser/components/places/tests/browser/browser_markPageAsFollowedLink.js
View File

@ -39,13 +39,13 @@ function test()
waitForExplicitFinish();
gBrowser.selectedTab = gBrowser.addTab(PAGE_URL);
let frameCount = 0;
gBrowser.selectedTab.linkedBrowser.addEventListener("DOMContentLoaded",
gBrowser.selectedBrowser.addEventListener("DOMContentLoaded",
function (event)
{
// Wait for all the frames.
if (frameCount++ < 2)
return;
gBrowser.selectedTab.linkedBrowser.removeEventListener("DOMContentLoaded", arguments.callee, false)
gBrowser.selectedBrowser.removeEventListener("DOMContentLoaded", arguments.callee, false)
gTabLoaded = true;
maybeClickLink();
}, false

2
browser/devtools/debugger/test/browser_dbg_navigation.js
View File

@ -50,7 +50,7 @@ function testNavigate([aGrip, aResponse]) {
}
});
gBrowser.selectedTab.linkedBrowser.loadURI(TAB2_URL);
gBrowser.selectedBrowser.loadURI(TAB2_URL);
return promise.all(outstanding.map(e => e.promise))
.then(() => aGrip.actor);
}

2
browser/devtools/eyedropper/test/browser_eyedropper_basic.js
View File

@ -60,7 +60,7 @@ function* inspectPage(dropper, click=true) {
let win = window;
// get location of the <div> in the content, offset from browser window
let box = gBrowser.selectedTab.linkedBrowser.getBoundingClientRect();
let box = gBrowser.selectedBrowser.getBoundingClientRect();
let x = box.left + 100;
let y = box.top + 100;

2
browser/devtools/eyedropper/test/browser_eyedropper_cmd.js
View File

@ -41,7 +41,7 @@ function inspectPage() {
let win = window;
// get location of the <div> in the content, offset from browser window
let box = gBrowser.selectedTab.linkedBrowser.getBoundingClientRect();
let box = gBrowser.selectedBrowser.getBoundingClientRect();
let x = box.left + 100;
let y = box.top + 100;

4
browser/devtools/inspector/test/head.js
View File

@ -626,7 +626,7 @@ function once(target, eventName, useCapture=false) {
* message has been received
*/
function waitForContentMessage(name) {
let mm = gBrowser.selectedTab.linkedBrowser.messageManager;
let mm = gBrowser.selectedBrowser.messageManager;
let def = promise.defer();
mm.addMessageListener(name, function onMessage(msg) {
@ -655,7 +655,7 @@ function wait(ms) {
* immediately resolves otherwise
*/
function executeInContent(name, data={}, objects={}, expectResponse=true) {
let mm = gBrowser.selectedTab.linkedBrowser.messageManager;
let mm = gBrowser.selectedBrowser.messageManager;
mm.sendAsyncMessage(name, data, objects);
if (expectResponse) {

2
browser/devtools/shared/DeveloperToolbar.jsm
View File

@ -217,7 +217,7 @@ let CommandUtils = {
},
get window() {
return this.chromeWindow.gBrowser.selectedTab.linkedBrowser.contentWindow;
return this.chromeWindow.gBrowser.selectedBrowser.contentWindow;
},
get document() {

2
browser/devtools/styleeditor/test/browser_styleeditor_reload.js
View File

@ -23,7 +23,7 @@ function test()
waitForExplicitFinish();
addTabAndOpenStyleEditors(2, function(panel) {
gContentWin = gBrowser.selectedTab.linkedBrowser.contentWindow.wrappedJSObject;
gContentWin = gBrowser.selectedBrowser.contentWindow.wrappedJSObject;
gUI = panel.UI;
gUI.editors[0].getSourceEditor().then(runTests);
});

2
browser/devtools/styleeditor/test/browser_styleeditor_selectstylesheet.js
View File

@ -23,7 +23,7 @@ function test()
waitForExplicitFinish();
addTabAndOpenStyleEditors(2, function(panel) {
gContentWin = gBrowser.selectedTab.linkedBrowser.contentWindow.wrappedJSObject;
gContentWin = gBrowser.selectedBrowser.contentWindow.wrappedJSObject;
gUI = panel.UI;
gUI.editors[0].getSourceEditor().then(runTests);
});

2
browser/devtools/styleinspector/test/browser_ruleview_eyedropper.js
View File

@ -124,7 +124,7 @@ function inspectPage(dropper, click=true) {
let win = window;
// get location of the content, offset from browser window
let box = gBrowser.selectedTab.linkedBrowser.getBoundingClientRect();
let box = gBrowser.selectedBrowser.getBoundingClientRect();
let x = box.left + 1;
let y = box.top + 1;

4
browser/devtools/styleinspector/test/head.js
View File

@ -342,7 +342,7 @@ function wait(ms) {
function waitForContentMessage(name) {
info("Expecting message " + name + " from content");
let mm = gBrowser.selectedTab.linkedBrowser.messageManager;
let mm = gBrowser.selectedBrowser.messageManager;
let def = promise.defer();
mm.addMessageListener(name, function onMessage(msg) {
@ -366,7 +366,7 @@ function waitForContentMessage(name) {
*/
function executeInContent(name, data={}, objects={}, expectResponse=true) {
info("Sending message " + name + " to content");
let mm = gBrowser.selectedTab.linkedBrowser.messageManager;
let mm = gBrowser.selectedBrowser.messageManager;
mm.sendAsyncMessage(name, data, objects);
if (expectResponse) {

2
browser/modules/test/browser_UITour_detach_tab.js
View File

@ -52,7 +52,7 @@ let tests = [
// NB: we're using this rather than gContentWindow.document because the latter wouldn't
// have an XRayWrapper, and we need to compare this to the doc we get using this method
// later on...
gContentDoc = gBrowser.selectedTab.linkedBrowser.contentDocument;
gContentDoc = gBrowser.selectedBrowser.contentDocument;
gContentDoc.addEventListener("visibilitychange", onVisibilityChange, false);
gContentAPI.showHighlight("appMenu");

2
browser/modules/test/browser_UITour_sync.js
View File

@ -44,7 +44,7 @@ let tests = [
"https://example.com/");
loadUITourTestPage(function(contentWindow) {
let tabBrowser = gBrowser.selectedTab.linkedBrowser;
let tabBrowser = gBrowser.selectedBrowser;
// This command will replace the current tab - so add a load event
// handler which will fire when that happens.
tabBrowser.addEventListener("load", function onload(evt) {

10
dom/tests/browser/browser_autofocus_preference.js
View File

@ -6,12 +6,12 @@ function test() {
var gAutofocusPref = prefs.getBoolPref("browser.autofocus");
prefs.setBoolPref("browser.autofocus", false);
gBrowser.selectedTab.linkedBrowser.addEventListener("load", function () {
gBrowser.selectedTab.linkedBrowser.removeEventListener("load", arguments.callee, true);
gBrowser.selectedBrowser.addEventListener("load", function () {
gBrowser.selectedBrowser.removeEventListener("load", arguments.callee, true);
executeSoon(function () {
is(gBrowser.selectedTab.linkedBrowser.contentDocument.activeElement,
gBrowser.selectedTab.linkedBrowser.contentDocument.body,
is(gBrowser.selectedBrowser.contentDocument.activeElement,
gBrowser.selectedBrowser.contentDocument.body,
"foo");
prefs.setBoolPref("browser.autofocus", gAutofocusPref);
@ -20,5 +20,5 @@ function test() {
});
}, true);
gBrowser.selectedTab.linkedBrowser.loadURI("data:text/html,<!DOCTYPE html><html><body><input autofocus><button autofocus></button><textarea autofocus></textarea><select autofocus></select></body></html>");
gBrowser.selectedBrowser.loadURI("data:text/html,<!DOCTYPE html><html><body><input autofocus><button autofocus></button><textarea autofocus></textarea><select autofocus></select></body></html>");
}

2
layout/base/tests/browser_bug617076.js
View File

@ -57,5 +57,5 @@ function test1() {
}, true);
gBrowser.selectedTab = tab;
gBrowser.selectedTab.linkedBrowser.loadURI(uri);
gBrowser.selectedBrowser.loadURI(uri);
}

2
toolkit/components/places/tests/browser/browser_notfound.js
View File

@ -12,7 +12,7 @@ function test() {
const TEST_URL = "http://mochi.test:8888/notFoundPage.html";
// Used to verify errors are not marked as typed.
PlacesUtils.history.markPageAsTyped(NetUtil.newURI(TEST_URL));
gBrowser.selectedTab.linkedBrowser.loadURI(TEST_URL);
gBrowser.selectedBrowser.loadURI(TEST_URL);
// Create and add history observer.
let historyObserver = {

2
toolkit/components/places/tests/browser/browser_redirect.js
View File

@ -12,7 +12,7 @@ function test() {
registerCleanupFunction(function() {
gBrowser.removeCurrentTab();
});
gBrowser.selectedTab.linkedBrowser.loadURI(REDIRECT_URI.spec);
gBrowser.selectedBrowser.loadURI(REDIRECT_URI.spec);
// Create and add history observer.
let historyObserver = {

2
toolkit/components/places/tests/browser/browser_visited_notfound.js
View File

@ -26,7 +26,7 @@ function test() {
function continueTest(aOldFrecency) {
// Used to verify errors are not marked as typed.
PlacesUtils.history.markPageAsTyped(TEST_URI);
gBrowser.selectedTab.linkedBrowser.loadURI(TEST_URI.spec);
gBrowser.selectedBrowser.loadURI(TEST_URI.spec);
// Create and add history observer.
let historyObserver = {

2
toolkit/components/thumbnails/test/head.js
View File

@ -93,7 +93,7 @@ function addTab(aURI, aCallback) {
* @param aURI The URI to load.
*/
function navigateTo(aURI) {
let browser = gBrowser.selectedTab.linkedBrowser;
let browser = gBrowser.selectedBrowser;
whenLoaded(browser);
browser.loadURI(aURI);
}

4
toolkit/devtools/server/tests/browser/browser_navigateEvents.js
View File

@ -126,7 +126,7 @@ function test() {
});
// Start listening for page load events
let browser = gBrowser.selectedTab.linkedBrowser;
let browser = gBrowser.selectedBrowser;
browser.addEventListener("DOMContentLoaded", onDOMContentLoaded, true);
browser.addEventListener("load", onLoad, true);
@ -146,7 +146,7 @@ function test() {
}
function cleanup() {
let browser = gBrowser.selectedTab.linkedBrowser;
let browser = gBrowser.selectedBrowser;
browser.removeEventListener("DOMContentLoaded", onDOMContentLoaded);
browser.removeEventListener("load", onLoad);
client.close(function () {

2
toolkit/devtools/tests/mochitest/test_devtools_extensions.html
View File

@ -56,7 +56,7 @@
tabs.open({
url: TEST_URL,
onLoad: function(tab) {
let id = getInnerId(getMostRecentBrowserWindow().gBrowser.selectedTab.linkedBrowser.contentWindow);
let id = getInnerId(getMostRecentBrowserWindow().gBrowser.selectedBrowser.contentWindow);
// getting
is(contentGlobals.getContentGlobals({

2
toolkit/mozapps/extensions/test/browser/browser_experiments.js
View File

@ -180,7 +180,7 @@ add_task(function* testExperimentLearnMore() {
info("Telemetry privacy policy window opened.");
window.removeEventListener("DOMContentLoaded", onLoad, false);
let browser = gBrowser.selectedTab.linkedBrowser;
let browser = gBrowser.selectedBrowser;
let expected = Services.prefs.getCharPref("toolkit.telemetry.infoURL");
Assert.equal(browser.currentURI.spec, expected, "New tab should have loaded privacy policy.");
browser.contentWindow.close();

2
toolkit/mozapps/extensions/test/browser/browser_tabsettings.js
View File

@ -46,7 +46,7 @@ add_test(function() {
if (gUseInContentUI) {
EventUtils.synthesizeMouseAtCenter(button, { clickCount: 1 }, gManagerWindow);
var browser = gBrowser.selectedTab.linkedBrowser;
var browser = gBrowser.selectedBrowser;
browser.addEventListener("DOMContentLoaded", function() {
browser.removeEventListener("DOMContentLoaded", arguments.callee, false);
is(browser.currentURI.spec, addon.mAddon.optionsURL, "New tab should have loaded the options URL");