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

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

Index: third_party/WebKit/Source/platform/plugins/PluginData.cpp
diff --git a/third_party/WebKit/Source/platform/plugins/PluginData.cpp b/third_party/WebKit/Source/platform/plugins/PluginData.cpp
index 4897488b842de7a845c17c668d7a12426384c840..eebe0b8edd453f0a5b0a581a140f2c03ccafc01b 100644
--- a/third_party/WebKit/Source/platform/plugins/PluginData.cpp
+++ b/third_party/WebKit/Source/platform/plugins/PluginData.cpp
@@ -25,47 +25,12 @@
 
 #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)
 {
-    DEFINE_STATIC_LOCAL(PluginCache, cache, ());
-    return cache;
-}
-
-PluginData::PluginData(const Page* page)
-{
-    initPlugins(page);
+    initPlugins(origin);
 
     for (unsigned i = 0; i < m_plugins.size(); ++i) {
         const PluginInfo& plugin = m_plugins[i];
@@ -103,22 +68,35 @@ String PluginData::pluginNameForMimeType(const String& mimeType) const
     return String();
 }
 
-void PluginData::initPlugins(const Page*)
+void PluginData::checkOriginChange(const WebSecurityOrigin& origin)
+{
+    if (m_origin.toString() != origin.toString()) {
+        m_origin = origin;
+        PluginListBuilder builder(&m_plugins);
+        Platform::current()->getPluginList(m_refresh, &m_origin, &builder);
+        m_refresh = false;
+    }
+}
+
+void PluginData::initPlugins(const WebSecurityOrigin& origin)
 {
-    const Vector<PluginInfo>& plugins = pluginCache().plugins();
-    for (size_t i = 0; i < plugins.size(); ++i)
-        m_plugins.append(plugins[i]);
+    m_origin = origin;
+    PluginListBuilder builder(&m_plugins);
+    Platform::current()->getPluginList(m_refresh, &m_origin, &builder);
+    m_refresh = false;
 }
 
 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);
+    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];
@@ -132,4 +110,6 @@ String getPluginMimeTypeFromExtension(const String& extension)
     return String();
 }
 
+bool PluginData::m_refresh = false;
+
 } // namespace blink