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 1b881edf451e85ec65e9111e20cd1694754773a9..2c47ae1a38ea456ae368f3f6fb16ba73a759f9ed 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 "public/platform/WebSecurityOrigin.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,7 +52,7 @@ 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(const WebSecurityOrigin& origin) { return adoptRef(new PluginData(origin)); } |
const Vector<PluginInfo>& plugins() const { return m_plugins; } |
const Vector<MimeClassInfo>& mimes() const { return m_mimes; } |
@@ -60,17 +60,20 @@ public: |
bool supportsMimeType(const String& mimeType) const; |
String pluginNameForMimeType(const String& mimeType) const; |
+ void checkOriginChange(const WebSecurityOrigin&); |
static void refresh(); |
+ static bool m_refresh; |
private: |
- explicit PluginData(const Page*); |
- void initPlugins(const Page*); |
+ explicit PluginData(const WebSecurityOrigin&); |
+ void initPlugins(const WebSecurityOrigin&); |
const PluginInfo* pluginInfoForMimeType(const String& mimeType) const; |
Vector<PluginInfo> m_plugins; |
Vector<MimeClassInfo> m_mimes; |
Vector<size_t> m_mimePluginIndices; |
+ WebSecurityOrigin m_origin; |
tommycli
2016/07/29 23:38:19
my suggestion: Don't save m_origin here. Save it o
trizzofo
2016/08/01 23:36:14
Done.
|
}; |
// Checks if any of the plugins handle this extension, and if so returns the |