Source/WebCore/html/HTMLObjectElement.cpp - Issue 7950001: Merge 95204

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/html/HTMLObjectElement.cpp

Issue 7950001: Merge 95204 (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

Index: Source/WebCore/html/HTMLObjectElement.cpp

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

--- Source/WebCore/html/HTMLObjectElement.cpp (revision 95424)

+++ Source/WebCore/html/HTMLObjectElement.cpp (working copy)

@@ -327,6 +327,7 @@

if (!renderer())

return;

+ RefPtr<HTMLObjectElement> protect(this); // Loading the plugin might remove us from the document.

SubframeLoader* loader = document()->frame()->loader()->subframeLoader();

bool success = beforeLoadAllowedLoad && hasValidClassId() && loader->requestObject(this, url, getAttribute(nameAttr), serviceType, paramNames, paramValues);

« no previous file with comments | « Source/WebCore/html/HTMLEmbedElement.cpp ('k') | no next file » | no next file with comments »