morgan pushed to branch tor-browser-128.3.0esr-14.0-1 at The Tor Project / Applications / Tor Browser

Commits:

5 changed files:

Changes:

  • browser/components/about/AboutRedirector.cpp
    ... ... @@ -91,9 +91,11 @@ static const RedirEntry kRedirMap[] = {
    91 91 
         {"rights", "chrome://global/content/aboutRights.xhtml",
    92 92 
          nsIAboutModule::URI_SAFE_FOR_UNTRUSTED_CONTENT |
    93 93 
              nsIAboutModule::ALLOW_SCRIPT | nsIAboutModule::IS_SECURE_CHROME_UI},
    94 
    +#ifndef BASE_BROWSER_VERSION
    94 95 
         {"robots", "chrome://browser/content/aboutRobots.xhtml",
    95 96 
          nsIAboutModule::URI_SAFE_FOR_UNTRUSTED_CONTENT |
    96 97 
              nsIAboutModule::ALLOW_SCRIPT},
    98 
    +#endif
    97 99 
         {"rulesets", "chrome://browser/content/rulesets/aboutRulesets.html",
    98 100 
          nsIAboutModule::ALLOW_SCRIPT | nsIAboutModule::URI_MUST_LOAD_IN_CHILD |
    99 101 
              nsIAboutModule::URI_CAN_LOAD_IN_PRIVILEGEDABOUT_PROCESS |

  • browser/components/about/components.conf
    ... ... @@ -24,7 +24,7 @@ pages = [
    24 24 
         'reader',
    25 25 
         'restartrequired',
    26 26 
         'rights',
    27 
    -    'robots',
    27 
    +    # Removed 'robots'. tor-browser#42831.
    28 28 
         'rulesets',
    29 29 
         'sessionrestore',
    30 30 
         'settings',

  • docshell/base/nsAboutRedirector.cpp
    ... ... @@ -135,8 +135,10 @@ static const RedirEntry kRedirMap[] = {
    135 135 
              nsIAboutModule::URI_MUST_LOAD_IN_CHILD |
    136 136 
              nsIAboutModule::URI_CAN_LOAD_IN_PRIVILEGEDABOUT_PROCESS |
    137 137 
              nsIAboutModule::IS_SECURE_CHROME_UI},
    138 
    +#ifndef BASE_BROWSER_VERSION
    138 139 
         {"mozilla", "chrome://global/content/mozilla.html",
    139 140 
          nsIAboutModule::URI_SAFE_FOR_UNTRUSTED_CONTENT},
    141 
    +#endif
    140 142 
     #if !defined(ANDROID) && !defined(XP_WIN)
    141 143 
         {"webauthn", "chrome://global/content/aboutWebauthn.html",
    142 144 
          nsIAboutModule::ALLOW_SCRIPT | nsIAboutModule::IS_SECURE_CHROME_UI},
    ... ... @@ -181,15 +183,17 @@ static const RedirEntry kRedirMap[] = {
    181 183 
         {"windows-messages", "chrome://global/content/aboutWindowsMessages.html",
    182 184 
          nsIAboutModule::ALLOW_SCRIPT},
    183 185 
     #endif
    184 
    -#ifndef MOZ_GLEAN_ANDROID
    186 
    +#ifdef MOZ_TELEMETRY_REPORTING
    187 
    +#  ifndef MOZ_GLEAN_ANDROID
    185 188 
         {"glean", "chrome://global/content/aboutGlean.html",
    186 
    -#  if !defined(NIGHTLY_BUILD) && defined(MOZILLA_OFFICIAL)
    189 
    +#    if !defined(NIGHTLY_BUILD) && defined(MOZILLA_OFFICIAL)
    187 190 
          nsIAboutModule::HIDE_FROM_ABOUTABOUT |
    188 
    -#  endif
    191 
    +#    endif
    189 192 
              nsIAboutModule::ALLOW_SCRIPT},
    190 
    -#endif
    193 
    +#  endif
    191 194 
         {"telemetry", "chrome://global/content/aboutTelemetry.xhtml",
    192 195 
          nsIAboutModule::ALLOW_SCRIPT | nsIAboutModule::IS_SECURE_CHROME_UI},
    196 
    +#endif
    193 197 
         {"torconnect", "chrome://global/content/torconnect/aboutTorConnect.html",
    194 198 
          nsIAboutModule::URI_SAFE_FOR_UNTRUSTED_CONTENT |
    195 199 
              nsIAboutModule::URI_CAN_LOAD_IN_CHILD | nsIAboutModule::ALLOW_SCRIPT |
    ... ... @@ -205,8 +209,10 @@ static const RedirEntry kRedirMap[] = {
    205 209 
         {"url-classifier", "chrome://global/content/aboutUrlClassifier.xhtml",
    206 210 
          nsIAboutModule::ALLOW_SCRIPT},
    207 211 
     #endif
    212 
    +#ifdef MOZ_WEBRTC
    208 213 
         {"webrtc", "chrome://global/content/aboutwebrtc/aboutWebrtc.html",
    209 214 
          nsIAboutModule::ALLOW_SCRIPT},
    215 
    +#endif
    210 216 
         {"crashparent", "about:blank", nsIAboutModule::HIDE_FROM_ABOUTABOUT},
    211 217 
         {"crashcontent", "about:blank",
    212 218 
          nsIAboutModule::HIDE_FROM_ABOUTABOUT |

  • docshell/build/components.conf
    ... ... @@ -22,7 +22,7 @@ about_pages = [
    22 22 
         'logging',
    23 23 
         'logo',
    24 24 
         'memory',
    25 
    -    'mozilla',
    25 
    +    # Removed 'mozilla'. tor-browser#42831.
    26 26 
         'neterror',
    27 27 
         'networking',
    28 28 
         'performance',
    ... ... @@ -30,22 +30,24 @@ about_pages = [
    30 30 
         'serviceworkers',
    31 31 
         'srcdoc',
    32 32 
         'support',
    33 
    -    'telemetry',
    34 33 
         'torconnect',
    35 34 
         'translations',
    36 35 
         'tor',
    37 
    -    'url-classifier',
    38 
    -    'webrtc',
    36 
    +    # Removed 'url-classifier'. tor-browser#42831.
    39 37 
     ]
    40 38
    41 39 
     if defined('MOZ_CRASHREPORTER'):
    42 40 
         about_pages.append('crashes')
    41 
    +if defined('MOZ_TELEMETRY_REPORTING'):
    42 
    +    about_pages.append('telemetry')
    43 
    +if defined('MOZ_WEBRTC'):
    44 
    +    about_pages.append('webrtc')
    43 45 
     if buildconfig.substs['MOZ_WIDGET_TOOLKIT'] != 'android':
    44 46 
         about_pages.append('profiles')
    45 47 
     if buildconfig.substs['MOZ_WIDGET_TOOLKIT'] == 'windows':
    46 48 
         about_pages.append('third-party')
    47 49 
         about_pages.append('windows-messages')
    48 
    -if not defined('MOZ_GLEAN_ANDROID'):
    50 
    +if defined('MOZ_TELEMETRY_REPORTING') and not defined('MOZ_GLEAN_ANDROID'):
    49 51 
         about_pages.append('glean')
    50 52 
     if buildconfig.substs['MOZ_WIDGET_TOOLKIT'] != 'android' and buildconfig.substs['MOZ_WIDGET_TOOLKIT'] != 'windows':
    51 53 
         about_pages.append('webauthn')

  • toolkit/content/jar.mn
    ... ... @@ -23,6 +23,7 @@ toolkit.jar:
    23 23 
     #endif
    24 24 
        content/global/aboutServiceWorkers.js
    25 25 
        content/global/aboutServiceWorkers.xhtml
    26 
    +#ifdef MOZ_WEBRTC
    26 27 
        content/global/aboutwebrtc/aboutWebrtc.css   (aboutwebrtc/aboutWebrtc.css)
    27 28 
        content/global/aboutwebrtc/aboutWebrtc.mjs    (aboutwebrtc/aboutWebrtc.mjs)
    28 29 
        content/global/aboutwebrtc/graph.mjs    (aboutwebrtc/graph.mjs)
    ... ... @@ -31,16 +32,19 @@ toolkit.jar:
    31 32 
        content/global/aboutwebrtc/disclosure.mjs (aboutwebrtc/disclosure.mjs)
    32 33 
        content/global/aboutwebrtc/copyButton.mjs (aboutwebrtc/copyButton.mjs)
    33 34 
        content/global/aboutwebrtc/aboutWebrtc.html (aboutwebrtc/aboutWebrtc.html)
    35 
    +#endif
    34 36 
        content/global/aboutSupport.js
    35 37 
     *  content/global/aboutSupport.xhtml
    36 
    -#ifndef MOZ_GLEAN_ANDROID
    38 
    +#ifdef MOZ_TELEMETRY_REPORTING
    39 
    +#  ifndef MOZ_GLEAN_ANDROID
    37 40 
        content/global/aboutGlean.js
    38 41 
        content/global/aboutGlean.html
    39 42 
        content/global/aboutGlean.css
    40 
    -#endif
    43 
    +#  endif
    41 44 
        content/global/aboutTelemetry.js
    42 45 
        content/global/aboutTelemetry.xhtml
    43 46 
        content/global/aboutTelemetry.css
    47 
    +#endif
    44 48 
        content/global/aboutUrlClassifier.js
    45 49 
        content/global/aboutUrlClassifier.xhtml
    46 50 
        content/global/aboutUrlClassifier.css

    • —
    View it on GitLab.
    You're receiving this email because of your account on gitlab.torproject.org. Manage all notifications · Help