<!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>[187891] trunk/Source</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/187891">187891</a></dd>
<dt>Author</dt> <dd>andersca@apple.com</dd>
<dt>Date</dt> <dd>2015-08-04 14:41:02 -0700 (Tue, 04 Aug 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>Get rid of ReasonForCallingAllowPlugins since it's not used anywhere
https://bugs.webkit.org/show_bug.cgi?id=147648
Reviewed by Andreas Kling.
Source/WebCore:
* dom/DOMImplementation.cpp:
(WebCore::DOMImplementation::createDocument):
* html/HTMLElement.cpp:
(WebCore::HTMLElement::rendererIsNeeded):
* html/parser/HTMLParserOptions.cpp:
(WebCore::HTMLParserOptions::HTMLParserOptions):
* loader/FrameLoaderTypes.h:
* loader/SubframeLoader.cpp:
(WebCore::SubframeLoader::requestPlugin):
(WebCore::SubframeLoader::createJavaAppletWidget):
(WebCore::SubframeLoader::allowPlugins):
* loader/SubframeLoader.h:
* plugins/DOMMimeType.cpp:
(WebCore::DOMMimeType::enabledPlugin):
Source/WebKit/mac:
* WebCoreSupport/WebPlatformStrategies.mm:
(WebPlatformStrategies::getPluginInfo):
* WebView/WebFrame.mm:
(-[WebFrame _canProvideDocumentSource]):
Source/WebKit/win:
* WebView.cpp:
(WebView::canShowMIMEType):
Source/WebKit2:
* WebProcess/WebCoreSupport/WebFrameLoaderClient.cpp:
(WebKit::WebFrameLoaderClient::objectContentType):
* WebProcess/WebCoreSupport/WebPlatformStrategies.cpp:
(WebKit::WebPlatformStrategies::getPluginInfo):
* WebProcess/WebPage/WebPage.cpp:
(WebKit::WebPage::createPlugin):
(WebKit::WebPage::canPluginHandleResponse):
(WebKit::WebPage::canShowMIMEType):</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoredomDOMImplementationcpp">trunk/Source/WebCore/dom/DOMImplementation.cpp</a></li>
<li><a href="#trunkSourceWebCorehtmlHTMLElementcpp">trunk/Source/WebCore/html/HTMLElement.cpp</a></li>
<li><a href="#trunkSourceWebCorehtmlparserHTMLParserOptionscpp">trunk/Source/WebCore/html/parser/HTMLParserOptions.cpp</a></li>
<li><a href="#trunkSourceWebCoreloaderFrameLoaderTypesh">trunk/Source/WebCore/loader/FrameLoaderTypes.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="#trunkSourceWebCorepluginsDOMMimeTypecpp">trunk/Source/WebCore/plugins/DOMMimeType.cpp</a></li>
<li><a href="#trunkSourceWebKitmacChangeLog">trunk/Source/WebKit/mac/ChangeLog</a></li>
<li><a href="#trunkSourceWebKitmacWebCoreSupportWebPlatformStrategiesmm">trunk/Source/WebKit/mac/WebCoreSupport/WebPlatformStrategies.mm</a></li>
<li><a href="#trunkSourceWebKitmacWebViewWebFramemm">trunk/Source/WebKit/mac/WebView/WebFrame.mm</a></li>
<li><a href="#trunkSourceWebKitwinChangeLog">trunk/Source/WebKit/win/ChangeLog</a></li>
<li><a href="#trunkSourceWebKitwinWebViewcpp">trunk/Source/WebKit/win/WebView.cpp</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="#trunkSourceWebKit2WebProcessWebCoreSupportWebPlatformStrategiescpp">trunk/Source/WebKit2/WebProcess/WebCoreSupport/WebPlatformStrategies.cpp</a></li>
<li><a href="#trunkSourceWebKit2WebProcessWebPageWebPagecpp">trunk/Source/WebKit2/WebProcess/WebPage/WebPage.cpp</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (187890 => 187891)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2015-08-04 21:26:49 UTC (rev 187890)
+++ trunk/Source/WebCore/ChangeLog 2015-08-04 21:41:02 UTC (rev 187891)
</span><span class="lines">@@ -1,3 +1,25 @@
</span><ins>+2015-08-04 Anders Carlsson <andersca@apple.com>
+
+ Get rid of ReasonForCallingAllowPlugins since it's not used anywhere
+ https://bugs.webkit.org/show_bug.cgi?id=147648
+
+ Reviewed by Andreas Kling.
+
+ * dom/DOMImplementation.cpp:
+ (WebCore::DOMImplementation::createDocument):
+ * html/HTMLElement.cpp:
+ (WebCore::HTMLElement::rendererIsNeeded):
+ * html/parser/HTMLParserOptions.cpp:
+ (WebCore::HTMLParserOptions::HTMLParserOptions):
+ * loader/FrameLoaderTypes.h:
+ * loader/SubframeLoader.cpp:
+ (WebCore::SubframeLoader::requestPlugin):
+ (WebCore::SubframeLoader::createJavaAppletWidget):
+ (WebCore::SubframeLoader::allowPlugins):
+ * loader/SubframeLoader.h:
+ * plugins/DOMMimeType.cpp:
+ (WebCore::DOMMimeType::enabledPlugin):
+
</ins><span class="cx"> 2015-08-04 Alex Christensen <achristensen@webkit.org>
</span><span class="cx">
</span><span class="cx"> Fix debug CMake build on Windows after r187818.
</span></span></pre></div>
<a id="trunkSourceWebCoredomDOMImplementationcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/dom/DOMImplementation.cpp (187890 => 187891)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/dom/DOMImplementation.cpp 2015-08-04 21:26:49 UTC (rev 187890)
+++ trunk/Source/WebCore/dom/DOMImplementation.cpp 2015-08-04 21:41:02 UTC (rev 187891)
</span><span class="lines">@@ -318,10 +318,10 @@
</span><span class="cx"> if (frame && !frame->isMainFrame() && MIMETypeRegistry::isPDFMIMEType(type) && frame->settings().useImageDocumentForSubframePDF())
</span><span class="cx"> return ImageDocument::create(*frame, url);
</span><span class="cx">
</span><del>- PluginData* pluginData = 0;
</del><ins>+ PluginData* pluginData = nullptr;
</ins><span class="cx"> PluginData::AllowedPluginTypes allowedPluginTypes = PluginData::OnlyApplicationPlugins;
</span><span class="cx"> if (frame && frame->page()) {
</span><del>- if (frame->loader().subframeLoader().allowPlugins(NotAboutToInstantiatePlugin))
</del><ins>+ if (frame->loader().subframeLoader().allowPlugins())
</ins><span class="cx"> allowedPluginTypes = PluginData::AllPlugins;
</span><span class="cx">
</span><span class="cx"> pluginData = &frame->page()->pluginData();
</span></span></pre></div>
<a id="trunkSourceWebCorehtmlHTMLElementcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/html/HTMLElement.cpp (187890 => 187891)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/html/HTMLElement.cpp 2015-08-04 21:26:49 UTC (rev 187890)
+++ trunk/Source/WebCore/html/HTMLElement.cpp 2015-08-04 21:41:02 UTC (rev 187891)
</span><span class="lines">@@ -869,7 +869,7 @@
</span><span class="cx"> return false;
</span><span class="cx"> } else if (hasTagName(noembedTag)) {
</span><span class="cx"> Frame* frame = document().frame();
</span><del>- if (frame && frame->loader().subframeLoader().allowPlugins(NotAboutToInstantiatePlugin))
</del><ins>+ if (frame && frame->loader().subframeLoader().allowPlugins())
</ins><span class="cx"> return false;
</span><span class="cx"> }
</span><span class="cx"> return StyledElement::rendererIsNeeded(style);
</span></span></pre></div>
<a id="trunkSourceWebCorehtmlparserHTMLParserOptionscpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/html/parser/HTMLParserOptions.cpp (187890 => 187891)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/html/parser/HTMLParserOptions.cpp 2015-08-04 21:26:49 UTC (rev 187890)
+++ trunk/Source/WebCore/html/parser/HTMLParserOptions.cpp 2015-08-04 21:41:02 UTC (rev 187891)
</span><span class="lines">@@ -47,7 +47,7 @@
</span><span class="cx"> {
</span><span class="cx"> Frame* frame = document.frame();
</span><span class="cx"> scriptEnabled = frame && frame->script().canExecuteScripts(NotAboutToExecuteScript);
</span><del>- pluginsEnabled = frame && frame->loader().subframeLoader().allowPlugins(NotAboutToInstantiatePlugin);
</del><ins>+ pluginsEnabled = frame && frame->loader().subframeLoader().allowPlugins();
</ins><span class="cx">
</span><span class="cx"> Settings* settings = document.settings();
</span><span class="cx"> usePreHTML5ParserQuirks = settings && settings->usePreHTML5ParserQuirks();
</span></span></pre></div>
<a id="trunkSourceWebCoreloaderFrameLoaderTypesh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/loader/FrameLoaderTypes.h (187890 => 187891)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/loader/FrameLoaderTypes.h 2015-08-04 21:26:49 UTC (rev 187890)
+++ trunk/Source/WebCore/loader/FrameLoaderTypes.h 2015-08-04 21:41:02 UTC (rev 187891)
</span><span class="lines">@@ -110,11 +110,6 @@
</span><span class="cx"> DoNotReplaceDocumentIfJavaScriptURL
</span><span class="cx"> };
</span><span class="cx">
</span><del>- enum ReasonForCallingAllowPlugins {
- AboutToInstantiatePlugin,
- NotAboutToInstantiatePlugin
- };
-
</del><span class="cx"> enum WebGLLoadPolicy {
</span><span class="cx"> WebGLBlockCreation,
</span><span class="cx"> WebGLAllowCreation,
</span></span></pre></div>
<a id="trunkSourceWebCoreloaderSubframeLoadercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/loader/SubframeLoader.cpp (187890 => 187891)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/loader/SubframeLoader.cpp 2015-08-04 21:26:49 UTC (rev 187890)
+++ trunk/Source/WebCore/loader/SubframeLoader.cpp 2015-08-04 21:41:02 UTC (rev 187891)
</span><span class="lines">@@ -145,7 +145,7 @@
</span><span class="cx"> // Application plug-ins are plug-ins implemented by the user agent, for example Qt plug-ins,
</span><span class="cx"> // as opposed to third-party code such as Flash. The user agent decides whether or not they are
</span><span class="cx"> // permitted, rather than WebKit.
</span><del>- if ((!allowPlugins(AboutToInstantiatePlugin) && !MIMETypeRegistry::isApplicationPluginMIMEType(mimeType)))
</del><ins>+ if ((!allowPlugins() && !MIMETypeRegistry::isApplicationPluginMIMEType(mimeType)))
</ins><span class="cx"> return false;
</span><span class="cx">
</span><span class="cx"> if (!pluginIsLoadable(ownerElement, url, mimeType))
</span><span class="lines">@@ -265,7 +265,7 @@
</span><span class="cx"> URL baseURL = completeURL(baseURLString);
</span><span class="cx">
</span><span class="cx"> RefPtr<Widget> widget;
</span><del>- if (allowPlugins(AboutToInstantiatePlugin))
</del><ins>+ if (allowPlugins())
</ins><span class="cx"> widget = m_frame.loader().client().createJavaAppletWidget(size, &element, baseURL, paramNames, paramValues);
</span><span class="cx">
</span><span class="cx"> logPluginRequest(document()->page(), element.serviceType(), String(), widget);
</span><span class="lines">@@ -357,7 +357,7 @@
</span><span class="cx"> return frame.get();
</span><span class="cx"> }
</span><span class="cx">
</span><del>-bool SubframeLoader::allowPlugins(ReasonForCallingAllowPlugins)
</del><ins>+bool SubframeLoader::allowPlugins()
</ins><span class="cx"> {
</span><span class="cx"> return m_frame.settings().arePluginsEnabled();
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebCoreloaderSubframeLoaderh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/loader/SubframeLoader.h (187890 => 187891)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/loader/SubframeLoader.h 2015-08-04 21:26:49 UTC (rev 187890)
+++ trunk/Source/WebCore/loader/SubframeLoader.h 2015-08-04 21:41:02 UTC (rev 187891)
</span><span class="lines">@@ -65,7 +65,7 @@
</span><span class="cx">
</span><span class="cx"> PassRefPtr<Widget> createJavaAppletWidget(const IntSize&, HTMLAppletElement&, const Vector<String>& paramNames, const Vector<String>& paramValues);
</span><span class="cx">
</span><del>- WEBCORE_EXPORT bool allowPlugins(ReasonForCallingAllowPlugins);
</del><ins>+ WEBCORE_EXPORT bool allowPlugins();
</ins><span class="cx">
</span><span class="cx"> bool containsPlugins() const { return m_containsPlugins; }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCorepluginsDOMMimeTypecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/plugins/DOMMimeType.cpp (187890 => 187891)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/plugins/DOMMimeType.cpp 2015-08-04 21:26:49 UTC (rev 187890)
+++ trunk/Source/WebCore/plugins/DOMMimeType.cpp 2015-08-04 21:41:02 UTC (rev 187891)
</span><span class="lines">@@ -69,8 +69,8 @@
</span><span class="cx">
</span><span class="cx"> PassRefPtr<DOMPlugin> DOMMimeType::enabledPlugin() const
</span><span class="cx"> {
</span><del>- if (!m_frame || !m_frame->page() || !m_frame->page()->mainFrame().loader().subframeLoader().allowPlugins(NotAboutToInstantiatePlugin))
- return 0;
</del><ins>+ if (!m_frame || !m_frame->page() || !m_frame->page()->mainFrame().loader().subframeLoader().allowPlugins())
+ return nullptr;
</ins><span class="cx">
</span><span class="cx"> Vector<MimeClassInfo> mimes;
</span><span class="cx"> Vector<size_t> mimePluginIndices;
</span></span></pre></div>
<a id="trunkSourceWebKitmacChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/mac/ChangeLog (187890 => 187891)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/mac/ChangeLog 2015-08-04 21:26:49 UTC (rev 187890)
+++ trunk/Source/WebKit/mac/ChangeLog 2015-08-04 21:41:02 UTC (rev 187891)
</span><span class="lines">@@ -1,3 +1,15 @@
</span><ins>+2015-08-04 Anders Carlsson <andersca@apple.com>
+
+ Get rid of ReasonForCallingAllowPlugins since it's not used anywhere
+ https://bugs.webkit.org/show_bug.cgi?id=147648
+
+ Reviewed by Andreas Kling.
+
+ * WebCoreSupport/WebPlatformStrategies.mm:
+ (WebPlatformStrategies::getPluginInfo):
+ * WebView/WebFrame.mm:
+ (-[WebFrame _canProvideDocumentSource]):
+
</ins><span class="cx"> 2015-08-04 Alexey Proskuryakov <ap@apple.com>
</span><span class="cx">
</span><span class="cx"> Implement NPAPI redirect handling
</span></span></pre></div>
<a id="trunkSourceWebKitmacWebCoreSupportWebPlatformStrategiesmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/mac/WebCoreSupport/WebPlatformStrategies.mm (187890 => 187891)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/mac/WebCoreSupport/WebPlatformStrategies.mm 2015-08-04 21:26:49 UTC (rev 187890)
+++ trunk/Source/WebKit/mac/WebCoreSupport/WebPlatformStrategies.mm 2015-08-04 21:41:02 UTC (rev 187891)
</span><span class="lines">@@ -115,7 +115,7 @@
</span><span class="cx"> BEGIN_BLOCK_OBJC_EXCEPTIONS;
</span><span class="cx">
</span><span class="cx"> // WebKit1 has no application plug-ins, so we don't need to add them here.
</span><del>- if (!page->mainFrame().loader().subframeLoader().allowPlugins(NotAboutToInstantiatePlugin))
</del><ins>+ if (!page->mainFrame().loader().subframeLoader().allowPlugins())
</ins><span class="cx"> return;
</span><span class="cx">
</span><span class="cx"> NSArray* pluginsArray = [[WebPluginDatabase sharedDatabase] plugins];
</span></span></pre></div>
<a id="trunkSourceWebKitmacWebViewWebFramemm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/mac/WebView/WebFrame.mm (187890 => 187891)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/mac/WebView/WebFrame.mm 2015-08-04 21:26:49 UTC (rev 187890)
+++ trunk/Source/WebKit/mac/WebView/WebFrame.mm 2015-08-04 21:41:02 UTC (rev 187891)
</span><span class="lines">@@ -966,7 +966,7 @@
</span><span class="cx">
</span><span class="cx"> if (WebCore::DOMImplementation::isTextMIMEType(mimeType)
</span><span class="cx"> || Image::supportsType(mimeType)
</span><del>- || (pluginData && pluginData->supportsWebVisibleMimeType(mimeType, PluginData::AllPlugins) && frame->loader().subframeLoader().allowPlugins(NotAboutToInstantiatePlugin))
</del><ins>+ || (pluginData && pluginData->supportsWebVisibleMimeType(mimeType, PluginData::AllPlugins) && frame->loader().subframeLoader().allowPlugins())
</ins><span class="cx"> || (pluginData && pluginData->supportsWebVisibleMimeType(mimeType, PluginData::OnlyApplicationPlugins)))
</span><span class="cx"> return NO;
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebKitwinChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/win/ChangeLog (187890 => 187891)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/win/ChangeLog 2015-08-04 21:26:49 UTC (rev 187890)
+++ trunk/Source/WebKit/win/ChangeLog 2015-08-04 21:41:02 UTC (rev 187891)
</span><span class="lines">@@ -1,3 +1,13 @@
</span><ins>+2015-08-04 Anders Carlsson <andersca@apple.com>
+
+ Get rid of ReasonForCallingAllowPlugins since it's not used anywhere
+ https://bugs.webkit.org/show_bug.cgi?id=147648
+
+ Reviewed by Andreas Kling.
+
+ * WebView.cpp:
+ (WebView::canShowMIMEType):
+
</ins><span class="cx"> 2015-08-04 Alexey Proskuryakov <ap@apple.com>
</span><span class="cx">
</span><span class="cx"> Implement NPAPI redirect handling
</span></span></pre></div>
<a id="trunkSourceWebKitwinWebViewcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/win/WebView.cpp (187890 => 187891)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/win/WebView.cpp 2015-08-04 21:26:49 UTC (rev 187890)
+++ trunk/Source/WebKit/win/WebView.cpp 2015-08-04 21:41:02 UTC (rev 187891)
</span><span class="lines">@@ -2726,7 +2726,7 @@
</span><span class="cx"> bool WebView::canShowMIMEType(const String& mimeType)
</span><span class="cx"> {
</span><span class="cx"> Frame* coreFrame = core(m_mainFrame);
</span><del>- bool allowPlugins = coreFrame && coreFrame->loader().subframeLoader().allowPlugins(NotAboutToInstantiatePlugin);
</del><ins>+ bool allowPlugins = coreFrame && coreFrame->loader().subframeLoader().allowPlugins();
</ins><span class="cx">
</span><span class="cx"> bool canShow = MIMETypeRegistry::isSupportedImageMIMEType(mimeType)
</span><span class="cx"> || MIMETypeRegistry::isSupportedNonImageMIMEType(mimeType)
</span></span></pre></div>
<a id="trunkSourceWebKit2ChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/ChangeLog (187890 => 187891)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/ChangeLog 2015-08-04 21:26:49 UTC (rev 187890)
+++ trunk/Source/WebKit2/ChangeLog 2015-08-04 21:41:02 UTC (rev 187891)
</span><span class="lines">@@ -1,3 +1,19 @@
</span><ins>+2015-08-04 Anders Carlsson <andersca@apple.com>
+
+ Get rid of ReasonForCallingAllowPlugins since it's not used anywhere
+ https://bugs.webkit.org/show_bug.cgi?id=147648
+
+ Reviewed by Andreas Kling.
+
+ * WebProcess/WebCoreSupport/WebFrameLoaderClient.cpp:
+ (WebKit::WebFrameLoaderClient::objectContentType):
+ * WebProcess/WebCoreSupport/WebPlatformStrategies.cpp:
+ (WebKit::WebPlatformStrategies::getPluginInfo):
+ * WebProcess/WebPage/WebPage.cpp:
+ (WebKit::WebPage::createPlugin):
+ (WebKit::WebPage::canPluginHandleResponse):
+ (WebKit::WebPage::canShowMIMEType):
+
</ins><span class="cx"> 2015-08-04 Alexey Proskuryakov <ap@apple.com>
</span><span class="cx">
</span><span class="cx"> Implement NPAPI redirect handling
</span></span></pre></div>
<a id="trunkSourceWebKit2WebProcessWebCoreSupportWebFrameLoaderClientcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/WebCoreSupport/WebFrameLoaderClient.cpp (187890 => 187891)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/WebCoreSupport/WebFrameLoaderClient.cpp 2015-08-04 21:26:49 UTC (rev 187890)
+++ trunk/Source/WebKit2/WebProcess/WebCoreSupport/WebFrameLoaderClient.cpp 2015-08-04 21:41:02 UTC (rev 187891)
</span><span class="lines">@@ -1533,7 +1533,7 @@
</span><span class="cx"> bool plugInSupportsMIMEType = false;
</span><span class="cx"> if (WebPage* webPage = m_frame->page()) {
</span><span class="cx"> const PluginData& pluginData = webPage->corePage()->pluginData();
</span><del>- if (pluginData.supportsWebVisibleMimeType(mimeType, PluginData::AllPlugins) && webFrame()->coreFrame()->loader().subframeLoader().allowPlugins(NotAboutToInstantiatePlugin))
</del><ins>+ if (pluginData.supportsWebVisibleMimeType(mimeType, PluginData::AllPlugins) && webFrame()->coreFrame()->loader().subframeLoader().allowPlugins())
</ins><span class="cx"> plugInSupportsMIMEType = true;
</span><span class="cx"> else if (pluginData.supportsWebVisibleMimeType(mimeType, PluginData::OnlyApplicationPlugins))
</span><span class="cx"> plugInSupportsMIMEType = true;
</span></span></pre></div>
<a id="trunkSourceWebKit2WebProcessWebCoreSupportWebPlatformStrategiescpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/WebCoreSupport/WebPlatformStrategies.cpp (187890 => 187891)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/WebCoreSupport/WebPlatformStrategies.cpp 2015-08-04 21:26:49 UTC (rev 187890)
+++ trunk/Source/WebKit2/WebProcess/WebCoreSupport/WebPlatformStrategies.cpp 2015-08-04 21:41:02 UTC (rev 187891)
</span><span class="lines">@@ -301,7 +301,7 @@
</span><span class="cx"> ASSERT_ARG(page, page);
</span><span class="cx"> populatePluginCache(*page);
</span><span class="cx">
</span><del>- if (page->mainFrame().loader().subframeLoader().allowPlugins(NotAboutToInstantiatePlugin)) {
</del><ins>+ if (page->mainFrame().loader().subframeLoader().allowPlugins()) {
</ins><span class="cx"> plugins = m_cachedPlugins;
</span><span class="cx"> return;
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebKit2WebProcessWebPageWebPagecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/WebPage/WebPage.cpp (187890 => 187891)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/WebPage/WebPage.cpp 2015-08-04 21:26:49 UTC (rev 187890)
+++ trunk/Source/WebKit2/WebProcess/WebPage/WebPage.cpp 2015-08-04 21:41:02 UTC (rev 187891)
</span><span class="lines">@@ -706,7 +706,7 @@
</span><span class="cx"> PluginProcessType processType = pluginElement->displayState() == HTMLPlugInElement::WaitingForSnapshot ? PluginProcessTypeSnapshot : PluginProcessTypeNormal;
</span><span class="cx"> #endif
</span><span class="cx">
</span><del>- bool allowOnlyApplicationPlugins = !frame->coreFrame()->loader().subframeLoader().allowPlugins(NotAboutToInstantiatePlugin);
</del><ins>+ bool allowOnlyApplicationPlugins = !frame->coreFrame()->loader().subframeLoader().allowPlugins();
</ins><span class="cx">
</span><span class="cx"> uint64_t pluginProcessToken;
</span><span class="cx"> uint32_t pluginLoadPolicy;
</span><span class="lines">@@ -4262,7 +4262,7 @@
</span><span class="cx"> {
</span><span class="cx"> #if ENABLE(NETSCAPE_PLUGIN_API)
</span><span class="cx"> uint32_t pluginLoadPolicy;
</span><del>- bool allowOnlyApplicationPlugins = !m_mainFrame->coreFrame()->loader().subframeLoader().allowPlugins(NotAboutToInstantiatePlugin);
</del><ins>+ bool allowOnlyApplicationPlugins = !m_mainFrame->coreFrame()->loader().subframeLoader().allowPlugins();
</ins><span class="cx">
</span><span class="cx"> uint64_t pluginProcessToken;
</span><span class="cx"> String newMIMEType;
</span><span class="lines">@@ -4587,7 +4587,7 @@
</span><span class="cx"> return true;
</span><span class="cx">
</span><span class="cx"> const PluginData& pluginData = m_page->pluginData();
</span><del>- if (pluginData.supportsWebVisibleMimeType(MIMEType, PluginData::AllPlugins) && corePage()->mainFrame().loader().subframeLoader().allowPlugins(NotAboutToInstantiatePlugin))
</del><ins>+ if (pluginData.supportsWebVisibleMimeType(MIMEType, PluginData::AllPlugins) && corePage()->mainFrame().loader().subframeLoader().allowPlugins())
</ins><span class="cx"> return true;
</span><span class="cx">
</span><span class="cx"> // We can use application plugins even if plugins aren't enabled.
</span></span></pre>
</div>
</div>
</body>
</html>