Source/WebCore/dom/Document.cpp - Issue 7980042: Merge 95471 - [Chromium] Crash after magic iframe transfer for Pepper/NaCl plugins.

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: Source/WebCore/dom/Document.cpp

Issue 7980042: Merge 95471 - [Chromium] Crash after magic iframe transfer for Pepper/NaCl plugins. (Closed) Base URL: http://svn.webkit.org/repository/webkit/branches/chromium/874/

Patch Set: Created 9 years, 3 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

« no previous file with comments | « LayoutTests/fast/frames/resources/iframe-reparenting-embed-iframe.html ('k') | Source/WebCore/html/HTMLFrameElementBase.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: Source/WebCore/dom/Document.cpp

===================================================================

--- Source/WebCore/dom/Document.cpp (revision 95655)

+++ Source/WebCore/dom/Document.cpp (working copy)

@@ -940,7 +940,7 @@

ec = HIERARCHY_REQUEST_ERR;

return 0;

}

- iframe->setRemainsAliveOnRemovalFromTree(attached() && source->attached());

+ iframe->setRemainsAliveOnRemovalFromTree(attached() && source->attached() && iframe->canRemainAliveOnRemovalFromTree());

}

if (source->parentNode())