Commit 67840e29 authored by mrowe@apple.com's avatar mrowe@apple.com

Fix <https://bugs.webkit.org/show_bug.cgi?id=25332>.

Bug 25332: Plug-in inserted in to DOM of PluginDocument fails to load

Reviewed by Darin Adler.

Only the first plug-in in a PluginDocument can use the main resource data.  For all
subsequent plug-ins, such as the plug-in that ClickToFlash inserts when swapping itself
out for the real Flash plug-in, we need to load the resource data in the same manner
as for other embedded plug-ins.

* loader/FrameLoader.cpp:
(WebCore::FrameLoader::loadPlugin):

git-svn-id: http://svn.webkit.org/repository/webkit/trunk@43181 268f45cc-cd09-0410-ab3c-d52691b4dbfc
parent 2465ad4e
2009-05-03 Mark Rowe <mrowe@apple.com>
Reviewed by Darin Adler.
Fix <https://bugs.webkit.org/show_bug.cgi?id=25332>.
Bug 25332: Plug-in inserted in to DOM of PluginDocument fails to load
Only the first plug-in in a PluginDocument can use the main resource data. For all
subsequent plug-ins, such as the plug-in that ClickToFlash inserts when swapping itself
out for the real Flash plug-in, we need to load the resource data in the same manner
as for other embedded plug-ins.
* loader/FrameLoader.cpp:
(WebCore::FrameLoader::loadPlugin):
2009-05-04 Simon Hausmann <simon.hausmann@nokia.com>
Rubber-stamped by Ariya Hidayat.
......@@ -1716,9 +1716,9 @@ bool FrameLoader::loadPlugin(RenderPart* renderer, const KURL& url, const String
return false;
}
widget = m_client->createPlugin(IntSize(renderer->contentWidth(), renderer->contentHeight()),
widget = m_client->createPlugin(IntSize(renderer->contentWidth(), renderer->contentHeight()),
element, url, paramNames, paramValues, mimeType,
m_frame->document()->isPluginDocument());
m_frame->document()->isPluginDocument() && !m_containsPlugIns);
if (widget) {
renderer->setWidget(widget);
m_containsPlugIns = true;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment