BASELINE: Update Chromium to 85.0.4183.14085-based

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

1 files changed, 4 insertions, 20 deletions

diff --git a/chromium/cc/trees/single_thread_proxy.cc b/chromium/cc/trees/single_thread_proxy.cc
index 6f469a42c4e..c5449d5e85a 100644
--- a/chromium/cc/trees/single_thread_proxy.cc
+++ b/chromium/cc/trees/single_thread_proxy.cc
@@ -415,26 +415,10 @@ void SingleThreadProxy::SetVideoNeedsBeginFrames(bool needs_begin_frames) {
     scheduler_on_impl_thread_->SetVideoNeedsBeginFrames(needs_begin_frames);
 }
 
-size_t SingleThreadProxy::CompositedAnimationsCount() const {
-  return 0;
-}
-
-size_t SingleThreadProxy::MainThreadAnimationsCount() const {
-  return 0;
-}
-
 bool SingleThreadProxy::HasCustomPropertyAnimations() const {
   return false;
 }
 
-bool SingleThreadProxy::CurrentFrameHadRAF() const {
-  return false;
-}
-
-bool SingleThreadProxy::NextFrameHasPendingRAF() const {
-  return false;
-}
-
 bool SingleThreadProxy::IsInsideDraw() {
   return inside_draw_;
 }
@@ -635,7 +619,7 @@ void SingleThreadProxy::CompositeImmediately(base::TimeTicks frame_begin_time,
     // another draw will never be scheduled, so break remaining promises.
     host_impl_->active_tree()->BreakSwapPromises(SwapPromise::SWAP_FAILS);
 
-    DidFinishImplFrame();
+    DidFinishImplFrame(begin_frame_args);
   }
 }
 
@@ -958,9 +942,9 @@ void SingleThreadProxy::ScheduledActionPerformImplSideInvalidation() {
   NotifyReadyToActivate();
 }
 
-void SingleThreadProxy::DidFinishImplFrame() {
-  host_impl_->DidFinishImplFrame(
-      scheduler_on_impl_thread_->last_activate_origin_frame_args());
+void SingleThreadProxy::DidFinishImplFrame(
+    const viz::BeginFrameArgs& last_activated_args) {
+  host_impl_->DidFinishImplFrame(last_activated_args);
 #if DCHECK_IS_ON()
   DCHECK(inside_impl_frame_)
       << "DidFinishImplFrame called while not inside an impl frame!";