<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[190859] trunk</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://trac.webkit.org/projects/webkit/changeset/190859">190859</a></dd>
<dt>Author</dt> <dd>andersca@apple.com</dd>
<dt>Date</dt> <dd>2015-10-12 10:25:37 -0700 (Mon, 12 Oct 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>Don't allow plug-ins to override image types for <embed> elements
https://bugs.webkit.org/show_bug.cgi?id=149979
Reviewed by Tim Horton.
Source/WebCore:
Stop allowing plug-ins to take over image types for <embed> elements. We already do this
for <object> elements, but had to make <embed> elements exempt because of webkit.org/b/49016.
The QuickTime plug-in hasn't supported image types since Lion, so there's no point in keeping this code around.
* html/HTMLAppletElement.cpp:
(WebCore::HTMLAppletElement::HTMLAppletElement):
* html/HTMLEmbedElement.cpp:
(WebCore::HTMLEmbedElement::HTMLEmbedElement):
* html/HTMLObjectElement.cpp:
(WebCore::HTMLObjectElement::HTMLObjectElement):
(WebCore::HTMLObjectElement::parametersForPlugin):
* html/HTMLPlugInImageElement.cpp:
(WebCore::HTMLPlugInImageElement::HTMLPlugInImageElement):
(WebCore::HTMLPlugInImageElement::isImageType):
(WebCore::HTMLPlugInImageElement::wouldLoadAsNetscapePlugin):
* html/HTMLPlugInImageElement.h:
(WebCore::HTMLPlugInImageElement::shouldPreferPlugInsForImages): Deleted.
* loader/EmptyClients.h:
* loader/FrameLoaderClient.h:
* loader/SubframeLoader.cpp:
(WebCore::SubframeLoader::resourceWillUsePlugin):
(WebCore::SubframeLoader::requestObject):
(WebCore::SubframeLoader::shouldUsePlugin):
* loader/SubframeLoader.h:
Source/WebKit/mac:
* WebCoreSupport/WebFrameLoaderClient.h:
* WebCoreSupport/WebFrameLoaderClient.mm:
(WebFrameLoaderClient::objectContentType):
Source/WebKit/win:
* WebCoreSupport/WebFrameLoaderClient.cpp:
(WebFrameLoaderClient::objectContentType):
* WebCoreSupport/WebFrameLoaderClient.h:
Source/WebKit2:
* WebProcess/WebCoreSupport/WebFrameLoaderClient.cpp:
(WebKit::WebFrameLoaderClient::objectContentType):
* WebProcess/WebCoreSupport/WebFrameLoaderClient.h:
LayoutTests:
Remove test.
* platform/efl/TestExpectations:
* platform/gtk/TestExpectations:
* plugins/embed-prefers-plugins-for-images-expected.txt: Removed.
* plugins/embed-prefers-plugins-for-images.html: Removed.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsChangeLog">trunk/LayoutTests/ChangeLog</a></li>
<li><a href="#trunkLayoutTestsplatformeflTestExpectations">trunk/LayoutTests/platform/efl/TestExpectations</a></li>
<li><a href="#trunkLayoutTestsplatformgtkTestExpectations">trunk/LayoutTests/platform/gtk/TestExpectations</a></li>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCorehtmlHTMLAppletElementcpp">trunk/Source/WebCore/html/HTMLAppletElement.cpp</a></li>
<li><a href="#trunkSourceWebCorehtmlHTMLEmbedElementcpp">trunk/Source/WebCore/html/HTMLEmbedElement.cpp</a></li>
<li><a href="#trunkSourceWebCorehtmlHTMLObjectElementcpp">trunk/Source/WebCore/html/HTMLObjectElement.cpp</a></li>
<li><a href="#trunkSourceWebCorehtmlHTMLPlugInImageElementcpp">trunk/Source/WebCore/html/HTMLPlugInImageElement.cpp</a></li>
<li><a href="#trunkSourceWebCorehtmlHTMLPlugInImageElementh">trunk/Source/WebCore/html/HTMLPlugInImageElement.h</a></li>
<li><a href="#trunkSourceWebCoreloaderEmptyClientsh">trunk/Source/WebCore/loader/EmptyClients.h</a></li>
<li><a href="#trunkSourceWebCoreloaderFrameLoaderClienth">trunk/Source/WebCore/loader/FrameLoaderClient.h</a></li>
<li><a href="#trunkSourceWebCoreloaderSubframeLoadercpp">trunk/Source/WebCore/loader/SubframeLoader.cpp</a></li>
<li><a href="#trunkSourceWebCoreloaderSubframeLoaderh">trunk/Source/WebCore/loader/SubframeLoader.h</a></li>
<li><a href="#trunkSourceWebKitmacChangeLog">trunk/Source/WebKit/mac/ChangeLog</a></li>
<li><a href="#trunkSourceWebKitmacWebCoreSupportWebFrameLoaderClienth">trunk/Source/WebKit/mac/WebCoreSupport/WebFrameLoaderClient.h</a></li>
<li><a href="#trunkSourceWebKitmacWebCoreSupportWebFrameLoaderClientmm">trunk/Source/WebKit/mac/WebCoreSupport/WebFrameLoaderClient.mm</a></li>
<li><a href="#trunkSourceWebKitwinChangeLog">trunk/Source/WebKit/win/ChangeLog</a></li>
<li><a href="#trunkSourceWebKitwinWebCoreSupportWebFrameLoaderClientcpp">trunk/Source/WebKit/win/WebCoreSupport/WebFrameLoaderClient.cpp</a></li>
<li><a href="#trunkSourceWebKitwinWebCoreSupportWebFrameLoaderClienth">trunk/Source/WebKit/win/WebCoreSupport/WebFrameLoaderClient.h</a></li>
<li><a href="#trunkSourceWebKit2ChangeLog">trunk/Source/WebKit2/ChangeLog</a></li>
<li><a href="#trunkSourceWebKit2WebProcessWebCoreSupportWebFrameLoaderClientcpp">trunk/Source/WebKit2/WebProcess/WebCoreSupport/WebFrameLoaderClient.cpp</a></li>
<li><a href="#trunkSourceWebKit2WebProcessWebCoreSupportWebFrameLoaderClienth">trunk/Source/WebKit2/WebProcess/WebCoreSupport/WebFrameLoaderClient.h</a></li>
</ul>
<h3>Removed Paths</h3>
<ul>
<li><a href="#trunkLayoutTestspluginsembedpreferspluginsforimagesexpectedtxt">trunk/LayoutTests/plugins/embed-prefers-plugins-for-images-expected.txt</a></li>
<li><a href="#trunkLayoutTestspluginsembedpreferspluginsforimageshtml">trunk/LayoutTests/plugins/embed-prefers-plugins-for-images.html</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkLayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/ChangeLog (190858 => 190859)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/ChangeLog 2015-10-12 17:23:06 UTC (rev 190858)
+++ trunk/LayoutTests/ChangeLog 2015-10-12 17:25:37 UTC (rev 190859)
</span><span class="lines">@@ -1,3 +1,17 @@
</span><ins>+2015-10-09 Anders Carlsson <andersca@apple.com>
+
+ Don't allow plug-ins to override image types for <embed> elements
+ https://bugs.webkit.org/show_bug.cgi?id=149979
+
+ Reviewed by Tim Horton.
+
+ Remove test.
+
+ * platform/efl/TestExpectations:
+ * platform/gtk/TestExpectations:
+ * plugins/embed-prefers-plugins-for-images-expected.txt: Removed.
+ * plugins/embed-prefers-plugins-for-images.html: Removed.
+
</ins><span class="cx"> 2015-10-12 Ryan Haddad <ryanhaddad@apple.com>
</span><span class="cx">
</span><span class="cx"> Marking http/tests/notifications/events.html as flaky again as patch did not resolve crashes
</span></span></pre></div>
<a id="trunkLayoutTestsplatformeflTestExpectations"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/platform/efl/TestExpectations (190858 => 190859)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/platform/efl/TestExpectations 2015-10-12 17:23:06 UTC (rev 190858)
+++ trunk/LayoutTests/platform/efl/TestExpectations 2015-10-12 17:25:37 UTC (rev 190859)
</span><span class="lines">@@ -1954,8 +1954,6 @@
</span><span class="cx">
</span><span class="cx"> webkit.org/b/127725 media/video-restricted-no-preload-auto.html [ Failure ]
</span><span class="cx">
</span><del>-webkit.org/b/127731 plugins/embed-prefers-plugins-for-images.html [ Failure ]
-
</del><span class="cx"> # Subpixel rendering: borders are reporting float values.
</span><span class="cx"> webkit.org/b/128061 fast/block/float/016.html [ Failure ]
</span><span class="cx"> webkit.org/b/128061 fast/css/bidi-override-in-anonymous-block.html [ Failure ]
</span></span></pre></div>
<a id="trunkLayoutTestsplatformgtkTestExpectations"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/platform/gtk/TestExpectations (190858 => 190859)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/platform/gtk/TestExpectations 2015-10-12 17:23:06 UTC (rev 190858)
+++ trunk/LayoutTests/platform/gtk/TestExpectations 2015-10-12 17:25:37 UTC (rev 190859)
</span><span class="lines">@@ -682,7 +682,6 @@
</span><span class="cx"> webkit.org/b/131225 [ Debug ] media/track/track-remove-quickly.html [ Crash ]
</span><span class="cx">
</span><span class="cx"> webkit.org/b/131217 [ Debug ] plugins/no-mime-with-valid-extension.html [ Crash ]
</span><del>-webkit.org/b/131217 [ Debug ] plugins/embed-prefers-plugins-for-images.html [ Crash ]
</del><span class="cx">
</span><span class="cx"> webkit.org/b/105870 [ Debug ] webaudio/audiobuffersource-loop-points.html [ Crash ]
</span><span class="cx"> webkit.org/b/105870 [ Debug ] webaudio/audionode-channel-rules.html [ Crash Pass ]
</span></span></pre></div>
<a id="trunkLayoutTestspluginsembedpreferspluginsforimagesexpectedtxt"></a>
<div class="delfile"><h4>Deleted: trunk/LayoutTests/plugins/embed-prefers-plugins-for-images-expected.txt (190858 => 190859)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/plugins/embed-prefers-plugins-for-images-expected.txt 2015-10-12 17:23:06 UTC (rev 190858)
+++ trunk/LayoutTests/plugins/embed-prefers-plugins-for-images-expected.txt 2015-10-12 17:25:37 UTC (rev 190859)
</span><span class="lines">@@ -1,4 +0,0 @@
</span><del>-Test that WebKit will load a plug-in to render an image before rendering it natively.
-
-PASS
-
</del></span></pre></div>
<a id="trunkLayoutTestspluginsembedpreferspluginsforimageshtml"></a>
<div class="delfile"><h4>Deleted: trunk/LayoutTests/plugins/embed-prefers-plugins-for-images.html (190858 => 190859)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/plugins/embed-prefers-plugins-for-images.html 2015-10-12 17:23:06 UTC (rev 190858)
+++ trunk/LayoutTests/plugins/embed-prefers-plugins-for-images.html 2015-10-12 17:25:37 UTC (rev 190859)
</span><span class="lines">@@ -1,28 +0,0 @@
</span><del>-<script>
- if (window.testRunner) {
- testRunner.dumpAsText();
- testRunner.waitUntilDone();
- }
-
- function runTest()
- {
- var plugin = document.getElementById("plugin");
-
- // Both QuickTime and TestNetscapePlugIn register for image/png.
- if (plugin && (plugin.testCallback || plugin.GetQuickTimeVersion))
- logSuccess();
-
- if (window.testRunner)
- testRunner.notifyDone();
- }
-
- function logSuccess()
- {
- document.getElementById("console").innerHTML = "PASS";
- }
-</script>
-<body onload="runTest()">
-<p>Test that WebKit will load a plug-in to render an image before rendering it natively.</p>
-<div id="console">FAIL</div>
-<embed id="plugin" src="image.png">
-
</del><span class="cx">\ No newline at end of file
</span></span></pre></div>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (190858 => 190859)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2015-10-12 17:23:06 UTC (rev 190858)
+++ trunk/Source/WebCore/ChangeLog 2015-10-12 17:25:37 UTC (rev 190859)
</span><span class="lines">@@ -1,3 +1,35 @@
</span><ins>+2015-10-09 Anders Carlsson <andersca@apple.com>
+
+ Don't allow plug-ins to override image types for <embed> elements
+ https://bugs.webkit.org/show_bug.cgi?id=149979
+
+ Reviewed by Tim Horton.
+
+ Stop allowing plug-ins to take over image types for <embed> elements. We already do this
+ for <object> elements, but had to make <embed> elements exempt because of webkit.org/b/49016.
+ The QuickTime plug-in hasn't supported image types since Lion, so there's no point in keeping this code around.
+
+ * html/HTMLAppletElement.cpp:
+ (WebCore::HTMLAppletElement::HTMLAppletElement):
+ * html/HTMLEmbedElement.cpp:
+ (WebCore::HTMLEmbedElement::HTMLEmbedElement):
+ * html/HTMLObjectElement.cpp:
+ (WebCore::HTMLObjectElement::HTMLObjectElement):
+ (WebCore::HTMLObjectElement::parametersForPlugin):
+ * html/HTMLPlugInImageElement.cpp:
+ (WebCore::HTMLPlugInImageElement::HTMLPlugInImageElement):
+ (WebCore::HTMLPlugInImageElement::isImageType):
+ (WebCore::HTMLPlugInImageElement::wouldLoadAsNetscapePlugin):
+ * html/HTMLPlugInImageElement.h:
+ (WebCore::HTMLPlugInImageElement::shouldPreferPlugInsForImages): Deleted.
+ * loader/EmptyClients.h:
+ * loader/FrameLoaderClient.h:
+ * loader/SubframeLoader.cpp:
+ (WebCore::SubframeLoader::resourceWillUsePlugin):
+ (WebCore::SubframeLoader::requestObject):
+ (WebCore::SubframeLoader::shouldUsePlugin):
+ * loader/SubframeLoader.h:
+
</ins><span class="cx"> 2015-10-12 Zan Dobersek <zdobersek@igalia.com>
</span><span class="cx">
</span><span class="cx"> Unreviewed, fixing debug builds with Clang on Linux
</span></span></pre></div>
<a id="trunkSourceWebCorehtmlHTMLAppletElementcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/html/HTMLAppletElement.cpp (190858 => 190859)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/html/HTMLAppletElement.cpp 2015-10-12 17:23:06 UTC (rev 190858)
+++ trunk/Source/WebCore/html/HTMLAppletElement.cpp 2015-10-12 17:25:37 UTC (rev 190859)
</span><span class="lines">@@ -41,7 +41,7 @@
</span><span class="cx"> using namespace HTMLNames;
</span><span class="cx">
</span><span class="cx"> HTMLAppletElement::HTMLAppletElement(const QualifiedName& tagName, Document& document, bool createdByParser)
</span><del>- : HTMLPlugInImageElement(tagName, document, createdByParser, ShouldNotPreferPlugInsForImages)
</del><ins>+ : HTMLPlugInImageElement(tagName, document, createdByParser)
</ins><span class="cx"> {
</span><span class="cx"> ASSERT(hasTagName(appletTag));
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCorehtmlHTMLEmbedElementcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/html/HTMLEmbedElement.cpp (190858 => 190859)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/html/HTMLEmbedElement.cpp 2015-10-12 17:23:06 UTC (rev 190858)
+++ trunk/Source/WebCore/html/HTMLEmbedElement.cpp 2015-10-12 17:25:37 UTC (rev 190859)
</span><span class="lines">@@ -44,7 +44,7 @@
</span><span class="cx"> using namespace HTMLNames;
</span><span class="cx">
</span><span class="cx"> inline HTMLEmbedElement::HTMLEmbedElement(const QualifiedName& tagName, Document& document, bool createdByParser)
</span><del>- : HTMLPlugInImageElement(tagName, document, createdByParser, ShouldPreferPlugInsForImages)
</del><ins>+ : HTMLPlugInImageElement(tagName, document, createdByParser)
</ins><span class="cx"> {
</span><span class="cx"> ASSERT(hasTagName(embedTag));
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebCorehtmlHTMLObjectElementcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/html/HTMLObjectElement.cpp (190858 => 190859)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/html/HTMLObjectElement.cpp 2015-10-12 17:23:06 UTC (rev 190858)
+++ trunk/Source/WebCore/html/HTMLObjectElement.cpp 2015-10-12 17:25:37 UTC (rev 190859)
</span><span class="lines">@@ -64,7 +64,7 @@
</span><span class="cx"> using namespace HTMLNames;
</span><span class="cx">
</span><span class="cx"> inline HTMLObjectElement::HTMLObjectElement(const QualifiedName& tagName, Document& document, HTMLFormElement* form, bool createdByParser)
</span><del>- : HTMLPlugInImageElement(tagName, document, createdByParser, ShouldNotPreferPlugInsForImages)
</del><ins>+ : HTMLPlugInImageElement(tagName, document, createdByParser)
</ins><span class="cx"> , m_docNamedItem(true)
</span><span class="cx"> , m_useFallbackContent(false)
</span><span class="cx"> {
</span><span class="lines">@@ -228,7 +228,7 @@
</span><span class="cx">
</span><span class="cx"> if (url.isEmpty() && !urlParameter.isEmpty()) {
</span><span class="cx"> SubframeLoader& loader = document().frame()->loader().subframeLoader();
</span><del>- if (loader.resourceWillUsePlugin(urlParameter, serviceType, shouldPreferPlugInsForImages()))
</del><ins>+ if (loader.resourceWillUsePlugin(urlParameter, serviceType))
</ins><span class="cx"> url = urlParameter;
</span><span class="cx"> }
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebCorehtmlHTMLPlugInImageElementcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/html/HTMLPlugInImageElement.cpp (190858 => 190859)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/html/HTMLPlugInImageElement.cpp 2015-10-12 17:23:06 UTC (rev 190858)
+++ trunk/Source/WebCore/html/HTMLPlugInImageElement.cpp 2015-10-12 17:25:37 UTC (rev 190859)
</span><span class="lines">@@ -99,14 +99,13 @@
</span><span class="cx"> return subtitleText;
</span><span class="cx"> };
</span><span class="cx">
</span><del>-HTMLPlugInImageElement::HTMLPlugInImageElement(const QualifiedName& tagName, Document& document, bool createdByParser, PreferPlugInsForImagesOption preferPlugInsForImagesOption)
</del><ins>+HTMLPlugInImageElement::HTMLPlugInImageElement(const QualifiedName& tagName, Document& document, bool createdByParser)
</ins><span class="cx"> : HTMLPlugInElement(tagName, document)
</span><span class="cx"> // m_needsWidgetUpdate(!createdByParser) allows HTMLObjectElement to delay
</span><span class="cx"> // widget updates until after all children are parsed. For HTMLEmbedElement
</span><span class="cx"> // this delay is unnecessary, but it is simpler to make both classes share
</span><span class="cx"> // the same codepath in this class.
</span><span class="cx"> , m_needsWidgetUpdate(!createdByParser)
</span><del>- , m_shouldPreferPlugInsForImages(preferPlugInsForImagesOption == ShouldPreferPlugInsForImages)
</del><span class="cx"> , m_needsDocumentActivationCallbacks(false)
</span><span class="cx"> , m_simulatedMouseClickTimer(*this, &HTMLPlugInImageElement::simulatedMouseClickTimerFired, simulatedMouseClickTimerDelay)
</span><span class="cx"> , m_removeSnapshotTimer(*this, &HTMLPlugInImageElement::removeSnapshotTimerFired)
</span><span class="lines">@@ -156,7 +155,7 @@
</span><span class="cx">
</span><span class="cx"> if (Frame* frame = document().frame()) {
</span><span class="cx"> URL completedURL = document().completeURL(m_url);
</span><del>- return frame->loader().client().objectContentType(completedURL, m_serviceType, shouldPreferPlugInsForImages()) == ObjectContentImage;
</del><ins>+ return frame->loader().client().objectContentType(completedURL, m_serviceType) == ObjectContentImage;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> return Image::supportsType(m_serviceType);
</span><span class="lines">@@ -185,7 +184,7 @@
</span><span class="cx"> completedURL = document().completeURL(url);
</span><span class="cx">
</span><span class="cx"> FrameLoader& frameLoader = document().frame()->loader();
</span><del>- if (frameLoader.client().objectContentType(completedURL, serviceType, shouldPreferPlugInsForImages()) == ObjectContentNetscapePlugin)
</del><ins>+ if (frameLoader.client().objectContentType(completedURL, serviceType) == ObjectContentNetscapePlugin)
</ins><span class="cx"> return true;
</span><span class="cx"> return false;
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebCorehtmlHTMLPlugInImageElementh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/html/HTMLPlugInImageElement.h (190858 => 190859)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/html/HTMLPlugInImageElement.h 2015-10-12 17:23:06 UTC (rev 190858)
+++ trunk/Source/WebCore/html/HTMLPlugInImageElement.h 2015-10-12 17:25:37 UTC (rev 190859)
</span><span class="lines">@@ -61,8 +61,6 @@
</span><span class="cx"> return mimeType;
</span><span class="cx"> }
</span><span class="cx">
</span><del>- bool shouldPreferPlugInsForImages() const { return m_shouldPreferPlugInsForImages; }
-
</del><span class="cx"> // Public for FrameView::addWidgetToUpdate()
</span><span class="cx"> bool needsWidgetUpdate() const { return m_needsWidgetUpdate; }
</span><span class="cx"> void setNeedsWidgetUpdate(bool needsWidgetUpdate) { m_needsWidgetUpdate = needsWidgetUpdate; }
</span><span class="lines">@@ -93,8 +91,7 @@
</span><span class="cx"> SnapshotDecision snapshotDecision() const { return m_snapshotDecision; }
</span><span class="cx">
</span><span class="cx"> protected:
</span><del>- enum PreferPlugInsForImagesOption { ShouldPreferPlugInsForImages, ShouldNotPreferPlugInsForImages };
- HTMLPlugInImageElement(const QualifiedName& tagName, Document&, bool createdByParser, PreferPlugInsForImagesOption);
</del><ins>+ HTMLPlugInImageElement(const QualifiedName& tagName, Document&, bool createdByParser);
</ins><span class="cx">
</span><span class="cx"> virtual void didMoveToNewDocument(Document* oldDocument) override;
</span><span class="cx"> virtual bool requestObject(const String& url, const String& mimeType, const Vector<String>& paramNames, const Vector<String>& paramValues) override final;
</span><span class="lines">@@ -142,7 +139,6 @@
</span><span class="cx">
</span><span class="cx"> URL m_loadedUrl;
</span><span class="cx"> bool m_needsWidgetUpdate;
</span><del>- bool m_shouldPreferPlugInsForImages;
</del><span class="cx"> bool m_needsDocumentActivationCallbacks;
</span><span class="cx"> RefPtr<MouseEvent> m_pendingClickEventFromSnapshot;
</span><span class="cx"> DeferrableOneShotTimer m_simulatedMouseClickTimer;
</span></span></pre></div>
<a id="trunkSourceWebCoreloaderEmptyClientsh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/loader/EmptyClients.h (190858 => 190859)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/loader/EmptyClients.h 2015-10-12 17:23:06 UTC (rev 190858)
+++ trunk/Source/WebCore/loader/EmptyClients.h 2015-10-12 17:25:37 UTC (rev 190859)
</span><span class="lines">@@ -376,7 +376,7 @@
</span><span class="cx"> virtual void recreatePlugin(Widget*) override;
</span><span class="cx"> virtual PassRefPtr<Widget> createJavaAppletWidget(const IntSize&, HTMLAppletElement*, const URL&, const Vector<String>&, const Vector<String>&) override;
</span><span class="cx">
</span><del>- virtual ObjectContentType objectContentType(const URL&, const String&, bool) override { return ObjectContentType(); }
</del><ins>+ virtual ObjectContentType objectContentType(const URL&, const String&) override { return ObjectContentType(); }
</ins><span class="cx"> virtual String overrideMediaType() const override { return String(); }
</span><span class="cx">
</span><span class="cx"> virtual void redirectDataToPlugin(Widget*) override { }
</span></span></pre></div>
<a id="trunkSourceWebCoreloaderFrameLoaderClienth"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/loader/FrameLoaderClient.h (190858 => 190859)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/loader/FrameLoaderClient.h 2015-10-12 17:23:06 UTC (rev 190858)
+++ trunk/Source/WebCore/loader/FrameLoaderClient.h 2015-10-12 17:25:37 UTC (rev 190859)
</span><span class="lines">@@ -281,7 +281,7 @@
</span><span class="cx">
</span><span class="cx"> virtual void dispatchDidFailToStartPlugin(const PluginViewBase*) const { }
</span><span class="cx">
</span><del>- virtual ObjectContentType objectContentType(const URL&, const String& mimeType, bool shouldPreferPlugInsForImages) = 0;
</del><ins>+ virtual ObjectContentType objectContentType(const URL&, const String& mimeType) = 0;
</ins><span class="cx"> virtual String overrideMediaType() const = 0;
</span><span class="cx">
</span><span class="cx"> virtual void dispatchDidClearWindowObjectInWorld(DOMWrapperWorld&) = 0;
</span></span></pre></div>
<a id="trunkSourceWebCoreloaderSubframeLoadercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/loader/SubframeLoader.cpp (190858 => 190859)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/loader/SubframeLoader.cpp 2015-10-12 17:23:06 UTC (rev 190858)
+++ trunk/Source/WebCore/loader/SubframeLoader.cpp 2015-10-12 17:25:37 UTC (rev 190859)
</span><span class="lines">@@ -94,14 +94,14 @@
</span><span class="cx"> return true;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-bool SubframeLoader::resourceWillUsePlugin(const String& url, const String& mimeType, bool shouldPreferPlugInsForImages)
</del><ins>+bool SubframeLoader::resourceWillUsePlugin(const String& url, const String& mimeType)
</ins><span class="cx"> {
</span><span class="cx"> URL completedURL;
</span><span class="cx"> if (!url.isEmpty())
</span><span class="cx"> completedURL = completeURL(url);
</span><span class="cx">
</span><span class="cx"> bool useFallback;
</span><del>- return shouldUsePlugin(completedURL, mimeType, shouldPreferPlugInsForImages, false, useFallback);
</del><ins>+ return shouldUsePlugin(completedURL, mimeType, false, useFallback);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> bool SubframeLoader::pluginIsLoadable(HTMLPlugInImageElement& pluginElement, const URL& url, const String& mimeType)
</span><span class="lines">@@ -221,7 +221,7 @@
</span><span class="cx"> bool hasFallbackContent = is<HTMLObjectElement>(ownerElement) && downcast<HTMLObjectElement>(ownerElement).hasFallbackContent();
</span><span class="cx">
</span><span class="cx"> bool useFallback;
</span><del>- if (shouldUsePlugin(completedURL, mimeType, ownerElement.shouldPreferPlugInsForImages(), hasFallbackContent, useFallback)) {
</del><ins>+ if (shouldUsePlugin(completedURL, mimeType, hasFallbackContent, useFallback)) {
</ins><span class="cx"> bool success = requestPlugin(ownerElement, completedURL, mimeType, paramNames, paramValues, useFallback);
</span><span class="cx"> logPluginRequest(document()->page(), mimeType, completedURL, success);
</span><span class="cx"> return success;
</span><span class="lines">@@ -367,17 +367,18 @@
</span><span class="cx"> return m_frame.settings().arePluginsEnabled();
</span><span class="cx"> }
</span><span class="cx">
</span><del>-bool SubframeLoader::shouldUsePlugin(const URL& url, const String& mimeType, bool shouldPreferPlugInsForImages, bool hasFallback, bool& useFallback)
</del><ins>+bool SubframeLoader::shouldUsePlugin(const URL& url, const String& mimeType, bool hasFallback, bool& useFallback)
</ins><span class="cx"> {
</span><span class="cx"> if (m_frame.loader().client().shouldAlwaysUsePluginDocument(mimeType)) {
</span><span class="cx"> useFallback = false;
</span><span class="cx"> return true;
</span><span class="cx"> }
</span><span class="cx">
</span><del>- ObjectContentType objectType = m_frame.loader().client().objectContentType(url, mimeType, shouldPreferPlugInsForImages);
</del><ins>+ ObjectContentType objectType = m_frame.loader().client().objectContentType(url, mimeType);
</ins><span class="cx"> // If an object's content can't be handled and it has no fallback, let
</span><span class="cx"> // it be handled as a plugin to show the broken plugin icon.
</span><span class="cx"> useFallback = objectType == ObjectContentNone && hasFallback;
</span><ins>+
</ins><span class="cx"> return objectType == ObjectContentNone || objectType == ObjectContentNetscapePlugin || objectType == ObjectContentOtherPlugin;
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCoreloaderSubframeLoaderh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/loader/SubframeLoader.h (190858 => 190859)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/loader/SubframeLoader.h 2015-10-12 17:23:06 UTC (rev 190858)
+++ trunk/Source/WebCore/loader/SubframeLoader.h 2015-10-12 17:25:37 UTC (rev 190859)
</span><span class="lines">@@ -69,7 +69,7 @@
</span><span class="cx">
</span><span class="cx"> bool containsPlugins() const { return m_containsPlugins; }
</span><span class="cx">
</span><del>- bool resourceWillUsePlugin(const String& url, const String& mimeType, bool shouldPreferPlugInsForImages);
</del><ins>+ bool resourceWillUsePlugin(const String& url, const String& mimeType);
</ins><span class="cx">
</span><span class="cx"> private:
</span><span class="cx"> bool requestPlugin(HTMLPlugInImageElement&, const URL&, const String& serviceType, const Vector<String>& paramNames, const Vector<String>& paramValues, bool useFallback);
</span><span class="lines">@@ -77,7 +77,7 @@
</span><span class="cx"> Frame* loadSubframe(HTMLFrameOwnerElement&, const URL&, const String& name, const String& referrer);
</span><span class="cx"> bool loadPlugin(HTMLPlugInImageElement&, const URL&, const String& mimeType, const Vector<String>& paramNames, const Vector<String>& paramValues, bool useFallback);
</span><span class="cx">
</span><del>- bool shouldUsePlugin(const URL&, const String& mimeType, bool shouldPreferPlugInsForImages, bool hasFallback, bool& useFallback);
</del><ins>+ bool shouldUsePlugin(const URL&, const String& mimeType, bool hasFallback, bool& useFallback);
</ins><span class="cx"> bool pluginIsLoadable(HTMLPlugInImageElement&, const URL&, const String& mimeType);
</span><span class="cx">
</span><span class="cx"> Document* document() const;
</span></span></pre></div>
<a id="trunkSourceWebKitmacChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/mac/ChangeLog (190858 => 190859)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/mac/ChangeLog 2015-10-12 17:23:06 UTC (rev 190858)
+++ trunk/Source/WebKit/mac/ChangeLog 2015-10-12 17:25:37 UTC (rev 190859)
</span><span class="lines">@@ -1,3 +1,14 @@
</span><ins>+2015-10-09 Anders Carlsson <andersca@apple.com>
+
+ Don't allow plug-ins to override image types for <embed> elements
+ https://bugs.webkit.org/show_bug.cgi?id=149979
+
+ Reviewed by Tim Horton.
+
+ * WebCoreSupport/WebFrameLoaderClient.h:
+ * WebCoreSupport/WebFrameLoaderClient.mm:
+ (WebFrameLoaderClient::objectContentType):
+
</ins><span class="cx"> 2015-10-10 Dan Bernstein <mitz@apple.com>
</span><span class="cx">
</span><span class="cx"> [iOS] Remove unnecessary iOS version checks
</span></span></pre></div>
<a id="trunkSourceWebKitmacWebCoreSupportWebFrameLoaderClienth"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/mac/WebCoreSupport/WebFrameLoaderClient.h (190858 => 190859)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/mac/WebCoreSupport/WebFrameLoaderClient.h 2015-10-12 17:23:06 UTC (rev 190858)
+++ trunk/Source/WebKit/mac/WebCoreSupport/WebFrameLoaderClient.h 2015-10-12 17:25:37 UTC (rev 190859)
</span><span class="lines">@@ -213,7 +213,7 @@
</span><span class="cx"> virtual PassRefPtr<WebCore::Widget> createJavaAppletWidget(const WebCore::IntSize&, WebCore::HTMLAppletElement*, const WebCore::URL& baseURL,
</span><span class="cx"> const Vector<WTF::String>& paramNames, const Vector<WTF::String>& paramValues) override;
</span><span class="cx">
</span><del>- virtual WebCore::ObjectContentType objectContentType(const WebCore::URL&, const WTF::String& mimeType, bool shouldPreferPlugInsForImages) override;
</del><ins>+ virtual WebCore::ObjectContentType objectContentType(const WebCore::URL&, const WTF::String& mimeType) override;
</ins><span class="cx"> virtual WTF::String overrideMediaType() const override;
</span><span class="cx">
</span><span class="cx"> virtual void dispatchDidClearWindowObjectInWorld(WebCore::DOMWrapperWorld&) override;
</span></span></pre></div>
<a id="trunkSourceWebKitmacWebCoreSupportWebFrameLoaderClientmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/mac/WebCoreSupport/WebFrameLoaderClient.mm (190858 => 190859)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/mac/WebCoreSupport/WebFrameLoaderClient.mm 2015-10-12 17:23:06 UTC (rev 190858)
+++ trunk/Source/WebKit/mac/WebCoreSupport/WebFrameLoaderClient.mm 2015-10-12 17:25:37 UTC (rev 190859)
</span><span class="lines">@@ -1651,7 +1651,7 @@
</span><span class="cx"> return nullptr;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-ObjectContentType WebFrameLoaderClient::objectContentType(const URL& url, const String& mimeType, bool shouldPreferPlugInsForImages)
</del><ins>+ObjectContentType WebFrameLoaderClient::objectContentType(const URL& url, const String& mimeType)
</ins><span class="cx"> {
</span><span class="cx"> BEGIN_BLOCK_OBJC_EXCEPTIONS;
</span><span class="cx">
</span><span class="lines">@@ -1697,7 +1697,7 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> if (MIMETypeRegistry::isSupportedImageMIMEType(type))
</span><del>- return shouldPreferPlugInsForImages && plugInType != ObjectContentNone ? plugInType : ObjectContentImage;
</del><ins>+ return ObjectContentImage;
</ins><span class="cx">
</span><span class="cx"> if (plugInType != ObjectContentNone)
</span><span class="cx"> return plugInType;
</span></span></pre></div>
<a id="trunkSourceWebKitwinChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/win/ChangeLog (190858 => 190859)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/win/ChangeLog 2015-10-12 17:23:06 UTC (rev 190858)
+++ trunk/Source/WebKit/win/ChangeLog 2015-10-12 17:25:37 UTC (rev 190859)
</span><span class="lines">@@ -1,3 +1,14 @@
</span><ins>+2015-10-09 Anders Carlsson <andersca@apple.com>
+
+ Don't allow plug-ins to override image types for <embed> elements
+ https://bugs.webkit.org/show_bug.cgi?id=149979
+
+ Reviewed by Tim Horton.
+
+ * WebCoreSupport/WebFrameLoaderClient.cpp:
+ (WebFrameLoaderClient::objectContentType):
+ * WebCoreSupport/WebFrameLoaderClient.h:
+
</ins><span class="cx"> 2015-10-06 Alex Christensen <achristensen@webkit.org>
</span><span class="cx">
</span><span class="cx"> Report error when main resource is blocked by content blocker
</span></span></pre></div>
<a id="trunkSourceWebKitwinWebCoreSupportWebFrameLoaderClientcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/win/WebCoreSupport/WebFrameLoaderClient.cpp (190858 => 190859)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/win/WebCoreSupport/WebFrameLoaderClient.cpp 2015-10-12 17:23:06 UTC (rev 190858)
+++ trunk/Source/WebKit/win/WebCoreSupport/WebFrameLoaderClient.cpp 2015-10-12 17:25:37 UTC (rev 190859)
</span><span class="lines">@@ -1084,7 +1084,7 @@
</span><span class="cx"> return childFrame;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-ObjectContentType WebFrameLoaderClient::objectContentType(const URL& url, const String& mimeTypeIn, bool shouldPreferPlugInsForImages)
</del><ins>+ObjectContentType WebFrameLoaderClient::objectContentType(const URL& url, const String& mimeTypeIn)
</ins><span class="cx"> {
</span><span class="cx"> String mimeType = mimeTypeIn;
</span><span class="cx">
</span><span class="lines">@@ -1102,7 +1102,7 @@
</span><span class="cx"> bool plugInSupportsMIMEType = PluginDatabase::installedPlugins()->isMIMETypeRegistered(mimeType);
</span><span class="cx">
</span><span class="cx"> if (MIMETypeRegistry::isSupportedImageMIMEType(mimeType))
</span><del>- return shouldPreferPlugInsForImages && plugInSupportsMIMEType ? WebCore::ObjectContentNetscapePlugin : WebCore::ObjectContentImage;
</del><ins>+ return WebCore::ObjectContentImage;
</ins><span class="cx">
</span><span class="cx"> if (plugInSupportsMIMEType)
</span><span class="cx"> return WebCore::ObjectContentNetscapePlugin;
</span></span></pre></div>
<a id="trunkSourceWebKitwinWebCoreSupportWebFrameLoaderClienth"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/win/WebCoreSupport/WebFrameLoaderClient.h (190858 => 190859)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/win/WebCoreSupport/WebFrameLoaderClient.h 2015-10-12 17:23:06 UTC (rev 190858)
+++ trunk/Source/WebKit/win/WebCoreSupport/WebFrameLoaderClient.h 2015-10-12 17:25:37 UTC (rev 190859)
</span><span class="lines">@@ -189,7 +189,7 @@
</span><span class="cx">
</span><span class="cx"> virtual PassRefPtr<WebCore::Widget> createJavaAppletWidget(const WebCore::IntSize&, WebCore::HTMLAppletElement*, const WebCore::URL& baseURL, const Vector<WTF::String>& paramNames, const Vector<WTF::String>& paramValues) override;
</span><span class="cx">
</span><del>- virtual WebCore::ObjectContentType objectContentType(const WebCore::URL&, const WTF::String& mimeType, bool shouldPreferPlugInsForImages) override;
</del><ins>+ virtual WebCore::ObjectContentType objectContentType(const WebCore::URL&, const WTF::String& mimeType) override;
</ins><span class="cx"> virtual WTF::String overrideMediaType() const override;
</span><span class="cx">
</span><span class="cx"> virtual void dispatchDidClearWindowObjectInWorld(WebCore::DOMWrapperWorld&) override;
</span></span></pre></div>
<a id="trunkSourceWebKit2ChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/ChangeLog (190858 => 190859)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/ChangeLog 2015-10-12 17:23:06 UTC (rev 190858)
+++ trunk/Source/WebKit2/ChangeLog 2015-10-12 17:25:37 UTC (rev 190859)
</span><span class="lines">@@ -1,3 +1,14 @@
</span><ins>+2015-10-09 Anders Carlsson <andersca@apple.com>
+
+ Don't allow plug-ins to override image types for <embed> elements
+ https://bugs.webkit.org/show_bug.cgi?id=149979
+
+ Reviewed by Tim Horton.
+
+ * WebProcess/WebCoreSupport/WebFrameLoaderClient.cpp:
+ (WebKit::WebFrameLoaderClient::objectContentType):
+ * WebProcess/WebCoreSupport/WebFrameLoaderClient.h:
+
</ins><span class="cx"> 2015-10-12 Gyuyoung Kim <gyuyoung.kim@webkit.org>
</span><span class="cx">
</span><span class="cx"> [EFL] Bump Version/X in user agent
</span></span></pre></div>
<a id="trunkSourceWebKit2WebProcessWebCoreSupportWebFrameLoaderClientcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/WebCoreSupport/WebFrameLoaderClient.cpp (190858 => 190859)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/WebCoreSupport/WebFrameLoaderClient.cpp 2015-10-12 17:23:06 UTC (rev 190858)
+++ trunk/Source/WebKit2/WebProcess/WebCoreSupport/WebFrameLoaderClient.cpp 2015-10-12 17:25:37 UTC (rev 190859)
</span><span class="lines">@@ -1512,7 +1512,7 @@
</span><span class="cx"> return false;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-ObjectContentType WebFrameLoaderClient::objectContentType(const URL& url, const String& mimeTypeIn, bool shouldPreferPlugInsForImages)
</del><ins>+ObjectContentType WebFrameLoaderClient::objectContentType(const URL& url, const String& mimeTypeIn)
</ins><span class="cx"> {
</span><span class="cx"> // FIXME: This should be merged with WebCore::FrameLoader::defaultObjectContentType when the plugin code
</span><span class="cx"> // is consolidated.
</span><span class="lines">@@ -1546,7 +1546,7 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> if (MIMETypeRegistry::isSupportedImageMIMEType(mimeType))
</span><del>- return shouldPreferPlugInsForImages && plugInSupportsMIMEType ? ObjectContentNetscapePlugin : ObjectContentImage;
</del><ins>+ return ObjectContentImage;
</ins><span class="cx">
</span><span class="cx"> if (plugInSupportsMIMEType)
</span><span class="cx"> return ObjectContentNetscapePlugin;
</span></span></pre></div>
<a id="trunkSourceWebKit2WebProcessWebCoreSupportWebFrameLoaderClienth"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/WebCoreSupport/WebFrameLoaderClient.h (190858 => 190859)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/WebCoreSupport/WebFrameLoaderClient.h 2015-10-12 17:23:06 UTC (rev 190858)
+++ trunk/Source/WebKit2/WebProcess/WebCoreSupport/WebFrameLoaderClient.h 2015-10-12 17:25:37 UTC (rev 190859)
</span><span class="lines">@@ -200,7 +200,7 @@
</span><span class="cx">
</span><span class="cx"> virtual PassRefPtr<WebCore::Widget> createJavaAppletWidget(const WebCore::IntSize&, WebCore::HTMLAppletElement*, const WebCore::URL& baseURL, const Vector<String>& paramNames, const Vector<String>& paramValues) override;
</span><span class="cx">
</span><del>- virtual WebCore::ObjectContentType objectContentType(const WebCore::URL&, const String& mimeType, bool shouldPreferPlugInsForImages) override;
</del><ins>+ virtual WebCore::ObjectContentType objectContentType(const WebCore::URL&, const String& mimeType) override;
</ins><span class="cx"> virtual String overrideMediaType() const override;
</span><span class="cx">
</span><span class="cx"> virtual void dispatchDidClearWindowObjectInWorld(WebCore::DOMWrapperWorld&) override;
</span></span></pre>
</div>
</div>
</body>
</html>