More html_viewer OOPIF changes

components/html_viewer/frame.cc

Index: components/html_viewer/frame.cc
diff --git a/components/html_viewer/frame.cc b/components/html_viewer/frame.cc
index f9a17a45f30f51769c3345c7a7064ab7dac1b9b8..616fecc42b5d44811178541733aa993508af3066 100644
--- a/components/html_viewer/frame.cc
+++ b/components/html_viewer/frame.cc
@@ -12,6 +12,7 @@
 #include "base/strings/string_util.h"
 #include "base/thread_task_runner_handle.h"
 #include "components/html_viewer/ax_provider_impl.h"
+#include "components/html_viewer/blink_basic_type_converters.h"
 #include "components/html_viewer/blink_input_events_type_converters.h"
 #include "components/html_viewer/blink_url_request_type_converters.h"
 #include "components/html_viewer/frame_tree_manager.h"
@@ -95,9 +96,14 @@ Frame::Frame(const Frame::CreateParams& params)
     parent_->children_.push_back(this);
 }
 
-void Frame::Init(mojo::View* local_view) {
-  // TODO(sky): need to plumb through scope, name and other args correctly for
-  // frame creation.
+void Frame::Init(mojo::View* local_view,
+                 const blink::WebString& remote_frame_name,
+                 const blink::WebString& remote_origin) {
+  if (local_view->id() == id_)
+    SetView(local_view);
+
+  // TODO(sky): need to plumb through scope and other args correctly for frame
+  // creation.
   if (!parent_) {
     CreateWebWidget();
     // This is the root of the tree (aka the main frame).
@@ -124,9 +130,6 @@ void Frame::Init(mojo::View* local_view) {
       local_web_frame->swap(remote_web_frame);
       // local_web_frame->close();
       web_frame_ = remote_web_frame;
-      // TODO(sky): This needs to come from FrameTreeData.
-      remote_web_frame->setReplicatedOrigin(
-          blink::WebSecurityOrigin::createFromString(""));
     }
   } else if (id_ == local_view->id()) {
     // Frame represents the local frame.
@@ -149,8 +152,17 @@ void Frame::Init(mojo::View* local_view) {
     web_frame_ = remote_web_frame;
   } else {
     web_frame_ = parent_->web_frame()->toWebRemoteFrame()->createRemoteChild(
-        blink::WebTreeScopeType::Document, "", blink::WebSandboxFlags::None,
-        this);
+        blink::WebTreeScopeType::Document, remote_frame_name,
+        blink::WebSandboxFlags::None, this);
+  }
+
+  if (!IsLocal()) {
+    blink::WebRemoteFrame* remote_web_frame = web_frame_->toWebRemoteFrame();
+    if (remote_web_frame) {
+      remote_web_frame->setReplicatedName(remote_frame_name);
+      remote_web_frame->setReplicatedOrigin(
+          blink::WebSecurityOrigin::createFromString(remote_origin));
+    }
   }
 }
 
@@ -199,6 +211,15 @@ Frame::~Frame() {
   }
 }
 
+void Frame::SetRemoteFrameName(const mojo::String& name) {
+  if (IsLocal())
+    return;
+
+  blink::WebRemoteFrame* remote_frame = web_frame_->toWebRemoteFrame();
+  if (remote_frame)
+    remote_frame->setReplicatedName(name.To<blink::WebString>());
+}
+
 bool Frame::IsLocal() const {
   return web_frame_->isWebLocalFrame();
 }
@@ -490,6 +511,11 @@ void Frame::didChangeLoadProgress(double load_progress) {
   frame_tree_manager_->ProgressChanged(load_progress);
 }
 
+void Frame::didChangeName(blink::WebLocalFrame* frame,
+                          const blink::WebString& name) {
+  frame_tree_manager_->OnFrameDidChangeName(this, name);
+}
+
 void Frame::frameDetached(blink::WebRemoteFrameClient::DetachType type) {
   if (type == blink::WebRemoteFrameClient::DetachType::Swap) {
     web_frame_->close();