Changeset 117471 in webkit

Timestamp:

May 17, 2012 11:48:29 AM (12 years ago)

Author:

kling@webkit.org

Message:

Make PluginInfoStore properly thread-safe.
<​http://webkit.org/b/86648>
<rdar://problem/11451178>

Reviewed by Darin Adler.

Source/WebCore:

• plugins/PluginData.h:

(WebCore::MimeClassInfo::isolatedCopy):
(WebCore::PluginInfo::isolatedCopy):

Source/WebKit2:

Deep copy the internal storage of PluginInfoStore after constructing it, as we can
be doing this from a secondary thread.

• Shared/Plugins/PluginModuleInfo.h:

(WebKit::PluginModuleInfo::isolatedCopy):

• UIProcess/Plugins/PluginInfoStore.cpp:

(WebKit::deepIsolatedCopyPluginInfoVector):
(WebKit::PluginInfoStore::loadPluginsIfNecessary):
(WebKit::PluginInfoStore::plugins):

Location:

trunk/Source

Files:

• WebCore/ChangeLog (modified) (1 diff)
• WebCore/plugins/PluginData.h (modified) (2 diffs)
• WebKit2/ChangeLog (modified) (1 diff)
• WebKit2/Shared/Plugins/PluginModuleInfo.h (modified) (1 diff)
• WebKit2/UIProcess/Plugins/PluginInfoStore.cpp (modified) (3 diffs)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2012-05-16  Andreas Kling  <kling@webkit.org>
+
+        Make PluginInfoStore properly thread-safe.
+        <http://webkit.org/b/86648>
+        <rdar://problem/11451178>
+
+        Reviewed by Darin Adler.
+
+        * plugins/PluginData.h:
+        (WebCore::MimeClassInfo::isolatedCopy):
+        (WebCore::PluginInfo::isolatedCopy):
+
 2012-05-17  Hironori Bono  <hbono@chromium.org>
 

trunk/Source/WebCore/plugins/PluginData.h

@@ -35 +35 @@
     Vector<String> extensions;
 
-    MimeClassInfo isolatedCopy()
+    MimeClassInfo isolatedCopy() const
     {
         MimeClassInfo clone;
@@ -57 +57 @@
     Vector<MimeClassInfo> mimes;
 
-    PluginInfo isolatedCopy()
+    PluginInfo isolatedCopy() const
     {
         PluginInfo clone;

trunk/Source/WebKit2/ChangeLog

@@ +1 @@
+2012-05-16  Andreas Kling  <kling@webkit.org>
+
+        Make PluginInfoStore properly thread-safe.
+        <http://webkit.org/b/86648>
+        <rdar://problem/11451178>
+
+        Reviewed by Darin Adler.
+
+        Deep copy the internal storage of PluginInfoStore after constructing it, as we can
+        be doing this from a secondary thread.
+
+        * Shared/Plugins/PluginModuleInfo.h:
+        (WebKit::PluginModuleInfo::isolatedCopy):
+        * UIProcess/Plugins/PluginInfoStore.cpp:
+        (WebKit::deepIsolatedCopyPluginInfoVector):
+        (WebKit::PluginInfoStore::loadPluginsIfNecessary):
+        (WebKit::PluginInfoStore::plugins):
+
 2012-05-17  Hironori Bono  <hbono@chromium.org>
 

trunk/Source/WebKit2/Shared/Plugins/PluginModuleInfo.h

@@ -43 +43 @@
 #endif
 
-    PluginModuleInfo isolatedCopy()
+    PluginModuleInfo isolatedCopy() const
     {
         PluginModuleInfo clone;

trunk/Source/WebKit2/UIProcess/Plugins/PluginInfoStore.cpp

@@ -70 +70 @@
 #endif
 
+static inline Vector<PluginModuleInfo> deepIsolatedCopyPluginInfoVector(const Vector<PluginModuleInfo>& vector)
+{
+    // Let the copy begin!
+    Vector<PluginModuleInfo> copy;
+    copy.reserveCapacity(vector.size());
+    for (unsigned i = 0; i < vector.size(); ++i)
+        copy.append(vector[i].isolatedCopy());
+    return copy;
+}
+
 void PluginInfoStore::loadPluginsIfNecessary()
 {
@@ -95 +105 @@
         loadPlugin(plugins, *it);
 
-    m_plugins.swap(plugins);
+    m_plugins = deepIsolatedCopyPluginInfoVector(plugins);
+
     m_pluginListIsUpToDate = true;
 }
@@ -116 +127 @@
     MutexLocker locker(m_pluginsLock);
     loadPluginsIfNecessary();
-
-    // Let the copy begin!
-    Vector<PluginModuleInfo> infos;
-    for (unsigned i = 0; i < m_plugins.size(); ++i)
-        infos.append(m_plugins[i].isolatedCopy());
-
-    return infos;
+    return deepIsolatedCopyPluginInfoVector(m_plugins);
 }