corysanin/tubestation
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

merge mozilla-inbound to mozilla-central a=merge

Browse Source
This commit is contained in:
Carsten "Tomcat" Book
2016-04-25 11:55:12 +02:00
parent efb295823a 2d102ed23e
commit 7e879bbd62
413 changed files with 8496 additions and 3685 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
browser/components/extensions/ext-tabs.js
View File

@@ -34,7 +34,7 @@ function getSender(context, target, sender) {
sender.tab = TabManager.convert(context.extension, tab);
} else if ("tabId" in sender) {
// The message came from an ExtensionPage. In that case, it should
// The message came from an ExtensionContext. In that case, it should
// include a tabId property (which is filled in by the page-open
// listener below).
sender.tab = TabManager.convert(context.extension, TabManager.getTab(sender.tabId));
@@ -42,14 +42,14 @@ function getSender(context, target, sender) {
}
}
// WeakMap[ExtensionPage -> {tab, parentWindow}]
// WeakMap[ExtensionContext -> {tab, parentWindow}]
var pageDataMap = new WeakMap();
/* eslint-disable mozilla/balanced-listeners */
// This listener fires whenever an extension page opens in a tab
// (either initiated by the extension or the user). Its job is to fill
// in some tab-specific details and keep data around about the
// ExtensionPage.
// ExtensionContext.
extensions.on("page-load", (type, page, params, sender, delegate) => {
if (params.type == "tab" || params.type == "popup") {
let browser = params.docShell.chromeEventHandler;