[HBD] Remove PluginCache and reload plugin list when origin changes

third_party/WebKit/Source/platform/plugins/PluginData.cpp

 /*
     Copyright (C) 2000 Harri Porten (porten@kde.org)
     Copyright (C) 2000 Daniel Molkentin (molkentin@kde.org)
     Copyright (C) 2000 Stefan Schimanski (schimmi@kde.org)
     Copyright (C) 2003, 2004, 2005, 2006, 2007 Apple Inc. All Rights Reserved.
     Copyright (C) 2008 Nokia Corporation and/or its subsidiary(-ies)
 
     This library is free software; you can redistribute it and/or
     modify it under the terms of the GNU Library General Public
     License as published by the Free Software Foundation; either
     version 2 of the License, or (at your option) any later version.
 
     This library is distributed in the hope that it will be useful,
     but WITHOUT ANY WARRANTY; without even the implied warranty of
     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
     Library General Public License for more details.
 
     You should have received a copy of the GNU Library General Public License
     along with this library; see the file COPYING.LIB.  If not, write to
     the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
     Boston, MA 02110-1301, USA.
 */
 
 #include "platform/plugins/PluginData.h"
 
 #include "platform/plugins/PluginListBuilder.h"
 #include "public/platform/Platform.h"
+#include "public/platform/WebSecurityOrigin.h"
 
 namespace blink {
-
-class PluginCache {
-public:
-    PluginCache() : m_loaded(false), m_refresh(false) { }
-    ~PluginCache() { reset(false); }
-
-    void reset(bool refresh)
-    {
-        m_plugins.clear();
-        m_loaded = false;
-        m_refresh = refresh;
-    }
-
-    const Vector<PluginInfo>& plugins()
-    {
-        if (!m_loaded) {
-            PluginListBuilder builder(&m_plugins);
-            Platform::current()->getPluginList(m_refresh, &builder);
-            m_loaded = true;
-            m_refresh = false;
-        }
-        return m_plugins;
-    }
-
-private:
-    Vector<PluginInfo> m_plugins;
-    bool m_loaded;
-    bool m_refresh;
-};
-
-static PluginCache& pluginCache()
+PluginData::PluginData(const WebSecurityOrigin* origin)

[alexmos, 2016/08/02 22:06:28]

nit: empty line before this.

[trizzofo, 2016/08/03 00:08:37]

Done.

 {
-    DEFINE_STATIC_LOCAL(PluginCache, cache, ());
-    return cache;
-}
-
-PluginData::PluginData(const Page* page)
-{
-    initPlugins(page);
+    PluginListBuilder builder(&m_plugins);
+    Platform::current()->getPluginList(m_refresh, origin, &builder);
+    m_refresh = false;
 
     for (unsigned i = 0; i < m_plugins.size(); ++i) {
         const PluginInfo& plugin = m_plugins[i];
         for (unsigned j = 0; j < plugin.mimes.size(); ++j) {
             m_mimes.append(plugin.mimes[j]);
             m_mimePluginIndices.append(i);
         }
     }
 }
 
@@ skipping 17 matching lines @@
     return 0;
 }
 
 String PluginData::pluginNameForMimeType(const String& mimeType) const
 {
     if (const PluginInfo* info = pluginInfoForMimeType(mimeType))
         return info->name;
     return String();
 }
 
-void PluginData::initPlugins(const Page*)
-{
-    const Vector<PluginInfo>& plugins = pluginCache().plugins();
-    for (size_t i = 0; i < plugins.size(); ++i)
-        m_plugins.append(plugins[i]);
-}
-
 void PluginData::refresh()
 {
-    pluginCache().reset(true);
-    pluginCache().plugins(); // Force the plugins to be reloaded now.
+    m_refresh = true;
 }
 
 String getPluginMimeTypeFromExtension(const String& extension)
 {
-    const Vector<PluginInfo>& plugins = pluginCache().plugins();
+    Vector<PluginInfo> plugins;
+    PluginListBuilder builder(&plugins);
+    Platform::current()->getPluginList(PluginData::m_refresh, nullptr, &builder);

[alexmos, 2016/08/02 22:06:28]

Why doesn't this case need the origin?  (Or rather, why is it ok to use the
unique origin for this case?)

[tommycli, 2016/08/02 23:03:16]

Hi. This is used to fill-in the MIME types of unknown extensions, whereas
everything else is used to inform how to render the page.

It kind of sucks that it passes any origin at all, since the ideal behavior
would be: "Ignore content settings, and just give me the whole list of plugins".

But stepping back: Looking at the callsites, this only appears to be used as a
last-resort when the extension doesn't match any well known extension.

Since now the only PPAPI plugins are Flash, NaCl and Widevine, I would be
surprised if this function ever does anything useful. I think if we deleted it
right now, no one would notice. It's not like the NPAPI days when users had
plugins for Unity, Quicktime, etc.

There might be an edge case where we would want to add .swf, .pexe, and .nexe
extensions to the well known mime types database, but I actually think no one
would notice that either.

tldr: Let's just delete this function and I don't think anyone will notice.

[alexmos, 2016/08/04 05:32:02]

Sounds reasonable to me.

+    PluginData::m_refresh = false;
     for (size_t i = 0; i < plugins.size(); ++i) {
         for (size_t j = 0; j < plugins[i].mimes.size(); ++j) {
             const MimeClassInfo& mime = plugins[i].mimes[j];
             const Vector<String>& extensions = mime.extensions;
             for (size_t k = 0; k < extensions.size(); ++k) {
                 if (extension == extensions[k])
                     return mime.type;
             }
         }
     }
     return String();
 }
 
+bool PluginData::m_refresh = false;
+
 } // namespace blink