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

Issue 7980042: Merge 95471 - [Chromium] Crash after magic iframe transfer for Pepper/NaCl plugins. (Closed)

Created:
9 years, 3 months ago by Dmitry Titov

Modified:
9 years, 3 months ago

Reviewers:
Dmitry Titov

CC:
chromium-reviews

Base URL:
http://svn.webkit.org/repository/webkit/branches/chromium/874/

Visibility:
Public.

Description

Merge 95471 - [Chromium] Crash after magic iframe transfer for Pepper/NaCl plugins. https://bugs.webkit.org/show_bug.cgi?id=68267 Make adoptNode() to not enable live iframe transfer when the iframe's subtree contains plugins. Reviewed by Adam Barth. Source/WebCore: Test: fast/frames/iframe-reparenting-embed-elements.html * dom/Document.cpp: (WebCore::Document::adoptNode): * html/HTMLFrameElementBase.cpp: (WebCore::hasPluginElements): (WebCore::HTMLFrameElementBase::canRemainAliveOnRemovalFromTree): * html/HTMLFrameElementBase.h: LayoutTests: * fast/frames/iframe-reparenting-embed-elements-expected.txt: Added. * fast/frames/iframe-reparenting-embed-elements.html: Added. * fast/frames/resources/iframe-reparenting-embed-frame1.html: Added. * fast/frames/resources/iframe-reparenting-embed-iframe.html: Added. TBR=dimich@chromium.org Committed: http://src.chromium.org/viewvc/chrome?view=rev&revision=95657

Patch Set 1 #

Created: 9 years, 3 months ago

Download [raw] [tar.bz2]

	Unified diffs	Side-by-side diffs	Stats (+35 lines, --3 lines)			Patch
A +	LayoutTests/fast/frames/iframe-reparenting-embed-elements.html	View	0 chunks	+-1 lines, --1 lines	0 comments	Download
A +	LayoutTests/fast/frames/iframe-reparenting-embed-elements-expected.txt	View	0 chunks	+-1 lines, --1 lines	0 comments	Download
A +	LayoutTests/fast/frames/resources/iframe-reparenting-embed-frame1.html	View	0 chunks	+-1 lines, --1 lines	0 comments	Download
A +	LayoutTests/fast/frames/resources/iframe-reparenting-embed-iframe.html	View	0 chunks	+-1 lines, --1 lines	0 comments	Download
M	Source/WebCore/dom/Document.cpp	View	1 chunk	+1 line, -1 line	0 comments	Download
M	Source/WebCore/html/HTMLFrameElementBase.h	View	1 chunk	+1 line, -0 lines	0 comments	Download
M	Source/WebCore/html/HTMLFrameElementBase.cpp	View	2 chunks	+37 lines, -0 lines	0 comments	Download

Messages

Total messages: 1 (0 generated)

Expand Messages | Collapse Messages