diff --git a/chromium_src/third_party/blink/renderer/core/dom/document.cc b/chromium_src/third_party/blink/renderer/core/dom/document.cc index 63a98d1d7fc1..0f001f7072cd 100644 --- a/chromium_src/third_party/blink/renderer/core/dom/document.cc +++ b/chromium_src/third_party/blink/renderer/core/dom/document.cc @@ -29,8 +29,9 @@ namespace { // are disconnect, remote or local to the top level frame. std::string TopETLDPlusOneForDoc(const Document& doc) { const auto host = doc.TopFrameOrigin()->Host(); - return blink::network_utils::GetDomainAndRegistry(host, - blink::network_utils::kIncludePrivateRegistries).Utf8(); + return blink::network_utils::GetDomainAndRegistry( + host, blink::network_utils::kIncludePrivateRegistries) + .Utf8(); } const uint64_t zero = 0; @@ -117,7 +118,7 @@ AudioFarblingCallback BraveSessionCache::GetAudioFarblingCallback( } case BraveFarblingLevel::MAXIMUM: { uint64_t seed = *reinterpret_cast(domain_key_); - return base::BindRepeating(&PseudoRandomSequence, seed); + return base::BindRepeating(&PseudoRandomSequence, seed); } } } @@ -133,12 +134,9 @@ scoped_refptr BraveSessionCache::PerturbPixels( switch (frame->GetContentSettingsClient()->GetBraveFarblingLevel()) { case BraveFarblingLevel::OFF: break; - case BraveFarblingLevel::BALANCED: { - image_bitmap = PerturbBalanced(image_bitmap); - break; - } + case BraveFarblingLevel::BALANCED: case BraveFarblingLevel::MAXIMUM: { - image_bitmap = PerturbMax(image_bitmap); + image_bitmap = PerturbPixelsInternal(image_bitmap); break; } default: @@ -147,7 +145,8 @@ scoped_refptr BraveSessionCache::PerturbPixels( return image_bitmap; } -scoped_refptr BraveSessionCache::PerturbBalanced( +scoped_refptr +BraveSessionCache::PerturbPixelsInternal( scoped_refptr image_bitmap) { DCHECK(image_bitmap); if (image_bitmap->IsNull()) @@ -197,31 +196,6 @@ scoped_refptr BraveSessionCache::PerturbBalanced( return perturbed_bitmap; } -scoped_refptr BraveSessionCache::PerturbMax( - scoped_refptr image_bitmap) { - DCHECK(image_bitmap); - if (image_bitmap->IsNull()) - return image_bitmap; - // convert to an ImageDataBuffer to normalize the pixel data to RGBA, 4 bytes - // per pixel - std::unique_ptr data_buffer = - blink::ImageDataBuffer::Create(image_bitmap); - uint8_t* pixels = const_cast(data_buffer->Pixels()); - const uint64_t count = 4 * data_buffer->Width() * data_buffer->Height(); - // initial seed based on domain key - uint64_t v = *reinterpret_cast(domain_key_); - // iterate through pixel data and overwrite with next value in PRNG sequence - for (uint64_t i = 0; i < count; i++) { - pixels[i] = v % 256; - v = lfsr_next(v); - } - // convert back to a StaticBitmapImage to return to the caller - scoped_refptr perturbed_bitmap = - blink::UnacceleratedStaticBitmapImage::Create( - data_buffer->RetainedImage()); - return perturbed_bitmap; -} - WTF::String BraveSessionCache::GenerateRandomString(std::string seed, wtf_size_t length) { uint8_t key[32]; diff --git a/chromium_src/third_party/blink/renderer/core/dom/document.h b/chromium_src/third_party/blink/renderer/core/dom/document.h index 1701ff87697a..a6b824511a54 100644 --- a/chromium_src/third_party/blink/renderer/core/dom/document.h +++ b/chromium_src/third_party/blink/renderer/core/dom/document.h @@ -42,8 +42,7 @@ class CORE_EXPORT BraveSessionCache final static BraveSessionCache& From(Document&); - AudioFarblingCallback GetAudioFarblingCallback( - blink::LocalFrame* frame); + AudioFarblingCallback GetAudioFarblingCallback(blink::LocalFrame* frame); scoped_refptr PerturbPixels( blink::LocalFrame* frame, scoped_refptr image_bitmap); @@ -55,9 +54,7 @@ class CORE_EXPORT BraveSessionCache final uint64_t session_key_; uint8_t domain_key_[32]; - scoped_refptr PerturbBalanced( - scoped_refptr image_bitmap); - scoped_refptr PerturbMax( + scoped_refptr PerturbPixelsInternal( scoped_refptr image_bitmap); }; } // namespace brave diff --git a/components/content_settings/renderer/brave_content_settings_agent_impl_browsertest.cc b/components/content_settings/renderer/brave_content_settings_agent_impl_browsertest.cc index 82e3b9afe8cc..42d0ac8ed6bc 100644 --- a/components/content_settings/renderer/brave_content_settings_agent_impl_browsertest.cc +++ b/components/content_settings/renderer/brave_content_settings_agent_impl_browsertest.cc @@ -52,7 +52,8 @@ const char kGetImageDataScript[] = const int kExpectedImageDataHashFarblingBalanced = 85; const int kExpectedImageDataHashFarblingOff = 0; -const int kExpectedImageDataHashFarblingMaximum = 127574; +const int kExpectedImageDataHashFarblingMaximum = + kExpectedImageDataHashFarblingBalanced; const char kEmptyCookie[] = "";