| 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..f10a9cf9cae70a091863e03ef4040581f503a2be 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& mainFrameOrigin) { return adoptRef(new PluginData(mainFrameOrigin)); }
|
|
|
| const Vector<PluginInfo>& plugins() const { return m_plugins; }
|
| const Vector<MimeClassInfo>& mimes() const { return m_mimes; }
|
| @@ -62,10 +62,10 @@ public:
|
| String pluginNameForMimeType(const String& mimeType) const;
|
|
|
| static void refresh();
|
| + static bool m_refresh;
|
|
|
| private:
|
| - explicit PluginData(const Page*);
|
| - void initPlugins(const Page*);
|
| + explicit PluginData(const WebSecurityOrigin& mainFrameOrigin);
|
| const PluginInfo* pluginInfoForMimeType(const String& mimeType) const;
|
|
|
| Vector<PluginInfo> m_plugins;
|
|
|