BASELINE: Update Chromium to 85.0.4183.14085-based

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

6 files changed, 35 insertions, 14 deletions

diff --git a/chromium/content/public/renderer/content_renderer_client.cc b/chromium/content/public/renderer/content_renderer_client.cc
index ea6d8e63572..064d0a433db 100644
--- a/chromium/content/public/renderer/content_renderer_client.cc
+++ b/chromium/content/public/renderer/content_renderer_client.cc
@@ -189,7 +189,8 @@ ContentRendererClient::CreateWorkerContentSettingsClient(
 #if !defined(OS_ANDROID)
 std::unique_ptr<media::SpeechRecognitionClient>
 ContentRendererClient::CreateSpeechRecognitionClient(
-    RenderFrame* render_frame) {
+    RenderFrame* render_frame,
+    media::SpeechRecognitionClient::OnReadyCallback callback) {
   return nullptr;
 }
 #endif
diff --git a/chromium/content/public/renderer/content_renderer_client.h b/chromium/content/public/renderer/content_renderer_client.h
index 7da02ee5414..f6d2f50e8d6 100644
--- a/chromium/content/public/renderer/content_renderer_client.h
+++ b/chromium/content/public/renderer/content_renderer_client.h
@@ -150,9 +150,10 @@ class CONTENT_EXPORT ContentRendererClient {
   virtual bool ShouldTrackUseCounter(const GURL& url);
 
   // Returns the information to display when a navigation error occurs.
-  // If |error_html| is not null then it may be set to a HTML page
-  // containing the details of the error and maybe links to more info.
-  // Note that |error_html| may be not written to in certain cases
+  // |error_html| should be set to null if this is a custom error page that will
+  // set its own html content, otherwise if |error_html| is not null then it may
+  // be set to a HTML page containing the details of the error and maybe links
+  // to more info. Note that |error_html| may be not written to in certain cases
   // (lack of information on the error code) so the caller should take care to
   // initialize it with a safe default before the call.
   virtual void PrepareErrorPage(content::RenderFrame* render_frame,
@@ -304,7 +305,9 @@ class CONTENT_EXPORT ContentRendererClient {
 #if !defined(OS_ANDROID)
   // Creates a speech recognition client used to transcribe audio into captions.
   virtual std::unique_ptr<media::SpeechRecognitionClient>
-  CreateSpeechRecognitionClient(RenderFrame* render_frame);
+  CreateSpeechRecognitionClient(
+      RenderFrame* render_frame,
+      media::SpeechRecognitionClient::OnReadyCallback callback);
 #endif
 
   // Returns true if the page at |url| can use Pepper CameraDevice APIs.
diff --git a/chromium/content/public/renderer/document_state.h b/chromium/content/public/renderer/document_state.h
index c78fba87644..7a0bd60e30d 100644
--- a/chromium/content/public/renderer/document_state.h
+++ b/chromium/content/public/renderer/document_state.h
@@ -8,7 +8,6 @@
 #include <memory>
 #include <string>
 
-#include "base/logging.h"
 #include "base/supports_user_data.h"
 #include "base/time/time.h"
 #include "content/common/content_export.h"
diff --git a/chromium/content/public/renderer/render_accessibility.h b/chromium/content/public/renderer/render_accessibility.h
index eea7c3ae5c2..254f3b3283f 100644
--- a/chromium/content/public/renderer/render_accessibility.h
+++ b/chromium/content/public/renderer/render_accessibility.h
@@ -22,6 +22,7 @@ class CONTENT_EXPORT RenderAccessibility {
   // PluginAXTreeSource, into the page's accessibility tree.
   virtual void SetPluginTreeSource(PluginAXTreeSource* source) = 0;
   virtual void OnPluginRootNodeUpdated() = 0;
+  virtual void ShowPluginContextMenu() = 0;
 
  protected:
   ~RenderAccessibility() {}
diff --git a/chromium/content/public/renderer/render_frame.h b/chromium/content/public/renderer/render_frame.h
index 77b499ea74f..568a0a8c9bc 100644
--- a/chromium/content/public/renderer/render_frame.h
+++ b/chromium/content/public/renderer/render_frame.h
@@ -304,12 +304,6 @@ class CONTENT_EXPORT RenderFrame : public IPC::Listener,
   virtual void SetRenderFrameMediaPlaybackOptions(
       const RenderFrameMediaPlaybackOptions& opts) = 0;
 
-  // Synchronously performs the complete set of document lifecycle phases,
-  // including updates to the compositor state and rasterization, then sending
-  // a frame to the viz display compositor. Does nothing if RenderFrame is not
-  // a local root.
-  virtual void UpdateAllLifecyclePhasesAndCompositeForTesting() = 0;
-
   // Sets that cross browsing instance frame lookup is allowed.
   virtual void SetAllowsCrossBrowsingInstanceFrameLookup() = 0;
 
diff --git a/chromium/content/public/renderer/render_frame_observer.h b/chromium/content/public/renderer/render_frame_observer.h
index 831a3574055..4e195f960d7 100644
--- a/chromium/content/public/renderer/render_frame_observer.h
+++ b/chromium/content/public/renderer/render_frame_observer.h
@@ -106,8 +106,9 @@ class CONTENT_EXPORT RenderFrameObserver : public IPC::Listener,
   virtual void DidCreateNewDocument() {}
   virtual void DidCreateDocumentElement() {}
   // TODO(dgozman): replace next two methods with DidFinishNavigation.
-  virtual void DidCommitProvisionalLoad(bool is_same_document_navigation,
-                                        ui::PageTransition transition) {}
+  // DidCommitProvisionalLoad is only called for new-document navigations.
+  // Use DidFinishSameDocumentNavigation for same-document navigations.
+  virtual void DidCommitProvisionalLoad(ui::PageTransition transition) {}
   virtual void DidFailProvisionalLoad() {}
   virtual void DidFinishLoad() {}
   virtual void DidFinishDocumentLoad() {}
@@ -124,6 +125,19 @@ class CONTENT_EXPORT RenderFrameObserver : public IPC::Listener,
       const blink::WebVector<blink::WebString>& newly_matching_selectors,
       const blink::WebVector<blink::WebString>& stopped_matching_selectors) {}
 
+  // Called when same-document navigation finishes.
+  // This is the only callback for same-document navigations,
+  // DidStartNavigation and ReadyToCommitNavigation are not called.
+  //
+  // Same-document navigation is typically initiated by an anchor click
+  // (that usually results in the page scrolling to the anchor) or a
+  // history web API manipulation.
+  //
+  // However, it could be some rare case like user changing #hash in the url
+  // bar or history restore for subframe or anything else that was classified
+  // as same-document.
+  virtual void DidFinishSameDocumentNavigation() {}
+
   // Called when this frame has been detached from the view. This *will* be
   // called for child frames when a parent frame is detached. Since the frame is
   // already detached from the DOM at this time, it should not be inspected.
@@ -154,6 +168,9 @@ class CONTENT_EXPORT RenderFrameObserver : public IPC::Listener,
   // Notifications When an input delay data becomes available.
   virtual void DidObserveInputDelay(base::TimeDelta input_delay) {}
 
+  // Notification When the First Scroll Delay becomes available.
+  virtual void DidObserveFirstScrollDelay(base::TimeDelta first_scroll_delay) {}
+
   // Notifications when a cpu timing update becomes available, when a frame
   // has performed at least 100ms of tasks.
   virtual void DidChangeCpuTiming(base::TimeDelta time) {}
@@ -257,6 +274,12 @@ class CONTENT_EXPORT RenderFrameObserver : public IPC::Listener,
       const std::string& interface_name,
       mojo::ScopedInterfaceEndpointHandle* handle);
 
+  // Submit throughput data to the browser process. Only called for local roots.
+  virtual void OnThroughputDataAvailable(ukm::SourceId source_id,
+                                         int aggregated_percent,
+                                         int impl_percent,
+                                         base::Optional<int> main_percent) {}
+
   // IPC::Listener implementation.
   bool OnMessageReceived(const IPC::Message& message) override;