| 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..854b02136ca3fa0b9b8dbc0ffb798eaf0aad5c13 100644
|
| --- a/third_party/WebKit/Source/core/page/FrameTree.h
|
| +++ b/third_party/WebKit/Source/core/page/FrameTree.h
|
| @@ -43,9 +43,9 @@ public:
|
| 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);
|
| + // replicating the name between LocalFrames and RemoteFrames for the same
|
| + // logical frame so that the unique name stays unique.
|
| + void setReplicatedName(const AtomicString& name, const AtomicString& uniqueName);
|
|
|
| Frame* parent() const;
|
| Frame* top() const;
|
| @@ -70,9 +70,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& requestedName,
|
| + const AtomicString& fallbackName = nullAtom) const;
|
| bool uniqueNameExists(const AtomicString& name) const;
|
|
|
| RawPtrWillBeMember<Frame> m_thisFrame;
|
|
|