Changeset 30927 in webkit

Timestamp:

Mar 10, 2008, 6:59:37 AM (17 years ago)

Author:

Simon Hausmann

Message:

2008-03-10 Simon Hausmann <Simon Hausmann>

Reviewed by Lars.

Fix reference counting of returned MimeType and Plugin objects
created in the array wrappers.

Location:

trunk/WebCore

Files:

• ChangeLog (modified) (1 diff)
• plugins/MimeTypeArray.cpp (modified) (2 diffs)
• plugins/MimeTypeArray.h (modified) (3 diffs)
• plugins/Plugin.cpp (modified) (2 diffs)
• plugins/Plugin.h (modified) (1 diff)
• plugins/PluginArray.cpp (modified) (2 diffs)
• plugins/PluginArray.h (modified) (3 diffs)

trunk/WebCore/ChangeLog

@@ +1 @@
+2008-03-10  Simon Hausmann  <hausmann@webkit.org>
+
+        Reviewed by Lars.
+
+        Fix reference counting of returned MimeType and Plugin objects
+        created in the array wrappers.
+
+        * plugins/MimeTypeArray.cpp:
+        * plugins/MimeTypeArray.h:
+        * plugins/Plugin.cpp:
+        * plugins/Plugin.h:
+        * plugins/PluginArray.cpp:
+        * plugins/PluginArray.h:
+
 2008-03-10  Simon Hausmann  <hausmann@webkit.org>
 

trunk/WebCore/plugins/MimeTypeArray.cpp

@@ -45 +45 @@
 }
 
-MimeType* MimeTypeArray::item(unsigned index)
+PassRefPtr<MimeType> MimeTypeArray::item(unsigned index)
 {
     PluginData* data = getPluginData();
@@ -69 +69 @@
 }
 
-MimeType* MimeTypeArray::nameGetter(const AtomicString& propertyName)
+PassRefPtr<MimeType> MimeTypeArray::nameGetter(const AtomicString& propertyName)
 {
     PluginData *data = getPluginData();

trunk/WebCore/plugins/MimeTypeArray.h

@@ -21 +21 @@
 #define MimeTypeArray_h
 
+#include "MimeType.h"
 #include <wtf/PassRefPtr.h>
 #include <wtf/RefCounted.h>
@@ -34 +35 @@
     class AtomicString;
     class Frame;
-    class MimeType;
     class PluginData;
 
@@ -48 +48 @@
 
         unsigned length() const;
-        MimeType* item(unsigned index);
+        PassRefPtr<MimeType> item(unsigned index);
         bool canGetItemsForName(const AtomicString& propertyName);
-        MimeType* nameGetter(const AtomicString& propertyName);
+        PassRefPtr<MimeType> nameGetter(const AtomicString& propertyName);
     private:
         MimeTypeArray(Frame*);

trunk/WebCore/plugins/Plugin.cpp

@@ -56 +56 @@
 }
 
-MimeType* Plugin::item(unsigned index)
+PassRefPtr<MimeType> Plugin::item(unsigned index)
 {
     const Vector<PluginInfo*>& plugins = m_pluginData->plugins();
@@ -80 +80 @@
 }
 
-MimeType* Plugin::nameGetter(const AtomicString& propertyName)
+PassRefPtr<MimeType> Plugin::nameGetter(const AtomicString& propertyName)
 {
     const Vector<MimeClassInfo*>& mimes = m_pluginData->mimes();

trunk/WebCore/plugins/Plugin.h

@@ -52 +52 @@
         unsigned length() const;
 
-        MimeType* item(unsigned index);
+        PassRefPtr<MimeType> item(unsigned index);
         bool canGetItemsForName(const AtomicString& propertyName);
-        MimeType* nameGetter(const AtomicString& propertyName);
+        PassRefPtr<MimeType> nameGetter(const AtomicString& propertyName);
 
     private:

trunk/WebCore/plugins/PluginArray.cpp

@@ -45 +45 @@
 }
 
-Plugin* PluginArray::item(unsigned index)
+PassRefPtr<Plugin> PluginArray::item(unsigned index)
 {
     PluginData* data = getPluginData();
@@ -69 +69 @@
 }
 
-Plugin* PluginArray::nameGetter(const AtomicString& propertyName)
+PassRefPtr<Plugin> PluginArray::nameGetter(const AtomicString& propertyName)
 {
     PluginData* data = getPluginData();

trunk/WebCore/plugins/PluginArray.h

@@ -21 +21 @@
 #define PluginArray_h
 
+#include "Plugin.h"
 #include <wtf/PassRefPtr.h>
 #include <wtf/RefCounted.h>
@@ -34 +35 @@
     class AtomicString;
     class Frame;
-    class Plugin;
     class PluginData;
 
@@ -48 +48 @@
 
         unsigned length() const;
-        Plugin* item(unsigned index);
+        PassRefPtr<Plugin> item(unsigned index);
         bool canGetItemsForName(const AtomicString& propertyName);
-        Plugin* nameGetter(const AtomicString& propertyName);
+        PassRefPtr<Plugin> nameGetter(const AtomicString& propertyName);
 
         void refresh(bool reload);