third_party/WebKit/Source/web/WebFrame.cpp - Issue 1408073006: Gracefully handle a self-referential opener in frame swap.

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/web/WebFrame.cpp

Issue 1408073006: Gracefully handle a self-referential opener in frame swap. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Remove friend declaration. Created 5 years, 2 months 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

« third_party/WebKit/Source/web/OpenedFrameTracker.cpp ('K') | « third_party/WebKit/Source/web/OpenedFrameTracker.cpp ('k') | third_party/WebKit/Source/web/tests/WebFrameTest.cpp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: third_party/WebKit/Source/web/WebFrame.cpp

diff --git a/third_party/WebKit/Source/web/WebFrame.cpp b/third_party/WebKit/Source/web/WebFrame.cpp

index a1f3cd60efa89ff2014de9e3dc694cbe09fd68de..5e979c40ed4872e19c0d7a41a73e207ada4aca20 100644

--- a/third_party/WebKit/Source/web/WebFrame.cpp

+++ b/third_party/WebKit/Source/web/WebFrame.cpp

@@ -74,14 +74,10 @@ bool WebFrame::swap(WebFrame* frame)

}

if (m_opener) {

- m_opener->m_openedFrameTracker->remove(this);

- m_opener->m_openedFrameTracker->add(frame);

- swap(m_opener, frame->m_opener);

- }

- if (!m_openedFrameTracker->isEmpty()) {

- m_openedFrameTracker->updateOpener(frame);

- frame->m_openedFrameTracker.reset(m_openedFrameTracker.release());

+ frame->setOpener(m_opener);

+ setOpener(nullptr);

}

+ m_openedFrameTracker->transferTo(frame);

FrameHost* host = oldFrame->host();

AtomicString name = oldFrame->tree().name();