BASELINE: Update Chromium to 85.0.4183.14085-based

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

1 files changed, 7 insertions, 5 deletions

diff --git a/chromium/ui/android/view_android.h b/chromium/ui/android/view_android.h
index cf88a186583..5c989d6b05e 100644
--- a/chromium/ui/android/view_android.h
+++ b/chromium/ui/android/view_android.h
@@ -18,8 +18,6 @@
 #include "ui/android/view_android_observer.h"
 #include "ui/gfx/geometry/rect_f.h"
 
-class SkBitmap;
-
 namespace cc {
 class Layer;
 }
@@ -34,6 +32,7 @@ class CopyOutputRequest;
 }
 
 namespace ui {
+class Cursor;
 class DragEventAndroid;
 class EventForwarder;
 class EventHandlerAndroid;
@@ -154,9 +153,7 @@ class UI_ANDROID_EXPORT ViewAndroid {
 
   void OnSizeChanged(int width, int height);
   void OnPhysicalBackingSizeChanged(const gfx::Size& size);
-  void OnCursorChanged(int type,
-                       const SkBitmap& custom_image,
-                       const gfx::Point& hotspot);
+  void OnCursorChanged(const Cursor& cursor);
   void OnBackgroundColorChanged(unsigned int color);
   void OnTopControlsChanged(float top_controls_offset,
                             float top_content_offset,
@@ -164,6 +161,11 @@ class UI_ANDROID_EXPORT ViewAndroid {
   void OnBottomControlsChanged(float bottom_controls_offset,
                                float bottom_controls_min_height_offset);
   void OnBrowserControlsHeightChanged();
+  // |current_scroll_ratio| is the ratio of vertical scroll in [0, 1] range.
+  // Scroll at top of page is 0, and bottom of page is 1. It is defined as 0
+  // if page is not scrollable, though this should not be called in that case.
+  void OnVerticalScrollDirectionChanged(bool direction_up,
+                                        float current_scroll_ratio);
 
   // Gets the Visual Viewport inset to apply in physical pixels.
   int GetViewportInsetBottom();