Skip to content

Commit fe578ca

Browse files
author
smolnar
committed
Backed out 2 changesets (bug 1774641) for causing browser-chrome failures in browser/components/extensions/test/browser/browser_ext_browserAction_activeScript.js CLOSED TREE
Backed out changeset e381563e7786 (bug 1774641) Backed out changeset b57a7dca9b97 (bug 1774641)
1 parent 9b7f3cc commit fe578ca

File tree

11 files changed

+16
-407
lines changed

11 files changed

+16
-407
lines changed

browser/components/extensions/test/browser/browser.ini

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -35,8 +35,6 @@ support-files =
3535
file_language_tlh.html
3636
file_dummy.html
3737
file_title.html
38-
file_with_xorigin_frame.html
39-
file_with_example_com_frame.html
4038
webNav_createdTarget.html
4139
webNav_createdTargetSource.html
4240
webNav_createdTargetSource_subframe.html
@@ -58,7 +56,6 @@ skip-if =
5856
[browser_ext_autocompletepopup.js]
5957
disabled = bug 1438663 # same focus issue as Bug 1438663
6058
[browser_ext_autoplayInBackground.js]
61-
[browser_ext_browserAction_activeScript.js]
6259
[browser_ext_browserAction_activeTab.js]
6360
[browser_ext_browserAction_area.js]
6461
[browser_ext_browserAction_experiment.js]

browser/components/extensions/test/browser/browser_ext_browserAction_activeScript.js

Lines changed: 0 additions & 300 deletions
This file was deleted.

browser/components/extensions/test/browser/file_with_example_com_frame.html

Lines changed: 0 additions & 5 deletions
This file was deleted.

browser/components/extensions/test/browser/file_with_xorigin_frame.html

Lines changed: 0 additions & 5 deletions
This file was deleted.

dom/chrome-webidl/WebExtensionContentScript.webidl

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -21,12 +21,10 @@ interface MozDocumentMatcher {
2121
boolean matchesURI(URI uri);
2222

2323
/**
24-
* Returns true if the given window matches. This should be used to
25-
* determine whether to run a script in a window at load time. Use
26-
* ignorePermissions to match without origin permissions in MV3.
24+
* Returns true if the given window matches. This should be used
25+
* to determine whether to run a script in a window at load time.
2726
*/
28-
boolean matchesWindowGlobal(WindowGlobalChild windowGlobal,
29-
optional boolean ignorePermissions = false);
27+
boolean matchesWindowGlobal(WindowGlobalChild windowGlobal);
3028

3129
/**
3230
* If true, match all frames. If false, match only top-level frames.

dom/chrome-webidl/WindowGlobalActors.webidl

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -14,16 +14,12 @@ interface nsIDOMProcessParent;
1414
interface WindowContext {
1515
readonly attribute BrowsingContext? browsingContext;
1616

17-
readonly attribute WindowGlobalChild? windowGlobalChild; // in-process only
18-
1917
readonly attribute unsigned long long innerWindowId;
2018

2119
readonly attribute WindowContext? parentWindowContext;
2220

2321
readonly attribute WindowContext topWindowContext;
2422

25-
readonly attribute boolean isInProcess;
26-
2723
// True if this WindowContext is currently frozen in the BFCache.
2824
readonly attribute boolean isInBFCache;
2925

@@ -58,6 +54,7 @@ enum PermitUnloadAction {
5854
[Exposed=Window, ChromeOnly]
5955
interface WindowGlobalParent : WindowContext {
6056
readonly attribute boolean isClosed;
57+
readonly attribute boolean isInProcess;
6158

6259
readonly attribute boolean isCurrentGlobal;
6360

toolkit/components/extensions/ExtensionActions.jsm

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -222,7 +222,6 @@ class PanelActionBase {
222222
// existing preloaded activeTab permission.
223223
this.setActiveTabForPreload(null);
224224
this.extension.tabManager.addActiveTabPermission(tab);
225-
this.extension.tabManager.activateScripts(tab);
226225

227226
let popupUrl = this.getProperty(tab, "popup");
228227
// The "click" event is only dispatched when the popup is not shown. This

0 commit comments

Comments
 (0)