1 files changed, 69 insertions, 69 deletions

diff --git a/www/chromium-uc/patches/extra/bromite/fingerprinting-flags-client-rects-and-measuretext.patch b/www/chromium-uc/patches/extra/bromite/fingerprinting-flags-client-rects-and-measuretext.patch
index a3dd0cd..2d6821f 100644
--- a/www/chromium-uc/patches/extra/bromite/fingerprinting-flags-client-rects-and-measuretext.patch
+++ b/www/chromium-uc/patches/extra/bromite/fingerprinting-flags-client-rects-and-measuretext.patch
@@ -7,9 +7,9 @@
 #
 # Unlike the latest Bromite patch, it was chosen to not regenerate the noise value each time the value is read to prevent potential efficiency issues with the load on the RNG.
 
---- a/chrome/browser/BUILD.gn
-+++ b/chrome/browser/BUILD.gn
-@@ -2390,6 +2390,7 @@ static_library("browser") {
+--- chrome/browser/BUILD.gn.orig
++++ chrome/browser/BUILD.gn
+@@ -2370,6 +2370,7 @@ static_library("browser") {
      "//third_party/libyuv",
      "//third_party/metrics_proto",
      "//third_party/re2",
@@ -17,9 +17,9 @@
      "//third_party/webrtc_overrides:webrtc_component",
      "//third_party/widevine/cdm:buildflags",
      "//third_party/widevine/cdm:headers",
---- a/chrome/browser/about_flags.cc
-+++ b/chrome/browser/about_flags.cc
-@@ -146,6 +146,7 @@
+--- chrome/browser/about_flags.cc.orig
++++ chrome/browser/about_flags.cc
+@@ -151,6 +151,7 @@
  #include "components/translate/core/browser/translate_ranker_impl.h"
  #include "components/translate/core/common/translate_util.h"
  #include "components/ui_devtools/switches.h"
@@ -27,8 +27,8 @@
  #include "components/version_info/version_info.h"
  #include "components/viz/common/features.h"
  #include "components/viz/common/switches.h"
---- a/chrome/browser/bromite_flag_entries.h
-+++ b/chrome/browser/bromite_flag_entries.h
+--- chrome/browser/bromite_flag_entries.h.orig
++++ chrome/browser/bromite_flag_entries.h
 @@ -4,4 +4,12 @@
  
  #ifndef CHROME_BROWSER_BROMITE_FLAG_ENTRIES_H_
@@ -42,9 +42,9 @@
 +     "Scale the output values of Canvas::measureText() with a randomly selected factor in the range -0.0003% to 0.0003%, which are recomputed on every document initialization.  ungoogled-chromium flag, Bromite feature.",
 +     kOsAll, SINGLE_VALUE_TYPE(switches::kFingerprintingCanvasMeasureTextNoise)},
  #endif  // CHROME_BROWSER_BROMITE_FLAG_ENTRIES_H_
---- a/content/browser/BUILD.gn
-+++ b/content/browser/BUILD.gn
-@@ -230,6 +230,7 @@ source_set("browser") {
+--- content/browser/BUILD.gn.orig
++++ content/browser/BUILD.gn
+@@ -222,6 +222,7 @@ source_set("browser") {
      "//third_party/libyuv",
      "//third_party/re2",
      "//third_party/sqlite",
@@ -52,9 +52,9 @@
      "//third_party/webrtc_overrides:webrtc_component",
      "//third_party/wtl",
      "//third_party/zlib",
---- a/content/browser/renderer_host/render_process_host_impl.cc
-+++ b/content/browser/renderer_host/render_process_host_impl.cc
-@@ -76,6 +76,7 @@
+--- content/browser/renderer_host/render_process_host_impl.cc.orig
++++ content/browser/renderer_host/render_process_host_impl.cc
+@@ -68,6 +68,7 @@
  #include "components/services/storage/public/mojom/cache_storage_control.mojom.h"
  #include "components/services/storage/public/mojom/indexed_db_control.mojom.h"
  #include "components/tracing/common/tracing_switches.h"
@@ -62,7 +62,7 @@
  #include "components/viz/common/switches.h"
  #include "components/viz/host/gpu_client.h"
  #include "content/browser/bad_message.h"
-@@ -3287,6 +3288,8 @@ void RenderProcessHostImpl::PropagateBro
+@@ -3465,6 +3466,8 @@ void RenderProcessHostImpl::PropagateBro
      switches::kEnableWebGLDraftExtensions,
      switches::kEnableWebGLImageChromium,
      switches::kFileUrlPathAlias,
@@ -71,8 +71,8 @@
      switches::kForceDeviceScaleFactor,
      switches::kForceDisplayColorProfile,
      switches::kForceGpuMemAvailableMb,
---- a/content/child/BUILD.gn
-+++ b/content/child/BUILD.gn
+--- content/child/BUILD.gn.orig
++++ content/child/BUILD.gn
 @@ -103,6 +103,7 @@ target(link_target_type, "child") {
      "//third_party/blink/public/common",
      "//third_party/blink/public/strings",
@@ -81,9 +81,9 @@
      "//third_party/zlib/google:compression_utils",
      "//ui/base",
      "//ui/events/blink",
---- a/content/child/runtime_features.cc
-+++ b/content/child/runtime_features.cc
-@@ -33,6 +33,7 @@
+--- content/child/runtime_features.cc.orig
++++ content/child/runtime_features.cc
+@@ -31,6 +31,7 @@
  #include "third_party/blink/public/common/loader/referrer_utils.h"
  #include "third_party/blink/public/common/switches.h"
  #include "third_party/blink/public/platform/web_runtime_features.h"
@@ -91,10 +91,10 @@
  #include "ui/accessibility/accessibility_features.h"
  #include "ui/base/ui_base_features.h"
  #include "ui/events/blink/blink_features.h"
-@@ -481,6 +482,10 @@ void SetRuntimeFeaturesFromCommandLine(c
+@@ -466,6 +467,10 @@ void SetRuntimeFeaturesFromCommandLine(c
+       {wrf::EnableWebGPU, switches::kEnableUnsafeWebGPU, true},
        {wrf::ForceOverlayFullscreenVideo, switches::kForceOverlayFullscreenVideo,
         true},
-       {wrf::EnableDirectSockets, switches::kRestrictedApiOrigins, false},
 +      {wrf::EnableFingerprintingClientRectsNoise,
 +       switches::kFingerprintingClientRectsNoise, true},
 +      {wrf::EnableFingerprintingCanvasMeasureTextNoise,
@@ -102,9 +102,9 @@
    };
    for (const auto& mapping : switchToFeatureMapping) {
      if (command_line.HasSwitch(mapping.switch_name))
---- a/third_party/blink/public/platform/web_runtime_features.h
-+++ b/third_party/blink/public/platform/web_runtime_features.h
-@@ -216,6 +216,8 @@ class WebRuntimeFeatures {
+--- third_party/blink/public/platform/web_runtime_features.h.orig
++++ third_party/blink/public/platform/web_runtime_features.h
+@@ -218,6 +218,8 @@ class WebRuntimeFeatures {
    BLINK_PLATFORM_EXPORT static void EnableMediaControlsExpandGesture(bool);
    BLINK_PLATFORM_EXPORT static void EnableGetDisplayMedia(bool);
    BLINK_PLATFORM_EXPORT static void EnableAllowSyncXHRInPageDismissal(bool);
@@ -113,17 +113,17 @@
    BLINK_PLATFORM_EXPORT static void EnableSignedExchangeSubresourcePrefetch(
        bool);
    BLINK_PLATFORM_EXPORT static void EnableSubresourceWebBundles(bool);
---- a/third_party/blink/renderer/core/dom/document.cc
-+++ b/third_party/blink/renderer/core/dom/document.cc
-@@ -43,6 +43,7 @@
+--- third_party/blink/renderer/core/dom/document.cc.orig
++++ third_party/blink/renderer/core/dom/document.cc
+@@ -42,6 +42,7 @@
+ #include "base/containers/contains.h"
  #include "base/debug/dump_without_crashing.h"
  #include "base/metrics/histogram_functions.h"
- #include "base/notreached.h"
 +#include "base/rand_util.h"
  #include "base/time/time.h"
  #include "cc/input/overscroll_behavior.h"
  #include "cc/input/scroll_snap_data.h"
-@@ -885,6 +886,14 @@ Range* Document::CreateRangeAdjustedToTr
+@@ -855,6 +856,14 @@ Range* Document::CreateRangeAdjustedToTr
                                       Position::BeforeNode(*shadow_host));
  }
  
@@ -138,7 +138,7 @@
  SelectorQueryCache& Document::GetSelectorQueryCache() {
    if (!selector_query_cache_)
      selector_query_cache_ = std::make_unique<SelectorQueryCache>();
-@@ -2167,6 +2176,15 @@ void Document::UpdateStyleAndLayoutTreeF
+@@ -2145,6 +2154,15 @@ void Document::UpdateStyleAndLayoutTreeF
  #if DCHECK_IS_ON()
    AssertLayoutTreeUpdated(*this, true /* allow_dirty_container_subtrees */);
  #endif
@@ -154,9 +154,9 @@
  }
  
  void Document::InvalidateStyleAndLayoutForFontUpdates() {
---- a/third_party/blink/renderer/core/dom/document.h
-+++ b/third_party/blink/renderer/core/dom/document.h
-@@ -496,6 +496,10 @@ class CORE_EXPORT Document : public Cont
+--- third_party/blink/renderer/core/dom/document.h.orig
++++ third_party/blink/renderer/core/dom/document.h
+@@ -456,6 +456,10 @@ class CORE_EXPORT Document : public Cont
      has_xml_declaration_ = has_xml_declaration ? 1 : 0;
    }
  
@@ -167,7 +167,7 @@
    AtomicString visibilityState() const;
    bool IsPageVisible() const;
    bool hidden() const;
-@@ -2229,6 +2233,9 @@ class CORE_EXPORT Document : public Cont
+@@ -2078,6 +2082,9 @@ class CORE_EXPORT Document : public Cont
  
    base::ElapsedTimer start_time_;
  
@@ -177,38 +177,38 @@
    Member<ScriptRunner> script_runner_;
  
    HeapVector<Member<ScriptElementBase>> current_script_stack_;
---- a/third_party/blink/renderer/core/dom/element.cc
-+++ b/third_party/blink/renderer/core/dom/element.cc
-@@ -2073,6 +2073,11 @@ DOMRectList* Element::getClientRects() {
+--- third_party/blink/renderer/core/dom/element.cc.orig
++++ third_party/blink/renderer/core/dom/element.cc
+@@ -2114,6 +2114,11 @@ DOMRectList* Element::getClientRects() {
    DCHECK(element_layout_object);
-   GetDocument().AdjustQuadsForScrollAndAbsoluteZoom(quads,
-                                                     *element_layout_object);
+   GetDocument().AdjustFloatQuadsForScrollAndAbsoluteZoom(
+       quads, *element_layout_object);
 +  if (RuntimeEnabledFeatures::FingerprintingClientRectsNoiseEnabled()) {
-+    for (gfx::QuadF& quad : quads) {
++    for (FloatQuad& quad : quads) {
 +      quad.Scale(GetDocument().GetNoiseFactorX(), GetDocument().GetNoiseFactorY());
 +    }
 +  }
    return MakeGarbageCollected<DOMRectList>(quads);
  }
  
-@@ -2090,6 +2095,9 @@ gfx::RectF Element::GetBoundingClientRec
+@@ -2131,6 +2136,9 @@ FloatRect Element::GetBoundingClientRect
    DCHECK(element_layout_object);
-   GetDocument().AdjustRectForScrollAndAbsoluteZoom(result,
-                                                    *element_layout_object);
+   GetDocument().AdjustFloatRectForScrollAndAbsoluteZoom(result,
+                                                         *element_layout_object);
 +  if (RuntimeEnabledFeatures::FingerprintingClientRectsNoiseEnabled()) {
 +    result.Scale(GetDocument().GetNoiseFactorX(), GetDocument().GetNoiseFactorY());
 +  }
    return result;
  }
  
---- a/third_party/blink/renderer/core/dom/range.cc
-+++ b/third_party/blink/renderer/core/dom/range.cc
+--- third_party/blink/renderer/core/dom/range.cc.orig
++++ third_party/blink/renderer/core/dom/range.cc
 @@ -1598,11 +1598,21 @@ DOMRectList* Range::getClientRects() con
-   Vector<gfx::QuadF> quads;
+   Vector<FloatQuad> quads;
    GetBorderAndTextQuads(quads);
  
 +  if (RuntimeEnabledFeatures::FingerprintingClientRectsNoiseEnabled()) {
-+    for (gfx::QuadF& quad : quads) {
++    for (FloatQuad& quad : quads) {
 +      quad.Scale(owner_document_->GetNoiseFactorX(), owner_document_->GetNoiseFactorY());
 +    }
 +  }
@@ -217,17 +217,17 @@
  }
  
  DOMRect* Range::getBoundingClientRect() const {
--  return DOMRect::FromRectF(BoundingRect());
+-  return DOMRect::FromFloatRect(BoundingRect());
 +  auto rect = BoundingRect();
 +  if (RuntimeEnabledFeatures::FingerprintingClientRectsNoiseEnabled()) {
 +    rect.Scale(owner_document_->GetNoiseFactorX(), owner_document_->GetNoiseFactorY());
 +  }
-+  return DOMRect::FromRectF(rect);
++  return DOMRect::FromFloatRect(rect);
  }
  
  // TODO(editing-dev): We should make
---- a/third_party/blink/renderer/core/html/canvas/text_metrics.cc
-+++ b/third_party/blink/renderer/core/html/canvas/text_metrics.cc
+--- third_party/blink/renderer/core/html/canvas/text_metrics.cc.orig
++++ third_party/blink/renderer/core/html/canvas/text_metrics.cc
 @@ -55,6 +55,24 @@ TextMetrics::TextMetrics(const Font& fon
    Update(font, direction, baseline, align, text);
  }
@@ -253,8 +253,8 @@
  void TextMetrics::Update(const Font& font,
                           const TextDirection& direction,
                           const TextBaseline& baseline,
---- a/third_party/blink/renderer/core/html/canvas/text_metrics.h
-+++ b/third_party/blink/renderer/core/html/canvas/text_metrics.h
+--- third_party/blink/renderer/core/html/canvas/text_metrics.h.orig
++++ third_party/blink/renderer/core/html/canvas/text_metrics.h
 @@ -64,6 +64,8 @@ class CORE_EXPORT TextMetrics final : pu
  
    void Trace(Visitor*) const override;
@@ -264,9 +264,9 @@
   private:
    void Update(const Font&,
                const TextDirection&,
---- a/third_party/blink/renderer/modules/canvas/canvas2d/canvas_rendering_context_2d.cc
-+++ b/third_party/blink/renderer/modules/canvas/canvas2d/canvas_rendering_context_2d.cc
-@@ -917,9 +917,15 @@ TextMetrics* CanvasRenderingContext2D::m
+--- third_party/blink/renderer/modules/canvas/canvas2d/canvas_rendering_context_2d.cc.orig
++++ third_party/blink/renderer/modules/canvas/canvas2d/canvas_rendering_context_2d.cc
+@@ -912,9 +912,15 @@ TextMetrics* CanvasRenderingContext2D::m
    TextDirection direction =
        ToTextDirection(GetState().GetDirection(), canvas());
  
@@ -283,20 +283,20 @@
  }
  
  void CanvasRenderingContext2D::fillFormattedText(
---- a/third_party/blink/renderer/platform/BUILD.gn
-+++ b/third_party/blink/renderer/platform/BUILD.gn
-@@ -1638,6 +1638,7 @@ component("platform") {
+--- third_party/blink/renderer/platform/BUILD.gn.orig
++++ third_party/blink/renderer/platform/BUILD.gn
+@@ -1686,6 +1686,7 @@ component("platform") {
      "//components/paint_preview/common",
      "//components/power_scheduler",
      "//components/search_engines:search_engine_utils",
 +    "//components/ungoogled:ungoogled_switches",
      "//components/viz/client",
      "//components/viz/common",
-     "//components/webrtc:net_address_utils",
---- a/third_party/blink/renderer/platform/exported/web_runtime_features.cc
-+++ b/third_party/blink/renderer/platform/exported/web_runtime_features.cc
-@@ -677,4 +677,12 @@ void WebRuntimeFeatures::EnableWebAuthen
-       enable);
+     "//crypto",
+--- third_party/blink/renderer/platform/exported/web_runtime_features.cc.orig
++++ third_party/blink/renderer/platform/exported/web_runtime_features.cc
+@@ -689,4 +689,12 @@ void WebRuntimeFeatures::EnableCLSScroll
+   RuntimeEnabledFeatures::SetCLSScrollAnchoringEnabled(enable);
  }
  
 +void WebRuntimeFeatures::EnableFingerprintingClientRectsNoise(bool enable) {
@@ -308,10 +308,10 @@
 +}
 +
  }  // namespace blink
---- a/third_party/blink/renderer/platform/runtime_enabled_features.json5
-+++ b/third_party/blink/renderer/platform/runtime_enabled_features.json5
-@@ -1137,6 +1137,12 @@
-       name: "Focusgroup",
+--- third_party/blink/renderer/platform/runtime_enabled_features.json5.orig
++++ third_party/blink/renderer/platform/runtime_enabled_features.json5
+@@ -1076,6 +1076,12 @@
+       origin_trial_feature_name: "Fledge",
      },
      {
 +      name: "FingerprintingClientRectsNoise",