Replicating WebFrame::uniqueName across renderers.

components/html_viewer/html_frame.cc

Index: components/html_viewer/html_frame.cc
diff --git a/components/html_viewer/html_frame.cc b/components/html_viewer/html_frame.cc
index 9cd02558e509a0752bfb304ed874baeb099e6565..2dd138eae85a287b1870d3c1ca273cd5dd617d0e 100644
--- a/components/html_viewer/html_frame.cc
+++ b/components/html_viewer/html_frame.cc
@@ -133,6 +133,9 @@ HTMLFrame::HTMLFrame(CreateParams* params)
 
   SetReplicatedFrameStateFromClientProperties(params->properties, &state_);
 
+  // TODO(lukasza): Add |frame_unique_name| to ReplicatedFrameState?

[Charlie Reis, 2016/01/27 23:48:49]

Seems likely (since that's what we're doing in content/), but I'll defer to
Mandoline folks.

[Łukasz Anforowicz, 2016/01/28 01:21:19]

FWIW, similar TODOs are still here for other like WebFrameOwnerProperties (from
https://chromium.googlesource.com/chromium/src/+/70605c32bd6a79317df00114ec55...).

Hopefully we can figure it out when doing an owners review for the changes under
//components/html_viewer

+  blink::WebString unique_name;  // Empty string = will recalculate in Blink.
+
   if (!parent_) {
     CreateRootWebWidget();
 
@@ -187,14 +190,15 @@ HTMLFrame::HTMLFrame(CreateParams* params)
         previous_sibling ? previous_sibling->web_frame() : nullptr;
     CHECK(!parent_->IsLocal());
     web_frame_ = parent_->web_frame()->toWebRemoteFrame()->createLocalChild(
-        state_.tree_scope, state_.name, state_.sandbox_flags, this,
+        state_.tree_scope, state_.name, unique_name, state_.sandbox_flags, this,
         previous_web_frame,
         // TODO(lazyboy): Replicate WebFrameOwnerProperties where needed.
         blink::WebFrameOwnerProperties());
     CreateLocalRootWebWidget(web_frame_->toWebLocalFrame());
   } else if (!parent_->IsLocal()) {
     web_frame_ = parent_->web_frame()->toWebRemoteFrame()->createRemoteChild(
-        state_.tree_scope, state_.name, state_.sandbox_flags, this);
+        state_.tree_scope, state_.name, unique_name, state_.sandbox_flags,
+        this);
   } else {
     CHECK(params->is_local_create_child);
 
@@ -326,14 +330,16 @@ blink::WebFrame* HTMLFrame::createChildFrame(
     blink::WebLocalFrame* parent,
     blink::WebTreeScopeType scope,
     const blink::WebString& frame_name,
+    const blink::WebString& /* frame_unique_name */,
     blink::WebSandboxFlags sandbox_flags,
-    const blink::WebFrameOwnerProperties& frame_owner_properties) {
+    const blink::WebFrameOwnerProperties& /* frame_owner_properties */) {
   DCHECK(IsLocal());  // Can't create children of remote frames.
   DCHECK_EQ(parent, web_frame_);
   DCHECK(window_);  // If we're local we have to have a window.
   // Create the window that will house the frame now. We embed once we know the
   // url (see decidePolicyForNavigation()).
   mus::Window* child_window = window_->connection()->NewWindow();
+  // TODO(lukasza): Add |frame_unique_name| to ReplicatedFrameState?
   ReplicatedFrameState child_state;
   child_state.name = frame_name;
   child_state.tree_scope = scope;
@@ -480,8 +486,10 @@ void HTMLFrame::dispatchLoad() {
   server_->DispatchLoadEventToParent();
 }
 
-void HTMLFrame::didChangeName(blink::WebLocalFrame* frame,
-                              const blink::WebString& name) {
+void HTMLFrame::didChangeName(blink::WebLocalFrame* /* frame */,
+                              const blink::WebString& name,
+                              const blink::WebString& /* unique_name */) {
+  // TODO(lukasza): Add |frame_unique_name| to ReplicatedFrameState?
   state_.name = name;
   server_->SetClientProperty(kPropertyFrameName,
                              FrameNameToClientProperty(name));