File tree Expand file tree Collapse file tree 5 files changed +5
-26
lines changed Expand file tree Collapse file tree 5 files changed +5
-26
lines changed Original file line number Diff line number Diff line change @@ -98,11 +98,8 @@ class WebExtensionDescriptorFront extends DescriptorMixin(
98
98
}
99
99
100
100
isServerTargetSwitchingEnabled ( ) {
101
- // @backward -compat { version 133 } Firefox 133 started supporting server targets by default.
102
- // Once this is the only supported version, we can remove the traits and consider this true,
103
- // but keep this method as some other descriptor still return false.
104
- // At least the browser toolbox doesn't support server target switching.
105
- return this . traits . isServerTargetSwitchingEnabled ;
101
+ // Since Firefox 133, this is always true for webextension toolboxes.
102
+ return true ;
106
103
}
107
104
108
105
getWatcher ( ) {
Original file line number Diff line number Diff line change @@ -294,7 +294,7 @@ function TargetMixin(parentClass) {
294
294
this . _url ;
295
295
}
296
296
297
- if ( this . isWebExtension || this . isContentProcess ) {
297
+ if ( this . isContentProcess ) {
298
298
return this . targetForm . name ;
299
299
}
300
300
return this . title ;
@@ -315,18 +315,6 @@ function TargetMixin(parentClass) {
315
315
) ;
316
316
}
317
317
318
- // @backward -compat { version 133 } Once 133 is released, this attribute can be removed.
319
- // This will never be true anymore. Instead the usage in 'name' getter will be irrelevant
320
- // as 'title' served by the backend will be correct for WebExtensions.
321
- get isWebExtension ( ) {
322
- return ! ! (
323
- this . targetForm &&
324
- this . targetForm . actor &&
325
- ( this . targetForm . actor . match ( / c o n n \d + \. w e b E x t e n s i o n ( T a r g e t ) ? \d + / ) ||
326
- this . targetForm . actor . match ( / c h i l d \d + \/ w e b E x t e n s i o n ( T a r g e t ) ? \d + / ) )
327
- ) ;
328
- }
329
-
330
318
get isContentProcess ( ) {
331
319
// browser content toolbox's form will be of the form:
332
320
// server0.conn0.content-process0/contentProcessTarget7
Original file line number Diff line number Diff line change @@ -82,10 +82,8 @@ class WindowGlobalTargetFront extends TargetMixin(
82
82
event . isFrameSwitching = packet . isFrameSwitching ;
83
83
84
84
// Keep the title unmodified when a developer toolbox switches frame
85
- // for a tab (Bug 1261687), but always update the title when the target
86
- // is a WebExtension (where the addon name is always included in the title
87
- // and the url is supposed to be updated every time the selected frame changes).
88
- if ( ! packet . isFrameSwitching || this . isWebExtension ) {
85
+ // for a tab (Bug 1261687).
86
+ if ( ! packet . isFrameSwitching ) {
89
87
this . setTitle ( packet . title ) ;
90
88
this . setUrl ( packet . url ) ;
91
89
}
Original file line number Diff line number Diff line change @@ -115,9 +115,6 @@ class WebExtensionDescriptorActor extends Actor {
115
115
supportsReloadDescriptor : true ,
116
116
// Supports the Watcher actor. Can be removed as part of Bug 1680280.
117
117
watcher : true ,
118
- // @backward -compat { version 133 } Firefox 133 started supporting server targets by default.
119
- // Once this is the only supported version, we can remove the traits and consider it always true in the frontend.
120
- isServerTargetSwitchingEnabled : true ,
121
118
} ,
122
119
url : this . addon . sourceURI ? this . addon . sourceURI . spec : undefined ,
123
120
warnings : lazy . ExtensionParent . DebugUtils . getExtensionManifestWarnings (
Original file line number Diff line number Diff line change @@ -97,7 +97,6 @@ add_task(async function test_listAddons_and_WebExtensionDescriptor() {
97
97
traits : {
98
98
supportsReloadDescriptor : true ,
99
99
watcher : true ,
100
- isServerTargetSwitchingEnabled : true ,
101
100
} ,
102
101
} ,
103
102
"WebExtensionDescriptorActor content matches the add-on"
You can’t perform that action at this time.
0 commit comments