Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1583)

Unified Diff: third_party/WebKit/Source/core/html/HTMLEmbedElement.cpp

Issue 2238983002: Do not try to use an HTML embed instead of a Flash one inside a PluginDocument. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 years, 4 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
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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
pdr. 2016/08/11 23:21:53 I see on the bug that this will be very difficult
mlamouri (slow - plz ping) 2016/08/12 10:27:32 I've changed the ASSERT() to a CHECK(). FWIW, a r
+ // when outside of a PluginDocument.
+ if (!document().isPluginDocument()) {
pdr. 2016/08/11 23:21:53 Instead of a blacklist, can this be a whitelist? I
mlamouri (slow - plz ping) 2016/08/12 10:27:32 The issue is really that the PluginDocument is mak
+ 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);
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698