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

Commits:

2 changed files:

Changes:

  • dom/base/Document.cpp
    ... ... @@ -17308,12 +17308,6 @@ bool Document::RecomputeResistFingerprinting(bool aForceRefreshRTPCallerType) {
    17308 17308
     }
    
    17309 17309
     
    
    17310 17310
     bool Document::ShouldResistFingerprinting(RFPTarget aTarget) const {
    
    17311
    -#ifdef ANDROID
    
    17312
    -  if (aTarget == RFPTarget::FontVisibilityBaseSystem ||
    
    17313
    -      aTarget == RFPTarget::FontVisibilityLangPack) {
    
    17314
    -    return false;
    
    17315
    -  }
    
    17316
    -#endif
    
    17317 17311
       return mShouldResistFingerprinting &&
    
    17318 17312
              nsRFPService::IsRFPEnabledFor(this->IsInPrivateBrowsing(), aTarget,
    
    17319 17313
                                            mOverriddenFingerprintingSettings);
    

  • toolkit/components/resistfingerprinting/nsRFPService.cpp
    ... ... @@ -310,6 +310,13 @@ Maybe<bool> nsRFPService::HandleExeptionalRFPTargets(
    310 310
       }
    
    311 311
     #endif
    
    312 312
     
    
    313
    +#ifdef ANDROID
    
    314
    +  if (aTarget == RFPTarget::FontVisibilityBaseSystem ||
    
    315
    +      aTarget == RFPTarget::FontVisibilityLangPack) {
    
    316
    +    return Some(false);
    
    317
    +  }
    
    318
    +#endif
    
    319
    +
    
    313 320
       return Nothing();
    
    314 321
     }
    
    315 322