Source/WebCore/html/PluginDocument.cpp - Issue 7147018: Merge 87756

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/PluginDocument.cpp

Issue 7147018: Merge 87756 (Closed) Base URL: http://svn.webkit.org/repository/webkit/branches/chromium/742/

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

Index: Source/WebCore/html/PluginDocument.cpp

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

--- Source/WebCore/html/PluginDocument.cpp (revision 88811)

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

@@ -92,7 +92,11 @@

m_embedElement->setAttribute(nameAttr, "plugin");

m_embedElement->setAttribute(srcAttr, document()->url().string());

- m_embedElement->setAttribute(typeAttr, document()->loader()->writer()->mimeType());

+ DocumentLoader* loader = document()->loader();

+ ASSERT(loader);

+ if (loader)

+ m_embedElement->setAttribute(typeAttr, loader->writer()->mimeType());

static_cast<PluginDocument*>(document())->setPluginNode(m_embedElement);

« no previous file with comments | « Source/WebCore/html/MediaDocument.cpp ('k') | Source/WebCore/platform/mac/HTMLConverter.mm » ('j') | no next file with comments »