1 files changed, 13 insertions, 51 deletions

diff --git a/chromium/third_party/blink/renderer/core/exported/web_frame.cc b/chromium/third_party/blink/renderer/core/exported/web_frame.cc
index 6e095c46546..91353f0821a 100644
--- a/chromium/third_party/blink/renderer/core/exported/web_frame.cc
+++ b/chromium/third_party/blink/renderer/core/exported/web_frame.cc
@@ -6,8 +6,9 @@
 
 #include <algorithm>
 #include "third_party/blink/public/common/frame/sandbox_flags.h"
+#include "third_party/blink/public/mojom/scroll/scrollbar_mode.mojom-blink.h"
+#include "third_party/blink/public/mojom/security_context/insecure_request_policy.mojom-blink.h"
 #include "third_party/blink/public/web/web_element.h"
-#include "third_party/blink/public/web/web_frame_owner_properties.h"
 #include "third_party/blink/renderer/bindings/core/v8/window_proxy_manager.h"
 #include "third_party/blink/renderer/core/dom/increment_load_event_delay_count.h"
 #include "third_party/blink/renderer/core/exported/web_remote_frame_impl.h"
@@ -128,7 +129,7 @@ bool WebFrame::Swap(WebFrame* frame) {
                            ToTraceValue(&local_frame));
     }
   } else {
-    ToWebRemoteFrameImpl(frame)->InitializeCoreFrame(
+    To<WebRemoteFrameImpl>(frame)->InitializeCoreFrame(
         *page, owner, name, &old_frame->window_agent_factory());
   }
 
@@ -158,14 +159,7 @@ WebSecurityOrigin WebFrame::GetSecurityOrigin() const {
       ToCoreFrame(*this)->GetSecurityContext()->GetSecurityOrigin());
 }
 
-void WebFrame::SetFrameOwnerPolicy(const FramePolicy& frame_policy) {
-  // At the moment, this is only used to replicate sandbox flags and container
-  // policy for frames with a remote owner.
-  To<RemoteFrameOwner>(ToCoreFrame(*this)->Owner())
-      ->SetFramePolicy(frame_policy);
-}
-
-WebInsecureRequestPolicy WebFrame::GetInsecureRequestPolicy() const {
+mojom::blink::InsecureRequestPolicy WebFrame::GetInsecureRequestPolicy() const {
   return ToCoreFrame(*this)->GetSecurityContext()->GetInsecureRequestPolicy();
 }
 
@@ -175,32 +169,6 @@ WebVector<unsigned> WebFrame::GetInsecureRequestToUpgrade() const {
   return SecurityContext::SerializeInsecureNavigationSet(set);
 }
 
-void WebFrame::SetFrameOwnerProperties(
-    const WebFrameOwnerProperties& properties) {
-  // At the moment, this is only used to replicate frame owner properties
-  // for frames with a remote owner.
-  auto* owner = To<RemoteFrameOwner>(ToCoreFrame(*this)->Owner());
-
-  Frame* frame = ToCoreFrame(*this);
-  DCHECK(frame);
-
-  if (auto* local_frame = DynamicTo<LocalFrame>(frame)) {
-    local_frame->GetDocument()->WillChangeFrameOwnerProperties(
-        properties.margin_width, properties.margin_height,
-        static_cast<ScrollbarMode>(properties.scrolling_mode),
-        properties.is_display_none);
-  }
-
-  owner->SetBrowsingContextContainerName(properties.name);
-  owner->SetScrollingMode(properties.scrolling_mode);
-  owner->SetMarginWidth(properties.margin_width);
-  owner->SetMarginHeight(properties.margin_height);
-  owner->SetAllowFullscreen(properties.allow_fullscreen);
-  owner->SetAllowPaymentRequest(properties.allow_payment_request);
-  owner->SetIsDisplayNone(properties.is_display_none);
-  owner->SetRequiredCsp(properties.required_csp);
-}
-
 WebFrame* WebFrame::Opener() const {
   return opener_;
 }
@@ -334,20 +302,21 @@ WebFrame::~WebFrame() {
   opened_frame_tracker_.reset(nullptr);
 }
 
-void WebFrame::TraceFrame(Visitor* visitor, WebFrame* frame) {
+void WebFrame::TraceFrame(Visitor* visitor, const WebFrame* frame) {
   if (!frame)
     return;
 
-  if (auto* web_local_frame = DynamicTo<WebLocalFrameImpl>(frame))
-    visitor->Trace(web_local_frame);
-  else
-    visitor->Trace(ToWebRemoteFrameImpl(frame));
+  if (frame->IsWebLocalFrame()) {
+    visitor->Trace(To<WebLocalFrameImpl>(frame));
+  } else {
+    visitor->Trace(To<WebRemoteFrameImpl>(frame));
+  }
 }
 
-void WebFrame::TraceFrames(Visitor* visitor, WebFrame* frame) {
+void WebFrame::TraceFrames(Visitor* visitor, const WebFrame* frame) {
   DCHECK(frame);
   TraceFrame(visitor, frame->parent_);
-  for (WebFrame* child = frame->FirstChild(); child;
+  for (const WebFrame* child = frame->FirstChild(); child;
        child = child->NextSibling())
     TraceFrame(visitor, child);
 }
@@ -373,16 +342,9 @@ Frame* WebFrame::ToCoreFrame(const WebFrame& frame) {
   if (auto* web_local_frame = DynamicTo<WebLocalFrameImpl>(&frame))
     return web_local_frame->GetFrame();
   if (frame.IsWebRemoteFrame())
-    return ToWebRemoteFrameImpl(frame).GetFrame();
+    return To<WebRemoteFrameImpl>(frame).GetFrame();
   NOTREACHED();
   return nullptr;
 }
 
-STATIC_ASSERT_ENUM(WebFrameOwnerProperties::ScrollingMode::kAuto,
-                   ScrollbarMode::kAuto);
-STATIC_ASSERT_ENUM(WebFrameOwnerProperties::ScrollingMode::kAlwaysOff,
-                   ScrollbarMode::kAlwaysOff);
-STATIC_ASSERT_ENUM(WebFrameOwnerProperties::ScrollingMode::kAlwaysOn,
-                   ScrollbarMode::kAlwaysOn);
-
 }  // namespace blink