Replicating WebFrame::uniqueName across renderers.

third_party/WebKit/Source/core/page/FrameTree.h

Index: third_party/WebKit/Source/core/page/FrameTree.h
diff --git a/third_party/WebKit/Source/core/page/FrameTree.h b/third_party/WebKit/Source/core/page/FrameTree.h
index 37493906a646304b783ede027f16b6efaf73bbdf..42ec7f94348780a630ff717e75e586800fa971d2 100644
--- a/third_party/WebKit/Source/core/page/FrameTree.h
+++ b/third_party/WebKit/Source/core/page/FrameTree.h
@@ -42,10 +42,11 @@ public:
     // |fallbackName| is used as a source of uniqueName.
     void setName(const AtomicString& name, const AtomicString& fallbackName = nullAtom);
 
-    // Directly assigns both the name and uniqueName. Should only be used when
-    // switching between LocalFrames and RemoteFrames for the same logical frame
-    // so that the unique name stays unique.
-    void setNameForReplacementFrame(const AtomicString& name, const AtomicString& uniqueName);
+    // Directly assigns both the name and uniqueName.  Can be used when
+    // |uniqueName| is already known (i.e. when it has been precalculated by
+    // calculateUniqueNameForNewChildFrame OR when replicating the name between
+    // LocalFrames and RemoteFrames for the same logical frame).
+    void setPrecalculatedName(const AtomicString& name, const AtomicString& uniqueName);
 
     Frame* parent() const;
     Frame* top() const;
@@ -70,9 +71,16 @@ public:
 
     DECLARE_TRACE();
 
+    AtomicString calculateUniqueNameForNewChildFrame(
+        const AtomicString& name,
+        const AtomicString& fallbackName = nullAtom) const;
+
 private:
     Frame* deepLastChild() const;
-    AtomicString uniqueChildName(const AtomicString& requestedName) const;
+    AtomicString calculateUniqueNameForChildFrame(
+        bool existingChildFrame,
+        const AtomicString& name,
+        const AtomicString& fallbackName = nullAtom) const;
     bool uniqueNameExists(const AtomicString& name) const;
 
     RawPtrWillBeMember<Frame> m_thisFrame;