third_party/WebKit/Source/core/page/FrameTree.cpp - Issue 1413093007: OOPIF: Use the same uniqueName when swapping between local and remote.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: third_party/WebKit/Source/core/page/FrameTree.cpp

Issue 1413093007: OOPIF: Use the same uniqueName when swapping between local and remote. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Revert to PS2 Created 5 years, 1 month ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

View side-by-side diff with in-line comments

Download patch

« no previous file with comments | « third_party/WebKit/Source/core/page/FrameTree.h ('k') | third_party/WebKit/Source/web/WebLocalFrameImpl.cpp » ('j') | third_party/WebKit/Source/web/tests/WebFrameTest.cpp » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: third_party/WebKit/Source/core/page/FrameTree.cpp

diff --git a/third_party/WebKit/Source/core/page/FrameTree.cpp b/third_party/WebKit/Source/core/page/FrameTree.cpp

index 31889059ba15b90bda64f5729ad8858baf4e6564..723724e8053ed3edfec481232b10a8a62370b60f 100644

--- a/third_party/WebKit/Source/core/page/FrameTree.cpp

+++ b/third_party/WebKit/Source/core/page/FrameTree.cpp

@@ -72,6 +72,12 @@ void FrameTree::setName(const AtomicString& name, const AtomicString& fallbackNa

m_uniqueName = parent()->tree().uniqueChildName(name.isEmpty() ? fallbackName : name);

}

+void FrameTree::setNameForReplacementFrame(const AtomicString& name, const AtomicString& uniqueName)

+ m_name = name;

+ m_uniqueName = uniqueName;

Frame* FrameTree::parent() const

{

if (!m_thisFrame->client())