BASELINE: Update Chromium to 85.0.4183.14085-based

Change-Id: Iaa42f4680837c57725b1344f108c0196741f6057
Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>

1 files changed, 8 insertions, 0 deletions

diff --git a/chromium/ui/compositor/compositor.h b/chromium/ui/compositor/compositor.h
index 48cd5ff63d7..438dd212d88 100644
--- a/chromium/ui/compositor/compositor.h
+++ b/chromium/ui/compositor/compositor.h
@@ -346,6 +346,13 @@ class COMPOSITOR_EXPORT Compositor : public cc::LayerTreeHostClient,
       override;
   void NotifyThroughputTrackerResults(
       cc::CustomTrackerResults results) override;
+  void SubmitThroughputData(ukm::SourceId source_id,
+                            int aggregated_percent,
+                            int impl_percent,
+                            base::Optional<int> main_percent) override {}
+  void DidObserveFirstScrollDelay(
+      base::TimeDelta first_scroll_delay,
+      base::TimeTicks first_scroll_timestamp) override {}
 
   // cc::LayerTreeHostSingleThreadClient implementation.
   void DidSubmitCompositorFrame() override;
@@ -483,6 +490,7 @@ class COMPOSITOR_EXPORT Compositor : public cc::LayerTreeHostClient,
   ThroughputTrackerMap throughput_tracker_map_;
 
   base::WeakPtrFactory<Compositor> context_creation_weak_ptr_factory_{this};
+  base::WeakPtrFactory<Compositor> weak_ptr_factory_{this};
 
   DISALLOW_COPY_AND_ASSIGN(Compositor);
 };