Pier Angelo Vendrame pushed to branch tor-browser-150.0a1-16.0-2 at The Tor Project / Applications / Tor Browser

Commits:

1 changed file:

Changes:

  • dom/canvas/CanvasUtils.cpp
    ... ... @@ -381,9 +381,14 @@ ImageExtraction ImageExtractionResult(dom::HTMLCanvasElement* aCanvasElement,
    381 381
         return ImageExtraction::Placeholder;
    
    382 382
       }
    
    383 383
     
    
    384
    -  if ((ownerDoc->ShouldResistFingerprinting(
    
    385
    -           RFPTarget::EfficientCanvasRandomization) ||
    
    386
    -       ownerDoc->ShouldResistFingerprinting(RFPTarget::CanvasRandomization) ||
    
    384
    +  if (ownerDoc->ShouldResistFingerprinting(
    
    385
    +          RFPTarget::EfficientCanvasRandomization) &&
    
    386
    +      GetCanvasExtractDataPermission(aPrincipal) !=
    
    387
    +          nsIPermissionManager::ALLOW_ACTION) {
    
    388
    +    return ImageExtraction::EfficientRandomize;
    
    389
    +  }
    
    390
    +
    
    391
    +  if ((ownerDoc->ShouldResistFingerprinting(RFPTarget::CanvasRandomization) ||
    
    387 392
            ownerDoc->ShouldResistFingerprinting(RFPTarget::WebGLRandomization)) &&
    
    388 393
           GetCanvasExtractDataPermission(aPrincipal) !=
    
    389 394
               nsIPermissionManager::ALLOW_ACTION) {