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

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

Index: third_party/WebKit/Source/platform/plugins/PluginData.h
diff --git a/third_party/WebKit/Source/platform/plugins/PluginData.h b/third_party/WebKit/Source/platform/plugins/PluginData.h
index e5716954d23e1315493cbbe0b6d0324e27103190..62531aab84bdc162176c648c6c36139ada82e81c 100644
--- a/third_party/WebKit/Source/platform/plugins/PluginData.h
+++ b/third_party/WebKit/Source/platform/plugins/PluginData.h
@@ -21,6 +21,7 @@
 #define PluginData_h
 
 #include "platform/PlatformExport.h"
+#include "platform/weborigin/SecurityOrigin.h"
 #include "wtf/Noncopyable.h"
 #include "wtf/RefCounted.h"
 #include "wtf/Vector.h"
@@ -28,7 +29,6 @@
 
 namespace blink {
 
-class Page;
 struct PluginInfo;
 
 struct MimeClassInfo {
@@ -52,25 +52,27 @@ struct PluginInfo {
 class PLATFORM_EXPORT PluginData : public RefCounted<PluginData> {
     WTF_MAKE_NONCOPYABLE(PluginData);
 public:
-    static PassRefPtr<PluginData> create(const Page* page) { return adoptRef(new PluginData(page)); }
+    static PassRefPtr<PluginData> create(SecurityOrigin* mainFrameOrigin) { return adoptRef(new PluginData(mainFrameOrigin)); }
 
     const Vector<PluginInfo>& plugins() const { return m_plugins; }
     const Vector<MimeClassInfo>& mimes() const { return m_mimes; }
     const Vector<size_t>& mimePluginIndices() const { return m_mimePluginIndices; }
+    const SecurityOrigin* origin() const { return m_mainFrameOrigin.get(); }
 
     bool supportsMimeType(const String& mimeType) const;
     String pluginNameForMimeType(const String& mimeType) const;
 
     static void refresh();
+    static bool m_refresh;

[esprehn, 2016/08/26 04:46:03]

s_ for static

[trizzofo, 2016/08/26 20:28:00]

Done.

 
 private:
-    explicit PluginData(const Page*);
-    void initPlugins(const Page*);
+    explicit PluginData(SecurityOrigin* mainFrameOrigin);
     const PluginInfo* pluginInfoForMimeType(const String& mimeType) const;
 
     Vector<PluginInfo> m_plugins;
     Vector<MimeClassInfo> m_mimes;
     Vector<size_t> m_mimePluginIndices;
+    RefPtr<SecurityOrigin> m_mainFrameOrigin;
 };
 
 } // namespace blink