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

Commits: c9f778f9 by Marco Bonardo at 2023-09-28T11:12:19+02:00 Bug 1847180. a=RyanVM

Original Revision: https://phabricator.services.mozilla.com/D188240

Differential Revision: https://phabricator.services.mozilla.com/D188568

- - - - - 1390a230 by Ryan VanderMeulen at 2023-09-28T11:14:27+02:00 Bug 1855550 - VP8: disallow thread count changes. r=jesup, a=dsmith

Cherry-pick of upstream libvpx commits: https://chromium.googlesource.com/webm/libvpx/+/af6dedd715f4307669366944cca6... https://chromium.googlesource.com/webm/libvpx/+/3fbd1dca6a4d2dad332a2110d646...

Differential Revision: https://phabricator.services.mozilla.com/D189428

- - - - -

5 changed files:

- media/libvpx/libvpx/vp8/encoder/onyx_if.c - toolkit/components/reputationservice/ApplicationReputation.cpp - toolkit/components/reputationservice/test/gtest/TestExecutableLists.cpp - xpcom/io/nsLocalFileCommon.cpp - xpcom/io/nsLocalFileCommon.h

Changes:

===================================== media/libvpx/libvpx/vp8/encoder/onyx_if.c ===================================== @@ -1445,6 +1445,12 @@ void vp8_change_config(VP8_COMP *cpi, VP8_CONFIG *oxcf) { last_h = cpi->oxcf.Height; prev_number_of_layers = cpi->oxcf.number_of_layers;

+ if (cpi->initial_width) { + // TODO(https://crbug.com/1486441): Allow changing thread counts; the + // allocation is done once in vp8_create_compressor(). + oxcf->multi_threaded = cpi->oxcf.multi_threaded; + } + cpi->oxcf = *oxcf;

switch (cpi->oxcf.Mode) {

===================================== toolkit/components/reputationservice/ApplicationReputation.cpp ===================================== @@ -181,6 +181,8 @@ const char* const ApplicationReputationService::kBinaryFileExtensions[] = { ".applescript", //".application", exec // MS ClickOnce //".appref-ms", exec // MS ClickOnce + //".appx", exec + //".appxbundle", exec //".arc", //".arj", ".as", // Mac archive @@ -331,6 +333,8 @@ const char* const ApplicationReputationService::kBinaryFileExtensions[] = { //".msh2xml", exec // Windows shell //".mshxml", exec // Windows //".msi", exec // Windows installer + //".msix", exec // Windows installer + //".msixbundle", exec // Windows installer //".msp", exec // Windows installer //".mst", exec // Windows installer ".ndif", // Mac disk image

===================================== toolkit/components/reputationservice/test/gtest/TestExecutableLists.cpp ===================================== @@ -24,6 +24,8 @@ static const char* const kTestFileExtensions[] = { ".applescript", ".application", // MS ClickOnce ".appref-ms", // MS ClickOnce + ".appx", + ".appxbundle", ".as", // Mac archive ".asp", // Windows Server script ".asx", // Windows Media Player @@ -151,6 +153,8 @@ static const char* const kTestFileExtensions[] = { ".msh2xml", // Windows shell ".mshxml", // Windows ".msi", // Windows installer + ".msix", // Windows installer + ".msixbundle", // Windows installer ".msp", // Windows installer ".mst", // Windows installer ".ndif", // Mac disk image

===================================== xpcom/io/nsLocalFileCommon.cpp ===================================== @@ -40,6 +40,8 @@ const char* const sExecutableExts[] = { ".app", // executable application ".application", // from bug 348763 ".appref-ms", // ClickOnce link + ".appx", + ".appxbundle", ".asp", ".atloc", // Appletalk Location ".bas", @@ -91,6 +93,8 @@ const char* const sExecutableExts[] = { ".msh2xml", // Microsoft Shell ".mshxml", // Microsoft Shell ".msi", + ".msix", + ".msixbundle", ".msp", ".mst", ".ops", // Office Profile Settings

===================================== xpcom/io/nsLocalFileCommon.h ===================================== @@ -7,6 +7,6 @@ #ifndef _NS_LOCAL_FILE_COMMON_H_ #define _NS_LOCAL_FILE_COMMON_H_

-extern const char* const sExecutableExts[103]; +extern const char* const sExecutableExts[107];

#endif

View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/compare/d1b5a5e...