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):
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@187891 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/Source/WebCore/ChangeLog b/Source/WebCore/ChangeLog
index 15d5add..afdcbc4 100644
--- a/Source/WebCore/ChangeLog
+++ b/Source/WebCore/ChangeLog
@@ -1,3 +1,25 @@
+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):
+
2015-08-04 Alex Christensen <achristensen@webkit.org>
Fix debug CMake build on Windows after r187818.
diff --git a/Source/WebCore/dom/DOMImplementation.cpp b/Source/WebCore/dom/DOMImplementation.cpp
index ae3d842..0a5b50d 100644
--- a/Source/WebCore/dom/DOMImplementation.cpp
+++ b/Source/WebCore/dom/DOMImplementation.cpp
@@ -318,10 +318,10 @@
if (frame && !frame->isMainFrame() && MIMETypeRegistry::isPDFMIMEType(type) && frame->settings().useImageDocumentForSubframePDF())
return ImageDocument::create(*frame, url);
- PluginData* pluginData = 0;
+ PluginData* pluginData = nullptr;
PluginData::AllowedPluginTypes allowedPluginTypes = PluginData::OnlyApplicationPlugins;
if (frame && frame->page()) {
- if (frame->loader().subframeLoader().allowPlugins(NotAboutToInstantiatePlugin))
+ if (frame->loader().subframeLoader().allowPlugins())
allowedPluginTypes = PluginData::AllPlugins;
pluginData = &frame->page()->pluginData();
diff --git a/Source/WebCore/html/HTMLElement.cpp b/Source/WebCore/html/HTMLElement.cpp
index 57df9d3..aae4274 100644
--- a/Source/WebCore/html/HTMLElement.cpp
+++ b/Source/WebCore/html/HTMLElement.cpp
@@ -869,7 +869,7 @@
return false;
} else if (hasTagName(noembedTag)) {
Frame* frame = document().frame();
- if (frame && frame->loader().subframeLoader().allowPlugins(NotAboutToInstantiatePlugin))
+ if (frame && frame->loader().subframeLoader().allowPlugins())
return false;
}
return StyledElement::rendererIsNeeded(style);
diff --git a/Source/WebCore/html/parser/HTMLParserOptions.cpp b/Source/WebCore/html/parser/HTMLParserOptions.cpp
index 000d4b0..d9323ee 100644
--- a/Source/WebCore/html/parser/HTMLParserOptions.cpp
+++ b/Source/WebCore/html/parser/HTMLParserOptions.cpp
@@ -47,7 +47,7 @@
{
Frame* frame = document.frame();
scriptEnabled = frame && frame->script().canExecuteScripts(NotAboutToExecuteScript);
- pluginsEnabled = frame && frame->loader().subframeLoader().allowPlugins(NotAboutToInstantiatePlugin);
+ pluginsEnabled = frame && frame->loader().subframeLoader().allowPlugins();
Settings* settings = document.settings();
usePreHTML5ParserQuirks = settings && settings->usePreHTML5ParserQuirks();
diff --git a/Source/WebCore/loader/FrameLoaderTypes.h b/Source/WebCore/loader/FrameLoaderTypes.h
index ad9f744..5598696 100644
--- a/Source/WebCore/loader/FrameLoaderTypes.h
+++ b/Source/WebCore/loader/FrameLoaderTypes.h
@@ -110,11 +110,6 @@
DoNotReplaceDocumentIfJavaScriptURL
};
- enum ReasonForCallingAllowPlugins {
- AboutToInstantiatePlugin,
- NotAboutToInstantiatePlugin
- };
-
enum WebGLLoadPolicy {
WebGLBlockCreation,
WebGLAllowCreation,
diff --git a/Source/WebCore/loader/SubframeLoader.cpp b/Source/WebCore/loader/SubframeLoader.cpp
index 4569b25..36e1393 100644
--- a/Source/WebCore/loader/SubframeLoader.cpp
+++ b/Source/WebCore/loader/SubframeLoader.cpp
@@ -145,7 +145,7 @@
// Application plug-ins are plug-ins implemented by the user agent, for example Qt plug-ins,
// as opposed to third-party code such as Flash. The user agent decides whether or not they are
// permitted, rather than WebKit.
- if ((!allowPlugins(AboutToInstantiatePlugin) && !MIMETypeRegistry::isApplicationPluginMIMEType(mimeType)))
+ if ((!allowPlugins() && !MIMETypeRegistry::isApplicationPluginMIMEType(mimeType)))
return false;
if (!pluginIsLoadable(ownerElement, url, mimeType))
@@ -265,7 +265,7 @@
URL baseURL = completeURL(baseURLString);
RefPtr<Widget> widget;
- if (allowPlugins(AboutToInstantiatePlugin))
+ if (allowPlugins())
widget = m_frame.loader().client().createJavaAppletWidget(size, &element, baseURL, paramNames, paramValues);
logPluginRequest(document()->page(), element.serviceType(), String(), widget);
@@ -357,7 +357,7 @@
return frame.get();
}
-bool SubframeLoader::allowPlugins(ReasonForCallingAllowPlugins)
+bool SubframeLoader::allowPlugins()
{
return m_frame.settings().arePluginsEnabled();
}
diff --git a/Source/WebCore/loader/SubframeLoader.h b/Source/WebCore/loader/SubframeLoader.h
index a599082..71313af 100644
--- a/Source/WebCore/loader/SubframeLoader.h
+++ b/Source/WebCore/loader/SubframeLoader.h
@@ -65,7 +65,7 @@
PassRefPtr<Widget> createJavaAppletWidget(const IntSize&, HTMLAppletElement&, const Vector<String>& paramNames, const Vector<String>& paramValues);
- WEBCORE_EXPORT bool allowPlugins(ReasonForCallingAllowPlugins);
+ WEBCORE_EXPORT bool allowPlugins();
bool containsPlugins() const { return m_containsPlugins; }
diff --git a/Source/WebCore/plugins/DOMMimeType.cpp b/Source/WebCore/plugins/DOMMimeType.cpp
index 50826ca..450afd1 100644
--- a/Source/WebCore/plugins/DOMMimeType.cpp
+++ b/Source/WebCore/plugins/DOMMimeType.cpp
@@ -69,8 +69,8 @@
PassRefPtr<DOMPlugin> DOMMimeType::enabledPlugin() const
{
- if (!m_frame || !m_frame->page() || !m_frame->page()->mainFrame().loader().subframeLoader().allowPlugins(NotAboutToInstantiatePlugin))
- return 0;
+ if (!m_frame || !m_frame->page() || !m_frame->page()->mainFrame().loader().subframeLoader().allowPlugins())
+ return nullptr;
Vector<MimeClassInfo> mimes;
Vector<size_t> mimePluginIndices;
diff --git a/Source/WebKit/mac/ChangeLog b/Source/WebKit/mac/ChangeLog
index 6328c36..094fff9 100644
--- a/Source/WebKit/mac/ChangeLog
+++ b/Source/WebKit/mac/ChangeLog
@@ -1,3 +1,15 @@
+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]):
+
2015-08-04 Alexey Proskuryakov <ap@apple.com>
Implement NPAPI redirect handling
diff --git a/Source/WebKit/mac/WebCoreSupport/WebPlatformStrategies.mm b/Source/WebKit/mac/WebCoreSupport/WebPlatformStrategies.mm
index 9bb3442..91553fb 100644
--- a/Source/WebKit/mac/WebCoreSupport/WebPlatformStrategies.mm
+++ b/Source/WebKit/mac/WebCoreSupport/WebPlatformStrategies.mm
@@ -115,7 +115,7 @@
BEGIN_BLOCK_OBJC_EXCEPTIONS;
// WebKit1 has no application plug-ins, so we don't need to add them here.
- if (!page->mainFrame().loader().subframeLoader().allowPlugins(NotAboutToInstantiatePlugin))
+ if (!page->mainFrame().loader().subframeLoader().allowPlugins())
return;
NSArray* pluginsArray = [[WebPluginDatabase sharedDatabase] plugins];
diff --git a/Source/WebKit/mac/WebView/WebFrame.mm b/Source/WebKit/mac/WebView/WebFrame.mm
index 799a4b6..49c4f1e 100644
--- a/Source/WebKit/mac/WebView/WebFrame.mm
+++ b/Source/WebKit/mac/WebView/WebFrame.mm
@@ -966,7 +966,7 @@
if (WebCore::DOMImplementation::isTextMIMEType(mimeType)
|| Image::supportsType(mimeType)
- || (pluginData && pluginData->supportsWebVisibleMimeType(mimeType, PluginData::AllPlugins) && frame->loader().subframeLoader().allowPlugins(NotAboutToInstantiatePlugin))
+ || (pluginData && pluginData->supportsWebVisibleMimeType(mimeType, PluginData::AllPlugins) && frame->loader().subframeLoader().allowPlugins())
|| (pluginData && pluginData->supportsWebVisibleMimeType(mimeType, PluginData::OnlyApplicationPlugins)))
return NO;
diff --git a/Source/WebKit/win/ChangeLog b/Source/WebKit/win/ChangeLog
index b678a58..e192f81 100644
--- a/Source/WebKit/win/ChangeLog
+++ b/Source/WebKit/win/ChangeLog
@@ -1,3 +1,13 @@
+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):
+
2015-08-04 Alexey Proskuryakov <ap@apple.com>
Implement NPAPI redirect handling
diff --git a/Source/WebKit/win/WebView.cpp b/Source/WebKit/win/WebView.cpp
index 941b3e7..a4c2618 100644
--- a/Source/WebKit/win/WebView.cpp
+++ b/Source/WebKit/win/WebView.cpp
@@ -2726,7 +2726,7 @@
bool WebView::canShowMIMEType(const String& mimeType)
{
Frame* coreFrame = core(m_mainFrame);
- bool allowPlugins = coreFrame && coreFrame->loader().subframeLoader().allowPlugins(NotAboutToInstantiatePlugin);
+ bool allowPlugins = coreFrame && coreFrame->loader().subframeLoader().allowPlugins();
bool canShow = MIMETypeRegistry::isSupportedImageMIMEType(mimeType)
|| MIMETypeRegistry::isSupportedNonImageMIMEType(mimeType)
diff --git a/Source/WebKit2/ChangeLog b/Source/WebKit2/ChangeLog
index 3e1bbf4..1a23e37 100644
--- a/Source/WebKit2/ChangeLog
+++ b/Source/WebKit2/ChangeLog
@@ -1,3 +1,19 @@
+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):
+
2015-08-04 Alexey Proskuryakov <ap@apple.com>
Implement NPAPI redirect handling
diff --git a/Source/WebKit2/WebProcess/WebCoreSupport/WebFrameLoaderClient.cpp b/Source/WebKit2/WebProcess/WebCoreSupport/WebFrameLoaderClient.cpp
index 540dde9..ef3aafa 100644
--- a/Source/WebKit2/WebProcess/WebCoreSupport/WebFrameLoaderClient.cpp
+++ b/Source/WebKit2/WebProcess/WebCoreSupport/WebFrameLoaderClient.cpp
@@ -1533,7 +1533,7 @@
bool plugInSupportsMIMEType = false;
if (WebPage* webPage = m_frame->page()) {
const PluginData& pluginData = webPage->corePage()->pluginData();
- if (pluginData.supportsWebVisibleMimeType(mimeType, PluginData::AllPlugins) && webFrame()->coreFrame()->loader().subframeLoader().allowPlugins(NotAboutToInstantiatePlugin))
+ if (pluginData.supportsWebVisibleMimeType(mimeType, PluginData::AllPlugins) && webFrame()->coreFrame()->loader().subframeLoader().allowPlugins())
plugInSupportsMIMEType = true;
else if (pluginData.supportsWebVisibleMimeType(mimeType, PluginData::OnlyApplicationPlugins))
plugInSupportsMIMEType = true;
diff --git a/Source/WebKit2/WebProcess/WebCoreSupport/WebPlatformStrategies.cpp b/Source/WebKit2/WebProcess/WebCoreSupport/WebPlatformStrategies.cpp
index d94184c..443aceb 100644
--- a/Source/WebKit2/WebProcess/WebCoreSupport/WebPlatformStrategies.cpp
+++ b/Source/WebKit2/WebProcess/WebCoreSupport/WebPlatformStrategies.cpp
@@ -301,7 +301,7 @@
ASSERT_ARG(page, page);
populatePluginCache(*page);
- if (page->mainFrame().loader().subframeLoader().allowPlugins(NotAboutToInstantiatePlugin)) {
+ if (page->mainFrame().loader().subframeLoader().allowPlugins()) {
plugins = m_cachedPlugins;
return;
}
diff --git a/Source/WebKit2/WebProcess/WebPage/WebPage.cpp b/Source/WebKit2/WebProcess/WebPage/WebPage.cpp
index 88dc76f..e5dc819 100644
--- a/Source/WebKit2/WebProcess/WebPage/WebPage.cpp
+++ b/Source/WebKit2/WebProcess/WebPage/WebPage.cpp
@@ -706,7 +706,7 @@
PluginProcessType processType = pluginElement->displayState() == HTMLPlugInElement::WaitingForSnapshot ? PluginProcessTypeSnapshot : PluginProcessTypeNormal;
#endif
- bool allowOnlyApplicationPlugins = !frame->coreFrame()->loader().subframeLoader().allowPlugins(NotAboutToInstantiatePlugin);
+ bool allowOnlyApplicationPlugins = !frame->coreFrame()->loader().subframeLoader().allowPlugins();
uint64_t pluginProcessToken;
uint32_t pluginLoadPolicy;
@@ -4262,7 +4262,7 @@
{
#if ENABLE(NETSCAPE_PLUGIN_API)
uint32_t pluginLoadPolicy;
- bool allowOnlyApplicationPlugins = !m_mainFrame->coreFrame()->loader().subframeLoader().allowPlugins(NotAboutToInstantiatePlugin);
+ bool allowOnlyApplicationPlugins = !m_mainFrame->coreFrame()->loader().subframeLoader().allowPlugins();
uint64_t pluginProcessToken;
String newMIMEType;
@@ -4587,7 +4587,7 @@
return true;
const PluginData& pluginData = m_page->pluginData();
- if (pluginData.supportsWebVisibleMimeType(MIMEType, PluginData::AllPlugins) && corePage()->mainFrame().loader().subframeLoader().allowPlugins(NotAboutToInstantiatePlugin))
+ if (pluginData.supportsWebVisibleMimeType(MIMEType, PluginData::AllPlugins) && corePage()->mainFrame().loader().subframeLoader().allowPlugins())
return true;
// We can use application plugins even if plugins aren't enabled.
