BASELINE: Update Chromium to 83.0.4103.122

Change-Id: Ie3a82f5bb0076eec2a7c6a6162326b4301ee291e
Reviewed-by: Michael Brüning <michael.bruning@qt.io>

1 files changed, 6 insertions, 23 deletions

diff --git a/chromium/third_party/blink/public/web/web_frame.h b/chromium/third_party/blink/public/web/web_frame.h
index 54aca382a09..14a2f0bf11c 100644
--- a/chromium/third_party/blink/public/web/web_frame.h
+++ b/chromium/third_party/blink/public/web/web_frame.h
@@ -33,10 +33,9 @@
 
 #include <memory>
 #include "cc/paint/paint_canvas.h"
+#include "third_party/blink/public/mojom/security_context/insecure_request_policy.mojom-shared.h"
 #include "third_party/blink/public/platform/web_common.h"
-#include "third_party/blink/public/platform/web_insecure_request_policy.h"
 #include "third_party/blink/public/web/web_frame_load_type.h"
-#include "third_party/blink/public/web/web_icon_url.h"
 #include "third_party/blink/public/web/web_node.h"
 #include "third_party/blink/public/web/web_tree_scope_type.h"
 #include "v8/include/v8.h"
@@ -50,9 +49,9 @@ class WebLocalFrame;
 class WebRemoteFrame;
 class WebSecurityOrigin;
 class WebView;
+namespace mojom {
 enum class WebSandboxFlags;
-struct FramePolicy;
-struct WebFrameOwnerProperties;
+}
 
 // Frames may be rendered in process ('local') or out of process ('remote').
 // A remote frame is always cross-site; a local frame may be either same-site or
@@ -98,26 +97,12 @@ class BLINK_EXPORT WebFrame {
   // The security origin of this frame.
   WebSecurityOrigin GetSecurityOrigin() const;
 
-  // Updates the snapshotted policy attributes (sandbox flags and feature policy
-  // container policy) in the frame's FrameOwner. This is used when this frame's
-  // parent is in another process and it dynamically updates this frame's
-  // sandbox flags or container policy. The new policy won't take effect until
-  // the next navigation.
-  void SetFrameOwnerPolicy(const FramePolicy&);
-
   // The frame's insecure request policy.
-  WebInsecureRequestPolicy GetInsecureRequestPolicy() const;
+  mojom::InsecureRequestPolicy GetInsecureRequestPolicy() const;
 
   // The frame's upgrade insecure navigations set.
   WebVector<unsigned> GetInsecureRequestToUpgrade() const;
 
-  // Updates this frame's FrameOwner properties, such as scrolling, margin,
-  // or allowfullscreen.  This is used when this frame's parent is in
-  // another process and it dynamically updates these properties.
-  // TODO(dcheng): Currently, the update only takes effect on next frame
-  // navigation.  This matches the in-process frame behavior.
-  void SetFrameOwnerProperties(const WebFrameOwnerProperties&);
-
   // Hierarchy ----------------------------------------------------------
 
   // Returns the containing view.
@@ -161,8 +146,6 @@ class BLINK_EXPORT WebFrame {
   static bool ScriptCanAccess(WebFrame*);
 
   // Navigation ----------------------------------------------------------
-  // TODO(clamy): Remove the reload, reloadWithOverrideURL, and loadRequest
-  // functions once RenderFrame only calls WebLoadFrame::load.
 
   // Stops any pending loads on the frame and its children.
   virtual void StopLoading() = 0;
@@ -184,7 +167,7 @@ class BLINK_EXPORT WebFrame {
 
   bool InShadowTree() const { return scope_ == WebTreeScopeType::kShadow; }
 
-  static void TraceFrames(Visitor*, WebFrame*);
+  static void TraceFrames(Visitor*, const WebFrame*);
 
   // Detaches a frame from its parent frame if it has one.
   void DetachFromParent();
@@ -212,7 +195,7 @@ class BLINK_EXPORT WebFrame {
   friend class OpenedFrameTracker;
   friend class WebFrameTest;
 
-  static void TraceFrame(Visitor*, WebFrame*);
+  static void TraceFrame(Visitor*, const WebFrame*);
 #endif
 
   // Removes the given child from this frame.