b) media-blocked tabs (tab1, tab2) will get playing. b) unmuted tabs (tab3) will remain unmuted. a/browser/base/content/test/tabs/browser_multiselect_tabs_mute_unmute.js +++ b/browser/base/content/test/tabs/browser_multiselect_tabs_mute_unmute.js -70,45 +70,40 add_task(async function muteTabs_usingBu // tab0, tab1, tab2, tab3 are multiselected for (let i = 0 i <= 3 i++) ok(!tab4.multiselected, "tab4 is not multiselected") // Check mute state ok(muted(tab0), "Tab0 is muted") ok(activeMediaBlocked(tab1), "Tab1 is media-blocked") ok(activeMediaBlocked(tab2), "Tab2 is media-blocked") - ok( - !muted(tab3) & !activeMediaBlocked(tab3), - "Tab3 is not muted and not activemedia-blocked" - ) + ok(!muted(tab3), "Tab3 is not muted") + ok(!activeMediaBlocked(tab3), "Tab3 is not activemedia-blocked") ok(muted(tab4), "Tab4 is muted") is(lectedTab, tab0, "Tab0 is active") // play tab2 which is multiselected, thus other multiselected tabs should be affected too // in the following way: // a) muted tabs (tab0) will become unmuted. +#ifndef REPLACE_NAME + +directory = "third_party/rust" +#endif + +# Thankfully, is unlikely to be a legitimate source, so +# cargo will ignore it when it's here verbatim. +#define REPLACE_NAME vendored-sources +#define VENDORED_DIRECTORY third_party/rust +# We explicitly exclude the following section when preprocessing because +# it would overlap with the preprocessed and +# cargo would fail.
independent tasks building rust code), or be preprocessed by +# the build system to produce a.
This file can thus by copied +# as-is to $topsrcdir/.cargo/config with no preprocessing to be used there +# (for e.g. + +branch = "aarch64" +git = "" +replace-with = "vendored-sources" + + +branch = "master" +git = "" +replace-with = "vendored-sources" + + +branch = "stable" +git = "" +replace-with = "vendored-sources" -#include config -#filter substitution + +git = "" +replace-with = "vendored-sources" +rev = "9c6f8feb0f28f50434c0cf67f3f7c07486a42b7e" + + +replace-with = "vendored-sources" +# Take advantage of the fact that cargo will treat lines starting with # +# as comments to add preprocessing directives. + + +branch = "rust_1_32" +git = "" +replace-with = "vendored-sources" -# Note: this file is only really needed when objdir is not a subdirectory of -# the top source directory. +# It was generated by `mach vendor rust`. +# This file contains vendoring instructions for cargo. a/.cargo/config.in +++ b/.cargo/config.in -1,10 +1,52 -# Please do not edit this file. #define REPLACE_NAME vendored-sources -#define VENDORED_DIRECTORY third_party/rust -#ifndef top_srcdir -directory = "third_party/rust" -#endif branch = "rust_1_32" -git = "" -replace-with = "vendored-sources" -branch = "aarch64" -git = "" -replace-with = "vendored-sources" -branch = "master" -git = "" -replace-with = "vendored-sources" -branch = "stable" -git = "" -replace-with = "vendored-sources" -git = "" -replace-with = "vendored-sources" -rev = "9c6f8feb0f28f50434c0cf67f3f7c07486a42b7e" -replace-with = "vendored-sources" -# Take advantage of the fact that cargo will treat lines starting with # -# as comments to add preprocessing directives for when this file is included -# from. # It was generated by `mach vendor rust`.
Deleted file mode 100644 - a/.cargo/config +++ /dev/null -1,41 +0,0 -# This file contains vendoring instructions for cargo.
0 kommentar(er)
