Pier Angelo Vendrame pushed to branch base-browser-128.0esr-14.0-2 at The Tor Project / Applications / Tor Browser
Commits:
-
b94825b7
by Beatriz Rizental at 2024-07-30T12:25:35+02:00
3 changed files:
- dom/base/nsGlobalWindowOuter.cpp
- dom/security/nsContentSecurityUtils.cpp
- modules/libpref/Preferences.cpp
Changes:
... | ... | @@ -7296,7 +7296,7 @@ void nsGlobalWindowOuter::InitWasOffline() { mWasOffline = NS_IsOffline(); } |
7296 | 7296 | |
7297 | 7297 | #if defined(_WINDOWS_) && !defined(MOZ_WRAPPED_WINDOWS_H)
|
7298 | 7298 | # pragma message( \
|
7299 | - "wrapper failure reason: " MOZ_WINDOWS_WRAPPER_DISABLED_REASON)
|
|
7299 | + "wrapper failure reason: " MOZ_WINDOWS_WRAPPER_DISABLED_REASON)
|
|
7300 | 7300 | # error "Never include unwrapped windows.h in this file!"
|
7301 | 7301 | #endif
|
7302 | 7302 |
... | ... | @@ -1332,20 +1332,20 @@ void nsContentSecurityUtils::AssertAboutPageHasCSP(Document* aDocument) { |
1332 | 1332 | // This allowlist contains about: pages that are permanently allowed to
|
1333 | 1333 | // render without a CSP applied.
|
1334 | 1334 | static nsLiteralCString sAllowedAboutPagesWithNoCSP[] = {
|
1335 | - // about:blank is a special about page -> no CSP
|
|
1336 | - "about:blank"_ns,
|
|
1337 | - // about:srcdoc is a special about page -> no CSP
|
|
1338 | - "about:srcdoc"_ns,
|
|
1339 | - // about:sync-log displays plain text only -> no CSP
|
|
1340 | - "about:sync-log"_ns,
|
|
1341 | - // about:logo just displays the firefox logo -> no CSP
|
|
1342 | - "about:logo"_ns,
|
|
1343 | - // about:sync is a special mozilla-signed developer addon with low usage
|
|
1344 | - // ->
|
|
1345 | - // no CSP
|
|
1346 | - "about:sync"_ns,
|
|
1335 | + // about:blank is a special about page -> no CSP
|
|
1336 | + "about:blank"_ns,
|
|
1337 | + // about:srcdoc is a special about page -> no CSP
|
|
1338 | + "about:srcdoc"_ns,
|
|
1339 | + // about:sync-log displays plain text only -> no CSP
|
|
1340 | + "about:sync-log"_ns,
|
|
1341 | + // about:logo just displays the firefox logo -> no CSP
|
|
1342 | + "about:logo"_ns,
|
|
1343 | + // about:sync is a special mozilla-signed developer addon with low usage
|
|
1344 | + // ->
|
|
1345 | + // no CSP
|
|
1346 | + "about:sync"_ns,
|
|
1347 | 1347 | # if defined(ANDROID)
|
1348 | - "about:config"_ns,
|
|
1348 | + "about:config"_ns,
|
|
1349 | 1349 | # endif
|
1350 | 1350 | };
|
1351 | 1351 |
... | ... | @@ -6100,8 +6100,7 @@ void UnloadPrefsModule() { Preferences::Shutdown(); } |
6100 | 6100 | |
6101 | 6101 | // Preference Sanitization Related Code ---------------------------------------
|
6102 | 6102 | |
6103 | -#define PREF_LIST_ENTRY(s) \
|
|
6104 | - { s, (sizeof(s) / sizeof(char)) - 1 }
|
|
6103 | +#define PREF_LIST_ENTRY(s) {s, (sizeof(s) / sizeof(char)) - 1}
|
|
6105 | 6104 | struct PrefListEntry {
|
6106 | 6105 | const char* mPrefBranch;
|
6107 | 6106 | size_t mLen;
|