| Index: third_party/WebKit/Source/core/html/HTMLEmbedElement.cpp
|
| diff --git a/third_party/WebKit/Source/core/html/HTMLEmbedElement.cpp b/third_party/WebKit/Source/core/html/HTMLEmbedElement.cpp
|
| index b10434d1aa7a17569872bad6a5b4a4a088d73dd5..d32ac2788fd4b4ed8a80d47ab16b983bf7a82bad 100644
|
| --- a/third_party/WebKit/Source/core/html/HTMLEmbedElement.cpp
|
| +++ b/third_party/WebKit/Source/core/html/HTMLEmbedElement.cpp
|
| @@ -147,12 +147,14 @@ void HTMLEmbedElement::updateWidgetInternal()
|
| if (!layoutObject())
|
| return;
|
|
|
| - // Overwrites the URL and MIME type of a Flash embed to use an
|
| - // HTML5 embed when possible.
|
| - KURL overridenUrl = document().frame()->loader().client()->overrideFlashEmbedWithHTML(document().completeURL(m_url));
|
| - if (!overridenUrl.isEmpty()) {
|
| - m_url = overridenUrl.getString();
|
| - m_serviceType = "text/html";
|
| + // Overwrites the URL and MIME type of a Flash embed to use an HTML5 embed
|
| + // when outside of a PluginDocument.
|
| + if (!document().isPluginDocument()) {
|
| + KURL overridenUrl = document().frame()->loader().client()->overrideFlashEmbedWithHTML(document().completeURL(m_url));
|
| + if (!overridenUrl.isEmpty()) {
|
| + m_url = overridenUrl.getString();
|
| + m_serviceType = "text/html";
|
| + }
|
| }
|
|
|
| requestObject(m_url, m_serviceType, paramNames, paramValues);
|
|
|