webkitgtk-2.16.5HEADwebkitgtk-2.16.5master

1 files changed, 8 insertions, 14 deletions

diff --git a/Source/WebCore/plugins/DOMPlugin.h b/Source/WebCore/plugins/DOMPlugin.h
index 908b94f91..91124eea1 100644
--- a/Source/WebCore/plugins/DOMPlugin.h
+++ b/Source/WebCore/plugins/DOMPlugin.h
@@ -17,15 +17,13 @@
     Boston, MA 02110-1301, USA.
 */
 
-#ifndef DOMPlugin_h
-#define DOMPlugin_h
+#pragma once
 
 #include "FrameDestructionObserver.h"
 #include "DOMMimeType.h"
 #include "ScriptWrappable.h"
-#include <wtf/Forward.h>
-#include <wtf/RefPtr.h>
 #include <wtf/RefCounted.h>
+#include <wtf/RefPtr.h>
 
 namespace WebCore {
 
@@ -34,7 +32,7 @@ class PluginData;
 
 class DOMPlugin : public ScriptWrappable, public RefCounted<DOMPlugin>, public FrameDestructionObserver {
 public:
-    static PassRefPtr<DOMPlugin> create(PluginData* pluginData, Frame* frame, unsigned index) { return adoptRef(new DOMPlugin(pluginData, frame, index)); }
+    static Ref<DOMPlugin> create(PluginData* pluginData, Frame* frame, PluginInfo pluginInfo) { return adoptRef(*new DOMPlugin(pluginData, frame, WTFMove(pluginInfo))); }
     ~DOMPlugin();
 
     String name() const;
@@ -43,18 +41,14 @@ public:
 
     unsigned length() const;
 
-    PassRefPtr<DOMMimeType> item(unsigned index);
-    bool canGetItemsForName(const AtomicString& propertyName);
-    PassRefPtr<DOMMimeType> namedItem(const AtomicString& propertyName);
+    RefPtr<DOMMimeType> item(unsigned index);
+    RefPtr<DOMMimeType> namedItem(const AtomicString& propertyName);
+    Vector<AtomicString> supportedPropertyNames();
 
 private:
-    const PluginInfo& pluginInfo() const { return m_pluginData->plugins()[m_index]; }
-
-    DOMPlugin(PluginData*, Frame*, unsigned index);
+    DOMPlugin(PluginData*, Frame*, PluginInfo);
     RefPtr<PluginData> m_pluginData;
-    unsigned m_index;
+    PluginInfo m_pluginInfo;
 };
 
 } // namespace WebCore
-
-#endif // Plugin_h