Pier Angelo Vendrame pushed to branch base-browser-102.15.1esr-12.5-1 at The Tor Project / Applications / Tor Browser

Commits:

5 changed files:

Changes:

  • media/libvpx/libvpx/vp8/encoder/onyx_if.c
    ... ... @@ -1445,6 +1445,12 @@ void vp8_change_config(VP8_COMP *cpi, VP8_CONFIG *oxcf) {
    1445 1445
       last_h = cpi->oxcf.Height;
    
    1446 1446
       prev_number_of_layers = cpi->oxcf.number_of_layers;
    
    1447 1447
     
    
    1448
    +  if (cpi->initial_width) {
    
    1449
    +    // TODO(https://crbug.com/1486441): Allow changing thread counts; the
    
    1450
    +    // allocation is done once in vp8_create_compressor().
    
    1451
    +    oxcf->multi_threaded = cpi->oxcf.multi_threaded;
    
    1452
    +  }
    
    1453
    +
    
    1448 1454
       cpi->oxcf = *oxcf;
    
    1449 1455
     
    
    1450 1456
       switch (cpi->oxcf.Mode) {
    

  • toolkit/components/reputationservice/ApplicationReputation.cpp
    ... ... @@ -181,6 +181,8 @@ const char* const ApplicationReputationService::kBinaryFileExtensions[] = {
    181 181
         ".applescript",
    
    182 182
         //".application", exec // MS ClickOnce
    
    183 183
         //".appref-ms", exec // MS ClickOnce
    
    184
    +    //".appx", exec
    
    185
    +    //".appxbundle", exec
    
    184 186
         //".arc",
    
    185 187
         //".arj",
    
    186 188
         ".as",  // Mac archive
    
    ... ... @@ -331,6 +333,8 @@ const char* const ApplicationReputationService::kBinaryFileExtensions[] = {
    331 333
         //".msh2xml", exec // Windows shell
    
    332 334
         //".mshxml", exec // Windows
    
    333 335
         //".msi", exec  // Windows installer
    
    336
    +    //".msix", exec // Windows installer
    
    337
    +    //".msixbundle", exec // Windows installer
    
    334 338
         //".msp", exec  // Windows installer
    
    335 339
         //".mst", exec  // Windows installer
    
    336 340
         ".ndif",            // Mac disk image
    

  • toolkit/components/reputationservice/test/gtest/TestExecutableLists.cpp
    ... ... @@ -24,6 +24,8 @@ static const char* const kTestFileExtensions[] = {
    24 24
         ".applescript",
    
    25 25
         ".application",  // MS ClickOnce
    
    26 26
         ".appref-ms",    // MS ClickOnce
    
    27
    +    ".appx",
    
    28
    +    ".appxbundle",
    
    27 29
         ".as",           // Mac archive
    
    28 30
         ".asp",          // Windows Server script
    
    29 31
         ".asx",          // Windows Media Player
    
    ... ... @@ -151,6 +153,8 @@ static const char* const kTestFileExtensions[] = {
    151 153
         ".msh2xml",            // Windows shell
    
    152 154
         ".mshxml",             // Windows
    
    153 155
         ".msi",                // Windows installer
    
    156
    +    ".msix",               // Windows installer
    
    157
    +    ".msixbundle",         // Windows installer
    
    154 158
         ".msp",                // Windows installer
    
    155 159
         ".mst",                // Windows installer
    
    156 160
         ".ndif",               // Mac disk image
    

  • xpcom/io/nsLocalFileCommon.cpp
    ... ... @@ -40,6 +40,8 @@ const char* const sExecutableExts[] = {
    40 40
       ".app",         // executable application
    
    41 41
       ".application", // from bug 348763
    
    42 42
       ".appref-ms",   // ClickOnce link
    
    43
    +  ".appx",
    
    44
    +  ".appxbundle",
    
    43 45
       ".asp",
    
    44 46
       ".atloc",       // Appletalk Location
    
    45 47
       ".bas",
    
    ... ... @@ -91,6 +93,8 @@ const char* const sExecutableExts[] = {
    91 93
       ".msh2xml",     // Microsoft Shell
    
    92 94
       ".mshxml",      // Microsoft Shell
    
    93 95
       ".msi",
    
    96
    +  ".msix",
    
    97
    +  ".msixbundle",
    
    94 98
       ".msp",
    
    95 99
       ".mst",
    
    96 100
       ".ops",         // Office Profile Settings
    

  • xpcom/io/nsLocalFileCommon.h
    ... ... @@ -7,6 +7,6 @@
    7 7
     #ifndef _NS_LOCAL_FILE_COMMON_H_
    
    8 8
     #define _NS_LOCAL_FILE_COMMON_H_
    
    9 9
     
    
    10
    -extern const char* const sExecutableExts[103];
    
    10
    +extern const char* const sExecutableExts[107];
    
    11 11
     
    
    12 12
     #endif