[tor-commits] [Git][tpo/applications/tor-browser][base-browser-128.0esr-14.0-2] Revert "Bug 42725: Fix upstream lint issues"

[Pier Angelo Vendrame (@pierov)]

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
Revert "Bug 42725: Fix upstream lint issues"

This reverts commit 0c49b3f6b7101e95e33f697234648eeaef070a46.

- - - - -


3 changed files:

- dom/base/nsGlobalWindowOuter.cpp
- dom/security/nsContentSecurityUtils.cpp
- modules/libpref/Preferences.cpp


Changes:

=====================================
dom/base/nsGlobalWindowOuter.cpp
=====================================
@@ -7296,7 +7296,7 @@ void nsGlobalWindowOuter::InitWasOffline() { mWasOffline = NS_IsOffline(); }
 
 #if defined(_WINDOWS_) && !defined(MOZ_WRAPPED_WINDOWS_H)
 #  pragma message( \
-          "wrapper failure reason: " MOZ_WINDOWS_WRAPPER_DISABLED_REASON)
+      "wrapper failure reason: " MOZ_WINDOWS_WRAPPER_DISABLED_REASON)
 #  error "Never include unwrapped windows.h in this file!"
 #endif
 


=====================================
dom/security/nsContentSecurityUtils.cpp
=====================================
@@ -1332,20 +1332,20 @@ void nsContentSecurityUtils::AssertAboutPageHasCSP(Document* aDocument) {
   // This allowlist contains about: pages that are permanently allowed to
   // render without a CSP applied.
   static nsLiteralCString sAllowedAboutPagesWithNoCSP[] = {
-    // about:blank is a special about page -> no CSP
-    "about:blank"_ns,
-    // about:srcdoc is a special about page -> no CSP
-    "about:srcdoc"_ns,
-    // about:sync-log displays plain text only -> no CSP
-    "about:sync-log"_ns,
-    // about:logo just displays the firefox logo -> no CSP
-    "about:logo"_ns,
-    // about:sync is a special mozilla-signed developer addon with low usage
-    // ->
-    // no CSP
-    "about:sync"_ns,
+      // about:blank is a special about page -> no CSP
+      "about:blank"_ns,
+      // about:srcdoc is a special about page -> no CSP
+      "about:srcdoc"_ns,
+      // about:sync-log displays plain text only -> no CSP
+      "about:sync-log"_ns,
+      // about:logo just displays the firefox logo -> no CSP
+      "about:logo"_ns,
+      // about:sync is a special mozilla-signed developer addon with low usage
+      // ->
+      // no CSP
+      "about:sync"_ns,
 #  if defined(ANDROID)
-    "about:config"_ns,
+      "about:config"_ns,
 #  endif
   };
 


=====================================
modules/libpref/Preferences.cpp
=====================================
@@ -6100,8 +6100,7 @@ void UnloadPrefsModule() { Preferences::Shutdown(); }
 
 // Preference Sanitization Related Code ---------------------------------------
 
-#define PREF_LIST_ENTRY(s) \
-  { s, (sizeof(s) / sizeof(char)) - 1 }
+#define PREF_LIST_ENTRY(s) {s, (sizeof(s) / sizeof(char)) - 1}
 struct PrefListEntry {
   const char* mPrefBranch;
   size_t mLen;



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

-- 
View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/commit/b94825b7c9e1473078c3cfe7d92844082da6b506
You're receiving this email because of your account on gitlab.torproject.org.


-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.torproject.org/pipermail/tor-commits/attachments/20240730/cb2375c4/attachment-0001.htm>