Changeset 181494 in webkit

Timestamp:

Mar 13, 2015, 7:50:28 PM (11 years ago)

Author:

commit-queue@webkit.org

Message:

Unreviewed, rolling out r181483.
​https://bugs.webkit.org/show_bug.cgi?id=142688

Caused use-after-free on many tests (Requested by ap on
#webkit).

Reverted changeset:

"Allow clients to selectively disable plug-ins"
​https://bugs.webkit.org/show_bug.cgi?id=142506
​http://trac.webkit.org/changeset/181483

Location:

trunk/Source

Files:

• WebCore/ChangeLog (modified) (1 diff)
• WebCore/dom/DOMImplementation.cpp (modified) (2 diffs)
• WebCore/loader/SubframeLoader.cpp (modified) (3 diffs)
• WebCore/platform/PlatformStrategies.h (modified) (1 diff)
• WebCore/plugins/DOMMimeType.cpp (modified) (3 diffs)
• WebCore/plugins/DOMMimeType.h (modified) (1 diff)
• WebCore/plugins/DOMMimeTypeArray.cpp (modified) (4 diffs)
• WebCore/plugins/DOMPlugin.cpp (modified) (4 diffs)
• WebCore/plugins/DOMPlugin.h (modified) (1 diff)
• WebCore/plugins/DOMPluginArray.cpp (modified) (4 diffs)
• WebCore/plugins/PluginData.cpp (modified) (5 diffs)
• WebCore/plugins/PluginData.h (modified) (5 diffs)
• WebCore/plugins/PluginStrategy.h (modified) (1 diff)
• WebCore/replay/SerializationMethods.cpp (modified) (6 diffs)
• WebCore/replay/WebInputs.json (modified) (1 diff)
• WebKit/mac/ChangeLog (modified) (1 diff)
• WebKit/mac/Plugins/WebBasePluginPackage.mm (modified) (1 diff)
• WebKit/mac/Plugins/WebNetscapePluginPackage.mm (modified) (1 diff)
• WebKit/mac/WebCoreSupport/WebPlatformStrategies.h (modified) (1 diff)
• WebKit/mac/WebCoreSupport/WebPlatformStrategies.mm (modified) (1 diff)
• WebKit/mac/WebView/WebFrame.mm (modified) (1 diff)
• WebKit/win/ChangeLog (modified) (1 diff)
• WebKit/win/WebCoreSupport/WebPlatformStrategies.cpp (modified) (1 diff)
• WebKit/win/WebCoreSupport/WebPlatformStrategies.h (modified) (1 diff)
• WebKit/win/WebView.cpp (modified) (1 diff)
• WebKit2/ChangeLog (modified) (1 diff)
• WebKit2/Shared/Plugins/Netscape/mac/NetscapePluginModuleMac.mm (modified) (1 diff)
• WebKit2/Shared/WebCoreArgumentCoders.cpp (modified) (2 diffs)
• WebKit2/Shared/WebProcessCreationParameters.cpp (modified) (2 diffs)
• WebKit2/Shared/WebProcessCreationParameters.h (modified) (1 diff)
• WebKit2/UIProcess/API/C/WKAPICast.h (modified) (3 diffs)
• WebKit2/UIProcess/API/C/WKPluginLoadPolicy.h (modified) (1 diff)
• WebKit2/UIProcess/API/C/mac/WKContextPrivateMac.h (modified) (2 diffs)
• WebKit2/UIProcess/API/C/mac/WKContextPrivateMac.mm (modified) (1 diff)
• WebKit2/UIProcess/WebProcessPool.cpp (modified) (2 diffs)
• WebKit2/UIProcess/WebProcessPool.h (modified) (2 diffs)
• WebKit2/WebProcess/Plugins/PDF/PDFPlugin.mm (modified) (1 diff)
• WebKit2/WebProcess/WebCoreSupport/WebFrameLoaderClient.cpp (modified) (2 diffs)
• WebKit2/WebProcess/WebCoreSupport/WebPlatformStrategies.cpp (modified) (4 diffs)
• WebKit2/WebProcess/WebCoreSupport/WebPlatformStrategies.h (modified) (3 diffs)
• WebKit2/WebProcess/WebPage/WebPage.cpp (modified) (1 diff)
• WebKit2/WebProcess/WebProcess.cpp (modified) (2 diffs)
• WebKit2/WebProcess/WebProcess.h (modified) (1 diff)
• WebKit2/WebProcess/WebProcess.messages.in (modified) (1 diff)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2015-03-13  Commit Queue  <commit-queue@webkit.org>
+
+        Unreviewed, rolling out r181483.
+        https://bugs.webkit.org/show_bug.cgi?id=142688
+
+        Caused use-after-free on many tests (Requested by ap on
+        #webkit).
+
+        Reverted changeset:
+
+        "Allow clients to selectively disable plug-ins"
+        https://bugs.webkit.org/show_bug.cgi?id=142506
+        http://trac.webkit.org/changeset/181483
+
 2015-03-13  Antti Koivisto  <antti@apple.com>
 

trunk/Source/WebCore/dom/DOMImplementation.cpp

@@ -330 +330 @@
     // PDF is one image type for which a plugin can override built-in support.
     // We do not want QuickTime to take over all image types, obviously.
-    if (MIMETypeRegistry::isPDFOrPostScriptMIMEType(type) && pluginData && pluginData->supportsWebVisibleMimeType(type, allowedPluginTypes))
+    if (MIMETypeRegistry::isPDFOrPostScriptMIMEType(type) && pluginData && pluginData->supportsMimeType(type, allowedPluginTypes))
         return PluginDocument::create(frame, url);
     if (Image::supportsType(type))
@@ -349 +349 @@
     // Disallowing plug-ins to use text/plain prevents plug-ins from hijacking a fundamental type that the browser is expected to handle,
     // and also serves as an optimization to prevent loading the plug-in database in the common case.
-    if (type != "text/plain" && ((pluginData && pluginData->supportsWebVisibleMimeType(type, allowedPluginTypes)) || (frame && frame->loader().client().shouldAlwaysUsePluginDocument(type))))
+    if (type != "text/plain" && ((pluginData && pluginData->supportsMimeType(type, allowedPluginTypes)) || (frame && frame->loader().client().shouldAlwaysUsePluginDocument(type))))
         return PluginDocument::create(frame, url);
     if (isTextMIMEType(type))

trunk/Source/WebCore/loader/SubframeLoader.cpp

@@ -168 +168 @@
     const PluginData& pluginData = page->pluginData();
 
-    Vector<MimeClassInfo> mimes;
-    Vector<size_t> mimePluginIndices;
-    pluginData.getWebVisibleMimesAndPluginIndices(mimes, mimePluginIndices);
-    for (size_t i = 0; i < mimes.size(); ++i) {
-        const MimeClassInfo& mimeClassInfo = mimes[i];
+    for (size_t i = 0; i < pluginData.mimes().size(); ++i) {
+        const MimeClassInfo& mimeClassInfo = pluginData.mimes()[i];
         for (size_t j = 0; j < mimeClassInfo.extensions.size(); ++j) {
             if (equalIgnoringCase(extension, mimeClassInfo.extensions[j]))
@@ -195 +192 @@
     }
 
-    String pluginFile = page->pluginData().pluginFileForWebVisibleMimeType(newMIMEType);
+    String pluginFile = page->pluginData().pluginFileForMimeType(newMIMEType);
     String description = !pluginFile ? newMIMEType : pluginFile;
 
@@ -371 +368 @@
     // can handle TIFF (which QuickTime can also handle) they probably intended to override QT.
     if (m_frame.page() && (mimeType == "image/tiff" || mimeType == "image/tif" || mimeType == "image/x-tiff")) {
-        String pluginName = m_frame.page()->pluginData().pluginNameForWebVisibleMimeType(mimeType);
+        String pluginName = m_frame.page()->pluginData().pluginNameForMimeType(mimeType);
         if (!pluginName.isEmpty() && !pluginName.contains("QuickTime", false)) 
             return true;

trunk/Source/WebCore/platform/PlatformStrategies.h

@@ -89 +89 @@
 };
 
-WEBCORE_EXPORT PlatformStrategies* platformStrategies();
+PlatformStrategies* platformStrategies();
 WEBCORE_EXPORT void setPlatformStrategies(PlatformStrategies*);
 bool hasPlatformStrategies();

trunk/Source/WebCore/plugins/DOMMimeType.cpp

@@ -43 +43 @@
 }
 
-String DOMMimeType::type() const
+const String &DOMMimeType::type() const
 {
     return mimeClassInfo().type;
@@ -61 +61 @@
 }
 
-String DOMMimeType::description() const
+const String &DOMMimeType::description() const
 {
     return mimeClassInfo().desc;
-}
-
-MimeClassInfo DOMMimeType::mimeClassInfo() const
-{
-    Vector<MimeClassInfo> mimes;
-    Vector<size_t> mimePluginIndices;
-    m_pluginData->getWebVisibleMimesAndPluginIndices(mimes, mimePluginIndices);
-    return mimes[m_index];
 }
 
@@ -79 +71 @@
         return 0;
 
-    Vector<MimeClassInfo> mimes;
-    Vector<size_t> mimePluginIndices;
-    m_pluginData->getWebVisibleMimesAndPluginIndices(mimes, mimePluginIndices);
-    return DOMPlugin::create(m_pluginData.get(), m_frame, mimePluginIndices[m_index]);
+    return DOMPlugin::create(m_pluginData.get(), m_frame, m_pluginData->mimePluginIndices()[m_index]);
 }
 

trunk/Source/WebCore/plugins/DOMMimeType.h

@@ -38 +38 @@
     ~DOMMimeType();
 
-    String type() const;
+    const String &type() const;
     String suffixes() const;
-    String description() const;
+    const String &description() const;
     PassRefPtr<DOMPlugin> enabledPlugin() const;
 
 private:
-    MimeClassInfo mimeClassInfo() const;
+    const MimeClassInfo& mimeClassInfo() const { return m_pluginData->mimes()[m_index]; }
 
     DOMMimeType(PassRefPtr<PluginData>, Frame*, unsigned index);

trunk/Source/WebCore/plugins/DOMMimeTypeArray.cpp

@@ -49 +49 @@
     if (!data)
         return 0;
-
-    Vector<MimeClassInfo> mimes;
-    Vector<size_t> mimePluginIndices;
-    data->getWebVisibleMimesAndPluginIndices(mimes, mimePluginIndices);
-    return mimes.size();
+    return data->mimes().size();
 }
 
@@ -61 +57 @@
     if (!data)
         return 0;
-
-    Vector<MimeClassInfo> mimes;
-    Vector<size_t> mimePluginIndices;
-    data->getWebVisibleMimesAndPluginIndices(mimes, mimePluginIndices);
-
+    const Vector<MimeClassInfo>& mimes = data->mimes();
     if (index >= mimes.size())
         return 0;
@@ -76 +68 @@
     if (!data)
         return 0;
-
-    Vector<MimeClassInfo> mimes;
-    Vector<size_t> mimePluginIndices;
-    data->getWebVisibleMimesAndPluginIndices(mimes, mimePluginIndices);
+    const Vector<MimeClassInfo>& mimes = data->mimes();
     for (unsigned i = 0; i < mimes.size(); ++i) {
         if (mimes[i].type == propertyName)
@@ -92 +81 @@
     if (!data)
         return 0;
-
-    Vector<MimeClassInfo> mimes;
-    Vector<size_t> mimePluginIndices;
-    data->getWebVisibleMimesAndPluginIndices(mimes, mimePluginIndices);
+    const Vector<MimeClassInfo>& mimes = data->mimes();
     for (unsigned i = 0; i < mimes.size(); ++i) {
         if (mimes[i].type == propertyName)

trunk/Source/WebCore/plugins/DOMPlugin.cpp

@@ -57 +57 @@
 }
 
-PluginInfo DOMPlugin::pluginInfo() const
-{
-    return m_pluginData->webVisiblePlugins()[m_index];
-}
-
 PassRefPtr<DOMMimeType> DOMPlugin::item(unsigned index)
 {
@@ -67 +62 @@
         return 0;
 
-    MimeClassInfo mime = pluginInfo().mimes[index];
+    const MimeClassInfo& mime = pluginInfo().mimes[index];
 
-    Vector<MimeClassInfo> mimes;
-    Vector<size_t> mimePluginIndices;
-    m_pluginData->getWebVisibleMimesAndPluginIndices(mimes, mimePluginIndices);
+    const Vector<MimeClassInfo>& mimes = m_pluginData->mimes();
     for (unsigned i = 0; i < mimes.size(); ++i) {
-        if (mimes[i] == mime && mimePluginIndices[i] == m_index)
+        if (mimes[i] == mime && m_pluginData->mimePluginIndices()[i] == m_index)
             return DOMMimeType::create(m_pluginData.get(), m_frame, i);
     }
@@ -81 +74 @@
 bool DOMPlugin::canGetItemsForName(const AtomicString& propertyName)
 {
-    Vector<MimeClassInfo> mimes;
-    Vector<size_t> mimePluginIndices;
-    m_pluginData->getWebVisibleMimesAndPluginIndices(mimes, mimePluginIndices);
+    const Vector<MimeClassInfo>& mimes = m_pluginData->mimes();
     for (unsigned i = 0; i < mimes.size(); ++i)
         if (mimes[i].type == propertyName)
@@ -92 +83 @@
 PassRefPtr<DOMMimeType> DOMPlugin::namedItem(const AtomicString& propertyName)
 {
-    Vector<MimeClassInfo> mimes;
-    Vector<size_t> mimePluginIndices;
-    m_pluginData->getWebVisibleMimesAndPluginIndices(mimes, mimePluginIndices);
+    const Vector<MimeClassInfo>& mimes = m_pluginData->mimes();
     for (unsigned i = 0; i < mimes.size(); ++i)
         if (mimes[i].type == propertyName)

trunk/Source/WebCore/plugins/DOMPlugin.h

@@ -49 +49 @@
 
 private:
-    PluginInfo pluginInfo() const;
+    const PluginInfo& pluginInfo() const { return m_pluginData->plugins()[m_index]; }
 
     DOMPlugin(PluginData*, Frame*, unsigned index);

trunk/Source/WebCore/plugins/DOMPluginArray.cpp

@@ -49 +49 @@
     if (!data)
         return 0;
-
-    return data->webVisiblePlugins().size();
+    return data->plugins().size();
 }
 
@@ -58 +57 @@
     if (!data)
         return 0;
-
-    const Vector<PluginInfo>& plugins = data->webVisiblePlugins();
+    const Vector<PluginInfo>& plugins = data->plugins();
     if (index >= plugins.size())
         return 0;
@@ -70 +68 @@
     if (!data)
         return 0;
-
-    const Vector<PluginInfo>& plugins = data->webVisiblePlugins();
+    const Vector<PluginInfo>& plugins = data->plugins();
     for (unsigned i = 0; i < plugins.size(); ++i) {
         if (plugins[i].name == propertyName)
@@ -84 +81 @@
     if (!data)
         return 0;
-
-    const Vector<PluginInfo>& plugins = data->webVisiblePlugins();
+    const Vector<PluginInfo>& plugins = data->plugins();
     for (unsigned i = 0; i < plugins.size(); ++i) {
         if (plugins[i].name == propertyName)

trunk/Source/WebCore/plugins/PluginData.cpp

@@ -3 +3 @@
     Copyright (C) 2000 Daniel Molkentin (molkentin@kde.org)
     Copyright (C) 2000 Stefan Schimanski (schimmi@kde.org)
-    Copyright (C) 2003, 2004, 2005, 2006, 2007, 2015 Apple Inc. All Rights Reserved.
+    Copyright (C) 2003, 2004, 2005, 2006, 2007 Apple Inc. All Rights Reserved.
     Copyright (C) 2008 Nokia Corporation and/or its subsidiary(-ies)
 
@@ -32 +32 @@
 PluginData::PluginData(const Page* page)
 {
-    ASSERT_ARG(page, page);
+    initPlugins(page);
 
-    m_page = page;
-    initPlugins();
-}
-
-Vector<PluginInfo> PluginData::webVisiblePlugins() const
-{
-    Vector<PluginInfo> plugins;
-    platformStrategies()->pluginStrategy()->getWebVisiblePluginInfo(m_page, plugins);
-    return plugins;
-}
-
-void PluginData::getWebVisibleMimesAndPluginIndices(Vector<MimeClassInfo>& mimes, Vector<size_t>& mimePluginIndices) const
-{
-    ASSERT_ARG(mimes, mimes.isEmpty());
-    ASSERT_ARG(mimePluginIndices, mimePluginIndices.isEmpty());
-
-    const Vector<PluginInfo>& plugins = webVisiblePlugins();
-    for (unsigned i = 0; i < plugins.size(); ++i) {
-        const PluginInfo& plugin = plugins[i];
+    for (unsigned i = 0; i < m_plugins.size(); ++i) {
+        const PluginInfo& plugin = m_plugins[i];
         for (unsigned j = 0; j < plugin.mimes.size(); ++j) {
-            mimes.append(plugin.mimes[j]);
-            mimePluginIndices.append(i);
+            m_mimes.append(plugin.mimes[j]);
+            m_mimePluginIndices.append(i);
         }
     }
 }
 
-bool PluginData::supportsWebVisibleMimeType(const String& mimeType, const AllowedPluginTypes allowedPluginTypes) const
+bool PluginData::supportsMimeType(const String& mimeType, const AllowedPluginTypes allowedPluginTypes) const
 {
-    Vector<MimeClassInfo> mimes;
-    Vector<size_t> mimePluginIndices;
-    const Vector<PluginInfo>& plugins = webVisiblePlugins();
-    getWebVisibleMimesAndPluginIndices(mimes, mimePluginIndices);
-
-    for (unsigned i = 0; i < mimes.size(); ++i) {
-        if (mimes[i].type == mimeType && (allowedPluginTypes == AllPlugins || plugins[mimePluginIndices[i]].isApplicationPlugin))
+    for (unsigned i = 0; i < m_mimes.size(); ++i) {
+        if (m_mimes[i].type == mimeType && (allowedPluginTypes == AllPlugins || m_plugins[m_mimePluginIndices[i]].isApplicationPlugin))
             return true;
     }
@@ -74 +52 @@
 }
 
-const PluginInfo* PluginData::pluginInfoForWebVisibleMimeType(const String& mimeType) const
+const PluginInfo* PluginData::pluginInfoForMimeType(const String& mimeType) const
 {
-    Vector<MimeClassInfo> mimes;
-    Vector<size_t> mimePluginIndices;
-    const Vector<PluginInfo>& plugins = webVisiblePlugins();
-    getWebVisibleMimesAndPluginIndices(mimes, mimePluginIndices);
-
-    for (unsigned i = 0; i < mimes.size(); ++i) {
-        const MimeClassInfo& info = mimes[i];
-
+    for (unsigned i = 0; i < m_mimes.size(); ++i) {
+        const MimeClassInfo& info = m_mimes[i];
+    
         if (info.type == mimeType)
-            return &plugins[mimePluginIndices[i]];
+            return &m_plugins[m_mimePluginIndices[i]];
     }
 
@@ -91 +64 @@
 }
 
-String PluginData::pluginNameForWebVisibleMimeType(const String& mimeType) const
+String PluginData::pluginNameForMimeType(const String& mimeType) const
 {
-    if (const PluginInfo* info = pluginInfoForWebVisibleMimeType(mimeType))
+    if (const PluginInfo* info = pluginInfoForMimeType(mimeType))
         return info->name;
     return String();
 }
 
-String PluginData::pluginFileForWebVisibleMimeType(const String& mimeType) const
+String PluginData::pluginFileForMimeType(const String& mimeType) const
 {
-    if (const PluginInfo* info = pluginInfoForWebVisibleMimeType(mimeType))
+    if (const PluginInfo* info = pluginInfoForMimeType(mimeType))
         return info->file;
     return String();
@@ -110 +83 @@
 }
 
-void PluginData::initPlugins()
+void PluginData::initPlugins(const Page* page)
 {
     ASSERT(m_plugins.isEmpty());
-
-    platformStrategies()->pluginStrategy()->getPluginInfo(m_page, m_plugins);
+    
+    platformStrategies()->pluginStrategy()->getPluginInfo(page, m_plugins);
 }
 

trunk/Source/WebCore/plugins/PluginData.h

@@ -30 +30 @@
 struct PluginInfo;
 
-enum PluginLoadClientPolicy : uint8_t {
-    // No client-specific plug-in load policy has been defined. The plug-in should be visible in navigator.plugins and WebKit should synchronously
-    // ask the client whether the plug-in should be loaded.
-    PluginLoadClientPolicyUndefined = 0,
-
-    // The plug-in module should be blocked from being instantiated. The plug-in should be hidden in navigator.plugins.
-    PluginLoadClientPolicyBlock,
-
-    // WebKit should synchronously ask the client whether the plug-in should be loaded. The plug-in should be visible in navigator.plugins.
-    PluginLoadClientPolicyAsk,
-
-    // The plug-in module may be loaded if WebKit is not blocking it.
-    PluginLoadClientPolicyAllow,
-
-    // The plug-in module should be loaded irrespective of whether WebKit has asked it to be blocked.
-    PluginLoadClientPolicyAllowAlways,
-};
-
 struct MimeClassInfo {
     String type;
@@ -65 +47 @@
     Vector<MimeClassInfo> mimes;
     bool isApplicationPlugin;
-
-    PluginLoadClientPolicy clientLoadPolicy;
-
-#if PLATFORM(MAC)
-    String bundleIdentifier;
-    String versionString;
-#endif
 };
 
@@ -80 +55 @@
 
     const Vector<PluginInfo>& plugins() const { return m_plugins; }
-    Vector<PluginInfo> webVisiblePlugins() const;
-    WEBCORE_EXPORT void getWebVisibleMimesAndPluginIndices(Vector<MimeClassInfo>&, Vector<size_t>&) const;
+    const Vector<MimeClassInfo>& mimes() const { return m_mimes; }
+    const Vector<size_t>& mimePluginIndices() const { return m_mimePluginIndices; }
 
     enum AllowedPluginTypes {
@@ -88 +63 @@
     };
 
-    WEBCORE_EXPORT bool supportsWebVisibleMimeType(const String& mimeType, const AllowedPluginTypes) const;
-    String pluginNameForWebVisibleMimeType(const String& mimeType) const;
-    String pluginFileForWebVisibleMimeType(const String& mimeType) const;
+    WEBCORE_EXPORT bool supportsMimeType(const String& mimeType, const AllowedPluginTypes) const;
+    String pluginNameForMimeType(const String& mimeType) const;
+    String pluginFileForMimeType(const String& mimeType) const;
 
     static void refresh();
@@ -96 +71 @@
 private:
     explicit PluginData(const Page*);
-    void initPlugins();
-    const PluginInfo* pluginInfoForWebVisibleMimeType(const String& mimeType) const;
+    void initPlugins(const Page*);
+    const PluginInfo* pluginInfoForMimeType(const String& mimeType) const;
 
 protected:
 #if defined ENABLE_WEB_REPLAY && ENABLE_WEB_REPLAY
-    PluginData(Vector<PluginInfo> plugins)
+    PluginData(Vector<PluginInfo> plugins, Vector<MimeClassInfo> mimes, Vector<size_t> indices)
         : m_plugins(plugins)
+        , m_mimes(mimes)
+        , m_mimePluginIndices(indices)
     {
     }
 #endif
 
-    const Page* m_page;
     Vector<PluginInfo> m_plugins;
+    Vector<MimeClassInfo> m_mimes;
+    Vector<size_t> m_mimePluginIndices;
 };
 

trunk/Source/WebCore/plugins/PluginStrategy.h

@@ -37 +37 @@
     virtual void refreshPlugins() = 0;
     virtual void getPluginInfo(const Page*, Vector<PluginInfo>&) = 0;
-    virtual void getWebVisiblePluginInfo(const Page*, Vector<PluginInfo>&) = 0;
-#if PLATFORM(MAC)
-    virtual void setPluginLoadClientPolicy(PluginLoadClientPolicy, const String& host, const String& bundleIdentifier, const String& versionString) = 0;
-    virtual void clearPluginClientPolicies() = 0;
-#endif
 
 protected:

trunk/Source/WebCore/replay/SerializationMethods.cpp

@@ -54 +54 @@
 using WebCore::PlatformWheelEventGranularity;
 using WebCore::PluginData;
-using WebCore::PluginLoadClientPolicy;
 using WebCore::PluginInfo;
 using WebCore::SecurityOrigin;
@@ -439 +438 @@
 EncodedValue EncodingTraits<PluginData>::encodeValue(RefPtr<PluginData> input)
 {
-    // FIXME: This needs to work in terms of web-visible plug-ins.
     EncodedValue encodedData = EncodedValue::createObject();
 
+    Vector<uint32_t> castedMimePluginIndices(input->mimePluginIndices().size());
+    for (uint32_t index : input->mimePluginIndices())
+        castedMimePluginIndices.append(WTF::safeCast<uint32_t>(index));
+
     ENCODE_TYPE_WITH_KEY(encodedData, Vector<PluginInfo>, plugins, input->plugins());
+    ENCODE_TYPE_WITH_KEY(encodedData, Vector<MimeClassInfo>, mimes, input->mimes());
+    ENCODE_TYPE_WITH_KEY(encodedData, Vector<uint32_t>, mimePluginIndices, castedMimePluginIndices);
 
     return encodedData;
@@ -449 +453 @@
 class DeserializedPluginData : public PluginData {
 public:
-    DeserializedPluginData(Vector<PluginInfo> plugins)
-        : PluginData(plugins)
+    DeserializedPluginData(Vector<PluginInfo> plugins, Vector<MimeClassInfo> mimes, Vector<size_t> indices)
+        : PluginData(plugins, mimes, indices)
     {
     }
@@ -458 +462 @@
 {
     DECODE_TYPE_WITH_KEY(encodedData, Vector<PluginInfo>, plugins);
-
-    // FIXME: This needs to work in terms of web-visible plug-ins.
-    input = adoptRef(new DeserializedPluginData(plugins));
+    DECODE_TYPE_WITH_KEY(encodedData, Vector<MimeClassInfo>, mimes);
+    DECODE_TYPE_WITH_KEY(encodedData, Vector<uint32_t>, mimePluginIndices);
+
+    Vector<size_t> castedMimePluginIndices(mimePluginIndices.size());
+    for (uint32_t index : mimePluginIndices)
+        castedMimePluginIndices.append(WTF::safeCast<size_t>(index));
+
+    input = adoptRef(new DeserializedPluginData(plugins, mimes, castedMimePluginIndices));
 
     return true;
@@ -475 +484 @@
     ENCODE_TYPE_WITH_KEY(encodedData, Vector<MimeClassInfo>, mimes, input.mimes);
     ENCODE_TYPE_WITH_KEY(encodedData, bool, isApplicationPlugin, input.isApplicationPlugin);
-    ENCODE_TYPE_WITH_KEY(encodedData, PluginLoadClientPolicy, clientLoadPolicy, static_cast<PluginLoadClientPolicy>(input.clientLoadPolicy));
-#if PLATFORM(MAC)
-    ENCODE_TYPE_WITH_KEY(encodedData, String, bundleIdentifier, input.bundleIdentifier);
-    ENCODE_TYPE_WITH_KEY(encodedData, String, versionString, input.versionString);
-#endif
 
     return encodedData;
@@ -494 +498 @@
     DECODE_TYPE_WITH_KEY_TO_LVALUE(encodedData, Vector<MimeClassInfo>, mimes, info.mimes);
     DECODE_TYPE_WITH_KEY_TO_LVALUE(encodedData, bool, isApplicationPlugin, info.isApplicationPlugin);
-    DECODE_TYPE_WITH_KEY_TO_LVALUE(encodedData, PluginLoadClientPolicy, clientLoadPolicy, info.clientLoadPolicy);
-#if PLATFORM(MAC)
-    DECODE_TYPE_WITH_KEY_TO_LVALUE(encodedData, String, bundleIdentifier, input.bundleIdentifier);
-    DECODE_TYPE_WITH_KEY_TO_LVALUE(encodedData, String, versionString, input.versionString);
-#endif
 
     input = info;

trunk/Source/WebCore/replay/WebInputs.json

@@ -67 +67 @@
                 "header": "plugins/PluginData.h"
             },
-            {
-                "name": "PluginLoadClientPolicy", "mode": "SCALAR", "storage": "uint8_t",
-                "flags": ["ENUM"],
-                "values": ["PluginLoadClientPolicyUndefined", "PluginLoadClientPolicyBlock", "PluginLoadClientPolicyAsk", "PluginLoadClientPolicyAllow", "PluginLoadClientPolicyAllowAlways"],
-                "header": "plugins/PluginData.h"
-            },
-
             {
                 "name": "ScrollDirection", "mode": "SCALAR", "storage": "uint8_t",

trunk/Source/WebKit/mac/ChangeLog

@@ +1 @@
+2015-03-13  Commit Queue  <commit-queue@webkit.org>
+
+        Unreviewed, rolling out r181483.
+        https://bugs.webkit.org/show_bug.cgi?id=142688
+
+        Caused use-after-free on many tests (Requested by ap on
+        #webkit).
+
+        Reverted changeset:
+
+        "Allow clients to selectively disable plug-ins"
+        https://bugs.webkit.org/show_bug.cgi?id=142506
+        http://trac.webkit.org/changeset/181483
+
 2015-03-13  Eric Carlson  <eric.carlson@apple.com>
 

trunk/Source/WebKit/mac/Plugins/WebBasePluginPackage.mm

@@ -250 +250 @@
 
     pluginInfo.isApplicationPlugin = false;
-    pluginInfo.clientLoadPolicy = PluginLoadClientPolicyUndefined;
-#if PLATFORM(MAC)
-    pluginInfo.bundleIdentifier = self.bundleIdentifier;
-    pluginInfo.versionString = self.bundleVersion;
-#endif
 
     return YES;

trunk/Source/WebKit/mac/Plugins/WebNetscapePluginPackage.mm

@@ -147 +147 @@
 
     pluginInfo.isApplicationPlugin = false;
-    pluginInfo.clientLoadPolicy = PluginLoadClientPolicyUndefined;
-#if PLATFORM(MAC)
-    pluginInfo.bundleIdentifier = self.bundleIdentifier;
-    pluginInfo.versionString = self.bundleVersion;
-#endif
-
+    
     [self closeResourceFile:resRef];
     

trunk/Source/WebKit/mac/WebCoreSupport/WebPlatformStrategies.h

@@ -63 +63 @@
     virtual void refreshPlugins() override;
     virtual void getPluginInfo(const WebCore::Page*, Vector<WebCore::PluginInfo>&) override;
-    virtual void getWebVisiblePluginInfo(const WebCore::Page*, Vector<WebCore::PluginInfo>&) override;
-#if PLATFORM(MAC)
-    virtual void setPluginLoadClientPolicy(WebCore::PluginLoadClientPolicy, const String&, const String&, const String&) override;
-    virtual void clearPluginClientPolicies() override;
-#endif
 
     // WebCore::LoaderStrategy

trunk/Source/WebKit/mac/WebCoreSupport/WebPlatformStrategies.mm

@@ -129 +129 @@
 }
 
-void WebPlatformStrategies::getWebVisiblePluginInfo(const Page* page, Vector<PluginInfo>& plugins)
-{
-    getPluginInfo(page, plugins);
-}
-
-#if PLATFORM(MAC)
-void WebPlatformStrategies::setPluginLoadClientPolicy(PluginLoadClientPolicy, const String&, const String&, const String&)
-{
-}
-
-void WebPlatformStrategies::clearPluginClientPolicies()
-{
-}
-#endif
-
 void WebPlatformStrategies::getTypes(Vector<String>& types, const String& pasteboardName)
 {

trunk/Source/WebKit/mac/WebView/WebFrame.mm

@@ -980 +980 @@
     if (WebCore::DOMImplementation::isTextMIMEType(mimeType)
         || Image::supportsType(mimeType)
-        || (pluginData && pluginData->supportsWebVisibleMimeType(mimeType, PluginData::AllPlugins) && frame->loader().subframeLoader().allowPlugins(NotAboutToInstantiatePlugin))
-        || (pluginData && pluginData->supportsWebVisibleMimeType(mimeType, PluginData::OnlyApplicationPlugins)))
+        || (pluginData && pluginData->supportsMimeType(mimeType, PluginData::AllPlugins) && frame->loader().subframeLoader().allowPlugins(NotAboutToInstantiatePlugin))
+        || (pluginData && pluginData->supportsMimeType(mimeType, PluginData::OnlyApplicationPlugins)))
         return NO;
 

trunk/Source/WebKit/win/ChangeLog

@@ +1 @@
+2015-03-13  Commit Queue  <commit-queue@webkit.org>
+
+        Unreviewed, rolling out r181483.
+        https://bugs.webkit.org/show_bug.cgi?id=142688
+
+        Caused use-after-free on many tests (Requested by ap on
+        #webkit).
+
+        Reverted changeset:
+
+        "Allow clients to selectively disable plug-ins"
+        https://bugs.webkit.org/show_bug.cgi?id=142506
+        http://trac.webkit.org/changeset/181483
+
 2015-03-10  Conrad Shultz  <conrad_shultz@apple.com>
 

trunk/Source/WebKit/win/WebCoreSupport/WebPlatformStrategies.cpp

@@ -135 +135 @@
     }
 }
-
-void WebPlatformStrategies::getWebVisiblePluginInfo(const Page* page, Vector<PluginInfo>& plugins)
-{
-    getPluginInfo(page, plugins);
-}

trunk/Source/WebKit/win/WebCoreSupport/WebPlatformStrategies.h

@@ -56 +56 @@
     virtual void refreshPlugins();
     virtual void getPluginInfo(const WebCore::Page*, Vector<WebCore::PluginInfo>&);
-    virtual void getWebVisiblePluginInfo(const WebCore::Page*, Vector<WebCore::PluginInfo>&);
 };
 

trunk/Source/WebKit/win/WebView.cpp

@@ -2630 +2630 @@
 
     if (!canShow && m_page) {
-        canShow = (m_page->pluginData().supportsWebVisibleMimeType(mimeType, PluginData::AllPlugins) && allowPlugins)
-            || m_page->pluginData().supportsWebVisibleMimeType(mimeType, PluginData::OnlyApplicationPlugins);
+        canShow = (m_page->pluginData().supportsMimeType(mimeType, PluginData::AllPlugins) && allowPlugins)
+            || m_page->pluginData().supportsMimeType(mimeType, PluginData::OnlyApplicationPlugins);
     }
 

trunk/Source/WebKit2/ChangeLog

@@ +1 @@
+2015-03-13  Commit Queue  <commit-queue@webkit.org>
+
+        Unreviewed, rolling out r181483.
+        https://bugs.webkit.org/show_bug.cgi?id=142688
+
+        Caused use-after-free on many tests (Requested by ap on
+        #webkit).
+
+        Reverted changeset:
+
+        "Allow clients to selectively disable plug-ins"
+        https://bugs.webkit.org/show_bug.cgi?id=142506
+        http://trac.webkit.org/changeset/181483
+
 2015-03-13  Eric Carlson  <eric.carlson@apple.com>
 

trunk/Source/WebKit2/Shared/Plugins/Netscape/mac/NetscapePluginModuleMac.mm

@@ -400 +400 @@
 
     plugin.info.isApplicationPlugin = false;
-    plugin.info.clientLoadPolicy = PluginLoadClientPolicyUndefined;
-#if PLATFORM(MAC)
-    plugin.info.bundleIdentifier = plugin.bundleIdentifier;
-    plugin.info.versionString = plugin.versionString;
-#endif
-
+    
     return true;
 }

trunk/Source/WebKit2/Shared/WebCoreArgumentCoders.cpp

@@ -567 +567 @@
 void ArgumentCoder<PluginInfo>::encode(ArgumentEncoder& encoder, const PluginInfo& pluginInfo)
 {
-    encoder << pluginInfo.name;
-    encoder << pluginInfo.file;
-    encoder << pluginInfo.desc;
-    encoder << pluginInfo.mimes;
-    encoder << pluginInfo.isApplicationPlugin;
-    encoder.encodeEnum(pluginInfo.clientLoadPolicy);
-#if PLATFORM(MAC)
-    encoder << pluginInfo.bundleIdentifier;
-    encoder << pluginInfo.versionString;
-#endif
-}
-
+    encoder << pluginInfo.name << pluginInfo.file << pluginInfo.desc << pluginInfo.mimes << pluginInfo.isApplicationPlugin;
+}
+    
 bool ArgumentCoder<PluginInfo>::decode(ArgumentDecoder& decoder, PluginInfo& pluginInfo)
 {
@@ -591 +582 @@
     if (!decoder.decode(pluginInfo.isApplicationPlugin))
         return false;
-    PluginLoadClientPolicy clientLoadPolicy;
-    if (!decoder.decodeEnum(clientLoadPolicy))
-        return false;
-#if PLATFORM(MAC)
-    if (!decoder.decode(pluginInfo.bundleIdentifier))
-        return false;
-    if (!decoder.decode(pluginInfo.versionString))
-        return false;
-#endif
 
     return true;

trunk/Source/WebKit2/Shared/WebProcessCreationParameters.cpp

@@ -145 +145 @@
     encoder << hasRichContentServices;
 #endif
-
-#if ENABLE(NETSCAPE_PLUGIN_API)
-    encoder << pluginLoadClientPolicies;
-#endif
 }
 
@@ -307 +303 @@
 #endif
 
-#if ENABLE(NETSCAPE_PLUGIN_API)
-    if (!decoder.decode(parameters.pluginLoadClientPolicies))
-        return false;
-#endif
-
     return true;
 }

trunk/Source/WebKit2/Shared/WebProcessCreationParameters.h

@@ -168 +168 @@
     bool hasRichContentServices;
 #endif
-
-#if ENABLE(NETSCAPE_PLUGIN_API)
-    HashMap<String, HashMap<String, HashMap<String, uint8_t>>> pluginLoadClientPolicies;
-#endif
 };
 

trunk/Source/WebKit2/UIProcess/API/C/WKAPICast.h

@@ -48 +48 @@
 #include <WebCore/Credential.h>
 #include <WebCore/FrameLoaderTypes.h>
-#include <WebCore/PluginData.h>
 #include <WebCore/ProtectionSpace.h>
 #include <WebCore/Settings.h>
@@ -484 +483 @@
 }
 
-inline WKPluginLoadClientPolicy toWKPluginLoadClientPolicy(WebCore::PluginLoadClientPolicy PluginLoadClientPolicy)
-{
-    switch (PluginLoadClientPolicy) {
-    case WebCore::PluginLoadClientPolicyUndefined:
-        return kWKPluginLoadClientPolicyUndefined;
-    case WebCore::PluginLoadClientPolicyBlock:
-        return kWKPluginLoadClientPolicyBlock;
-    case WebCore::PluginLoadClientPolicyAsk:
-        return kWKPluginLoadClientPolicyAsk;
-    case WebCore::PluginLoadClientPolicyAllow:
-        return kWKPluginLoadClientPolicyAllow;
-    case WebCore::PluginLoadClientPolicyAllowAlways:
-        return kWKPluginLoadClientPolicyAllowAlways;
-    }
-
-    ASSERT_NOT_REACHED();
-    return kWKPluginLoadClientPolicyBlock;
-}
-
 inline PluginModuleLoadPolicy toPluginModuleLoadPolicy(WKPluginLoadPolicy pluginLoadPolicy)
 {
@@ -518 +498 @@
 }
 
-inline WebCore::PluginLoadClientPolicy toPluginLoadClientPolicy(WKPluginLoadClientPolicy pluginLoadClientPolicy)
-{
-    switch (pluginLoadClientPolicy) {
-    case kWKPluginLoadClientPolicyUndefined:
-        return WebCore::PluginLoadClientPolicyUndefined;
-    case kWKPluginLoadClientPolicyBlock:
-        return WebCore::PluginLoadClientPolicyBlock;
-    case kWKPluginLoadClientPolicyAsk:
-        return WebCore::PluginLoadClientPolicyAsk;
-    case kWKPluginLoadClientPolicyAllow:
-        return WebCore::PluginLoadClientPolicyAllow;
-    case kWKPluginLoadClientPolicyAllowAlways:
-        return WebCore::PluginLoadClientPolicyAllowAlways;
-    }
-
-    ASSERT_NOT_REACHED();
-    return WebCore::PluginLoadClientPolicyBlock;
-}
-
 inline WebCore::WebGLLoadPolicy toWebGLLoadPolicy(WKWebGLLoadPolicy webGLLoadPolicy)
 {

trunk/Source/WebKit2/UIProcess/API/C/WKPluginLoadPolicy.h

@@ -41 +41 @@
 typedef uint32_t WKPluginLoadPolicy;
 
-enum WKPluginLoadClientPolicy {
-    kWKPluginLoadClientPolicyUndefined = 0,
-    kWKPluginLoadClientPolicyBlock,
-    kWKPluginLoadClientPolicyAsk,
-    kWKPluginLoadClientPolicyAllow,
-    kWKPluginLoadClientPolicyAllowAlways,
-};
-
 #ifdef __cplusplus
 }

trunk/Source/WebKit2/UIProcess/API/C/mac/WKContextPrivateMac.h

@@ -28 +28 @@
 
 #include <WebKit/WKBase.h>
-#include <WebKit/WKPluginLoadPolicy.h>
 
 #ifdef __cplusplus
@@ -38 +37 @@
 
 WK_EXPORT bool WKContextIsPlugInUpdateAvailable(WKContextRef context, WKStringRef plugInBundleIdentifier);
-
-WK_EXPORT void WKContextSetPluginLoadClientPolicy(WKContextRef context, WKPluginLoadClientPolicy policy, WKStringRef host, WKStringRef bundleIdentifier, WKStringRef versionString);
-WK_EXPORT void WKContextClearPluginClientPolicies(WKContextRef context);
 
 WK_EXPORT WKDictionaryRef WKContextCopyPlugInInfoForBundleIdentifier(WKContextRef context, WKStringRef plugInBundleIdentifier);

trunk/Source/WebKit2/UIProcess/API/C/mac/WKContextPrivateMac.mm

@@ -50 +50 @@
 #else
     return WKIsPluginUpdateAvailable((NSString *)adoptCF(WKStringCopyCFString(kCFAllocatorDefault, plugInBundleIdentifierRef)).get());
-#endif
-}
-
-void WKContextSetPluginLoadClientPolicy(WKContextRef contextRef, WKPluginLoadClientPolicy policy, WKStringRef host, WKStringRef bundleIdentifier, WKStringRef versionString)
-{
-#if ENABLE(NETSCAPE_PLUGIN_API)
-    toImpl(contextRef)->setPluginLoadClientPolicy(toPluginLoadClientPolicy(policy), toWTFString(host), toWTFString(bundleIdentifier), toWTFString(versionString));
-#endif
-}
-
-void WKContextClearPluginClientPolicies(WKContextRef contextRef)
-{
-#if ENABLE(NETSCAPE_PLUGIN_API)
-    toImpl(contextRef)->clearPluginClientPolicies();
 #endif
 }

trunk/Source/WebKit2/UIProcess/WebProcessPool.cpp

@@ -684 +684 @@
 #endif
 
-#if ENABLE(NETSCAPE_PLUGIN_API)
-    parameters.pluginLoadClientPolicies = m_pluginLoadClientPolicies;
-#endif
-
 #if OS(LINUX)
     parameters.shouldEnableMemoryPressureReliefLogging = true;
@@ -1423 +1419 @@
     m_client.plugInInformationBecameAvailable(this, API::Array::create(WTF::move(plugins)).get());
 }
-
-void WebProcessPool::setPluginLoadClientPolicy(WebCore::PluginLoadClientPolicy policy, const String& host, const String& bundleIdentifier, const String& versionString)
-{
-#if ENABLE(NETSCAPE_PLUGIN_API)
-    HashMap<String, HashMap<String, uint8_t>> policiesByIdentifier;
-    if (m_pluginLoadClientPolicies.contains(host))
-        policiesByIdentifier = m_pluginLoadClientPolicies.get(host);
-
-    HashMap<String, uint8_t> versionsToPolicies;
-    if (policiesByIdentifier.contains(bundleIdentifier))
-        versionsToPolicies = policiesByIdentifier.get(bundleIdentifier);
-
-    versionsToPolicies.set(versionString, policy);
-    policiesByIdentifier.set(bundleIdentifier, versionsToPolicies);
-    m_pluginLoadClientPolicies.set(host, policiesByIdentifier);
-#endif
-
-    sendToAllProcesses(Messages::WebProcess::SetPluginLoadClientPolicy(policy, host, bundleIdentifier, versionString));
-}
-
-void WebProcessPool::clearPluginClientPolicies()
-{
-#if ENABLE(NETSCAPE_PLUGIN_API)
-    m_pluginLoadClientPolicies.clear();
-#endif
-    sendToAllProcesses(Messages::WebProcess::ClearPluginClientPolicies());
-}
 #endif
     

trunk/Source/WebKit2/UIProcess/WebProcessPool.h

@@ -184 +184 @@
 
     PluginInfoStore& pluginInfoStore() { return m_pluginInfoStore; }
-
-    void setPluginLoadClientPolicy(WebCore::PluginLoadClientPolicy, const String& host, const String& bundleIdentifier, const String& versionString);
-    void clearPluginClientPolicies();
 #endif
 
@@ -544 +541 @@
     HashMap<String, String> m_encodedContentExtensions;
 #endif
-
-#if ENABLE(NETSCAPE_PLUGIN_API)
-    HashMap<String, HashMap<String, HashMap<String, uint8_t>>> m_pluginLoadClientPolicies;
-#endif
 };
 

trunk/Source/WebKit2/WebProcess/Plugins/PDF/PDFPlugin.mm

@@ -540 +540 @@
     info.name = builtInPDFPluginName();
     info.isApplicationPlugin = true;
-    info.clientLoadPolicy = PluginLoadClientPolicyUndefined;
 
     MimeClassInfo pdfMimeClassInfo;

trunk/Source/WebKit2/WebProcess/WebCoreSupport/WebFrameLoaderClient.cpp

@@ -1448 +1448 @@
     ASSERT(extension.lower() == extension);
 
-    Vector<MimeClassInfo> mimes;
-    Vector<size_t> mimePluginIndices;
-    pluginData.getWebVisibleMimesAndPluginIndices(mimes, mimePluginIndices);
-    for (size_t i = 0; i < mimes.size(); ++i) {
-        const MimeClassInfo& mimeClassInfo = mimes[i];
+    for (size_t i = 0; i < pluginData.mimes().size(); ++i) {
+        const MimeClassInfo& mimeClassInfo = pluginData.mimes()[i];
 
         if (mimeClassInfo.extensions.contains(extension))
@@ -1487 +1484 @@
     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.supportsMimeType(mimeType, PluginData::AllPlugins) && webFrame()->coreFrame()->loader().subframeLoader().allowPlugins(NotAboutToInstantiatePlugin))
             plugInSupportsMIMEType = true;
-        else if (pluginData.supportsWebVisibleMimeType(mimeType, PluginData::OnlyApplicationPlugins))
+        else if (pluginData.supportsMimeType(mimeType, PluginData::OnlyApplicationPlugins))
             plugInSupportsMIMEType = true;
     }

trunk/Source/WebKit2/WebProcess/WebCoreSupport/WebPlatformStrategies.cpp

@@ -1 +1 @@
 /*
- * Copyright (C) 2010, 2011, 2012, 2015 Apple Inc. All rights reserved.
+ * Copyright (C) 2010, 2011, 2012 Apple Inc. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -45 +45 @@
 #include "WebProcessProxyMessages.h"
 #include <WebCore/Color.h>
-#include <WebCore/DocumentLoader.h>
 #include <WebCore/IDBFactoryBackendInterface.h>
 #include <WebCore/LoaderStrategy.h>
@@ -268 +267 @@
 {
 #if ENABLE(NETSCAPE_PLUGIN_API)
-    ASSERT_ARG(page, page);
-    populatePluginCache(*page);
+    populatePluginCache();
 
     if (page->mainFrame().loader().subframeLoader().allowPlugins(NotAboutToInstantiatePlugin)) {
@@ -283 +281 @@
 }
 
-void WebPlatformStrategies::getWebVisiblePluginInfo(const Page* page, Vector<PluginInfo>& plugins)
-{
-    ASSERT_ARG(page, page);
-    ASSERT_ARG(plugins, plugins.isEmpty());
-
-    getPluginInfo(page, plugins);
-
-#if PLATFORM(MAC)
-    for (int32_t i = plugins.size() - 1; i >= 0; --i) {
-        PluginInfo& info = plugins.at(i);
-        PluginLoadClientPolicy clientPolicy = info.clientLoadPolicy;
-        // Allow built-in plugins. Also tentatively allow plugins that the client might later selectively permit.
-        if (info.isApplicationPlugin || clientPolicy == PluginLoadClientPolicyAsk)
-            continue;
-
-        if (clientPolicy == PluginLoadClientPolicyBlock)
-            plugins.remove(i);
-    }
-#endif
-}
-
-#if PLATFORM(MAC)
-void WebPlatformStrategies::setPluginLoadClientPolicy(PluginLoadClientPolicy clientPolicy, const String& host, const String& bundleIdentifier, const String& versionString)
-{
-    String hostToSet = host.isNull() || !host.length() ? "*" : host;
-    String bundleIdentifierToSet = bundleIdentifier.isNull() || !bundleIdentifier.length() ? "*" : bundleIdentifier;
-    String versionStringToSet = versionString.isNull() || !versionString.length() ? "*" : versionString;
-
-    PluginPolicyMapsByIdentifier policiesByIdentifier;
-    if (m_hostsToPluginIdentifierData.contains(hostToSet))
-        policiesByIdentifier = m_hostsToPluginIdentifierData.get(hostToSet);
-
-    PluginLoadClientPoliciesByBundleVersion versionsToPolicies;
-    if (policiesByIdentifier.contains(bundleIdentifierToSet))
-        versionsToPolicies = policiesByIdentifier.get(bundleIdentifierToSet);
-
-    versionsToPolicies.set(versionStringToSet, clientPolicy);
-    policiesByIdentifier.set(bundleIdentifierToSet, versionsToPolicies);
-    m_hostsToPluginIdentifierData.set(hostToSet, policiesByIdentifier);
-}
-
-void WebPlatformStrategies::clearPluginClientPolicies()
-{
-    m_hostsToPluginIdentifierData.clear();
-}
-
-#endif
-
 #if ENABLE(NETSCAPE_PLUGIN_API)
-#if PLATFORM(MAC)
-bool WebPlatformStrategies::pluginLoadClientPolicyForHost(const String& host, const PluginInfo& info, PluginLoadClientPolicy& policy) const
-{
-    String hostToLookUp = host;
-    if (!m_hostsToPluginIdentifierData.contains(hostToLookUp))
-        hostToLookUp = "*";
-    if (!m_hostsToPluginIdentifierData.contains(hostToLookUp))
-        return false;
-
-    PluginPolicyMapsByIdentifier policiesByIdentifier = m_hostsToPluginIdentifierData.get(hostToLookUp);
-    String identifier = info.bundleIdentifier;
-    if (!identifier || !policiesByIdentifier.contains(identifier))
-        identifier = "*";
-    if (!policiesByIdentifier.contains(identifier))
-        return false;
-
-    PluginLoadClientPoliciesByBundleVersion versionsToPolicies = policiesByIdentifier.get(identifier);
-    String version = info.versionString;
-    if (!version || !versionsToPolicies.contains(version))
-        version = "*";
-    if (!versionsToPolicies.contains(version))
-        return false;
-
-    policy = versionsToPolicies.get(version);
-    return true;
-}
-#endif // PLATFORM(MAC)
-
-void WebPlatformStrategies::populatePluginCache(const WebCore::Page& page)
-{
-    if (!m_pluginCacheIsPopulated) {
-        if (!WebProcess::singleton().parentProcessConnection()->sendSync(Messages::WebProcessProxy::GetPlugins(m_shouldRefreshPlugins), Messages::WebProcessProxy::GetPlugins::Reply(m_cachedPlugins, m_cachedApplicationPlugins), 0))
-            return;
-
-        m_shouldRefreshPlugins = false;
-        m_pluginCacheIsPopulated = true;
-    }
-
-#if PLATFORM(MAC)
-    String pageHost = page.mainFrame().loader().documentLoader()->responseURL().host();
-    for (PluginInfo& info : m_cachedPlugins) {
-        PluginLoadClientPolicy clientPolicy;
-        if (pluginLoadClientPolicyForHost(pageHost, info, clientPolicy))
-            info.clientLoadPolicy = clientPolicy;
-    }
-#else
-    UNUSED_PARAM(page);
-#endif // not PLATFORM(MAC)
+void WebPlatformStrategies::populatePluginCache()
+{
+    if (m_pluginCacheIsPopulated)
+        return;
+
+    ASSERT(m_cachedPlugins.isEmpty());
+    
+    // FIXME: Should we do something in case of error here?
+    if (!WebProcess::singleton().parentProcessConnection()->sendSync(Messages::WebProcessProxy::GetPlugins(m_shouldRefreshPlugins), Messages::WebProcessProxy::GetPlugins::Reply(m_cachedPlugins, m_cachedApplicationPlugins), 0))
+        return;
+
+    m_shouldRefreshPlugins = false;
+    m_pluginCacheIsPopulated = true;
 }
 #endif // ENABLE(NETSCAPE_PLUGIN_API)

trunk/Source/WebKit2/WebProcess/WebCoreSupport/WebPlatformStrategies.h

@@ -32 +32 @@
 #include <WebCore/PlatformStrategies.h>
 #include <WebCore/PluginStrategy.h>
-#include <wtf/HashMap.h>
 #include <wtf/NeverDestroyed.h>
 
@@ -69 +68 @@
     virtual void refreshPlugins() override;
     virtual void getPluginInfo(const WebCore::Page*, Vector<WebCore::PluginInfo>&) override;
-    virtual void getWebVisiblePluginInfo(const WebCore::Page*, Vector<WebCore::PluginInfo>&) override;
-
-#if PLATFORM(MAC)
-    typedef HashMap<String, WebCore::PluginLoadClientPolicy> PluginLoadClientPoliciesByBundleVersion;
-    typedef HashMap<String, PluginLoadClientPoliciesByBundleVersion> PluginPolicyMapsByIdentifier;
-
-    virtual void setPluginLoadClientPolicy(WebCore::PluginLoadClientPolicy, const String& host, const String& bundleIdentifier, const String& versionString) override;
-    virtual void clearPluginClientPolicies() override;
-#endif
 
     // WebCore::PasteboardStrategy
@@ -110 +100 @@
 #if ENABLE(NETSCAPE_PLUGIN_API)
     // WebCore::PluginStrategy implementation.
-    void populatePluginCache(const WebCore::Page&);
+    void populatePluginCache();
     bool m_pluginCacheIsPopulated;
     bool m_shouldRefreshPlugins;
     Vector<WebCore::PluginInfo> m_cachedPlugins;
     Vector<WebCore::PluginInfo> m_cachedApplicationPlugins;
-
-#if PLATFORM(MAC)
-    HashMap<String, PluginPolicyMapsByIdentifier> m_hostsToPluginIdentifierData;
-    bool pluginLoadClientPolicyForHost(const String&, const WebCore::PluginInfo&, WebCore::PluginLoadClientPolicy&) const;
-#endif // PLATFORM(MAC)
 #endif // ENABLE(NETSCAPE_PLUGIN_API)
 };

trunk/Source/WebKit2/WebProcess/WebPage/WebPage.cpp

@@ -4427 +4427 @@
 
     const PluginData& pluginData = m_page->pluginData();
-    if (pluginData.supportsWebVisibleMimeType(MIMEType, PluginData::AllPlugins) && corePage()->mainFrame().loader().subframeLoader().allowPlugins(NotAboutToInstantiatePlugin))
+    if (pluginData.supportsMimeType(MIMEType, PluginData::AllPlugins) && corePage()->mainFrame().loader().subframeLoader().allowPlugins(NotAboutToInstantiatePlugin))
         return true;
 
     // We can use application plugins even if plugins aren't enabled.
-    if (pluginData.supportsWebVisibleMimeType(MIMEType, PluginData::OnlyApplicationPlugins))
+    if (pluginData.supportsMimeType(MIMEType, PluginData::OnlyApplicationPlugins))
         return true;
 

trunk/Source/WebKit2/WebProcess/WebProcess.cpp

@@ -385 +385 @@
     }
 #endif
-
-#if ENABLE(NETSCAPE_PLUGIN_API) && PLATFORM(MAC)
-    for (const auto& hostKeyValue : parameters.pluginLoadClientPolicies) {
-        for (const auto& bundleIdentifierKeyValue : hostKeyValue.value) {
-            for (const auto& versionStringKeyValue : bundleIdentifierKeyValue.value)
-                platformStrategies()->pluginStrategy()->setPluginLoadClientPolicy(static_cast<PluginLoadClientPolicy>(versionStringKeyValue.value), hostKeyValue.key, bundleIdentifierKeyValue.key, versionStringKeyValue.key);
-        }
-    }
-#endif
 }
 
@@ -870 +861 @@
 
     parentProcessConnection()->send(Messages::WebProcessPool::PlugInDidReceiveUserInteraction(plugInOriginHash, sessionID), 0);
-}
-
-void WebProcess::setPluginLoadClientPolicy(uint8_t policy, const String& host, const String& bundleIdentifier, const String& versionString)
-{
-#if ENABLE(NETSCAPE_PLUGIN_API) && PLATFORM(MAC)
-    platformStrategies()->pluginStrategy()->setPluginLoadClientPolicy(static_cast<PluginLoadClientPolicy>(policy), host, bundleIdentifier, versionString);
-#endif
-}
-
-void WebProcess::clearPluginClientPolicies()
-{
-#if ENABLE(NETSCAPE_PLUGIN_API) && PLATFORM(MAC)
-    platformStrategies()->pluginStrategy()->clearPluginClientPolicies();
-#endif
 }
 

trunk/Source/WebKit2/WebProcess/WebProcess.h

@@ -124 +124 @@
     void plugInDidStartFromOrigin(const String& pageOrigin, const String& pluginOrigin, const String& mimeType, WebCore::SessionID);
     void plugInDidReceiveUserInteraction(const String& pageOrigin, const String& pluginOrigin, const String& mimeType, WebCore::SessionID);
-    void setPluginLoadClientPolicy(uint8_t policy, const String& host, const String& bundleIdentifier, const String& versionString);
-    void clearPluginClientPolicies();
 
     bool fullKeyboardAccessEnabled() const { return m_fullKeyboardAccessEnabled; }

trunk/Source/WebKit2/WebProcess/WebProcess.messages.in

@@ -57 +57 @@
     ResetPlugInAutoStartOriginDefaultHashes(HashMap<uint32_t,double> hashes)
     ResetPlugInAutoStartOriginHashes(HashMap<WebCore::SessionID, HashMap<uint32_t,double>> hashes)
-    SetPluginLoadClientPolicy(uint8_t policy, String host, String bundleIdentifier, String versionString)
-    ClearPluginClientPolicies()
 
     void StartMemorySampler(WebKit::SandboxExtension::Handle sampleLogFileHandle, String sampleLogFilePath, double interval);