Changeset 143124 in webkit

Timestamp:

Feb 16, 2013, 10:01:39 PM (13 years ago)

Author:

akling@apple.com

Message:

Source/WebCore: Remove multi-threading gunk from WebKit2's PluginInfoStore.
<​http://webkit.org/b/110046>

Reviewed by Alexey Proskuryakov.

Remove now-unused code for making deep (isolated) copies of WebCore plugin structures.

• plugins/PluginData.h:

(MimeClassInfo):
(PluginInfo):

Source/WebKit2: Remove multi-threading gunk from PluginInfoStore.
<​http://webkit.org/b/110046>

Reviewed by Alexey Proskuryakov.

PluginInfoStore is never accessed from multiple threads anymore, so remove the Mutex locking
and stop making isolated copies of everything.

• Shared/Plugins/PluginModuleInfo.h:

(PluginModuleInfo):

• UIProcess/Plugins/PluginInfoStore.cpp:

(WebKit::PluginInfoStore::loadPluginsIfNecessary):
(WebKit::PluginInfoStore::plugins):
(WebKit::PluginInfoStore::findPluginForMIMEType):
(WebKit::PluginInfoStore::findPluginForExtension):
(WebKit::PluginInfoStore::findPlugin):
(WebKit::PluginInfoStore::infoForPluginWithPath):

• UIProcess/Plugins/PluginInfoStore.h:

(PluginInfoStore):

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) (6 diffs)
• WebKit2/UIProcess/Plugins/PluginInfoStore.h (modified) (2 diffs)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2013-02-16  Andreas Kling  <akling@apple.com>
+
+        Remove multi-threading gunk from WebKit2's PluginInfoStore.
+        <http://webkit.org/b/110046>
+
+        Reviewed by Alexey Proskuryakov.
+
+        Remove now-unused code for making deep (isolated) copies of WebCore plugin structures.
+
+        * plugins/PluginData.h:
+        (MimeClassInfo):
+        (PluginInfo):
+
 2013-02-16  Alexey Proskuryakov  <ap@apple.com>
 

trunk/Source/WebCore/plugins/PluginData.h

@@ -34 +34 @@
     String desc;
     Vector<String> extensions;
-
-    MimeClassInfo isolatedCopy() const
-    {
-        MimeClassInfo clone;
-        clone.type = type.isolatedCopy();
-        clone.desc = desc.isolatedCopy();
-        for (unsigned i = 0; i < extensions.size(); ++i)
-            clone.extensions.append(extensions[i].isolatedCopy());
-        return clone;
-    }
 };
 
@@ -56 +46 @@
     String desc;
     Vector<MimeClassInfo> mimes;
-
-    PluginInfo isolatedCopy() const
-    {
-        PluginInfo clone;
-        clone.name = name.isolatedCopy();
-        clone.file = file.isolatedCopy();
-        clone.desc = desc.isolatedCopy();
-        for (unsigned i = 0; i < mimes.size(); ++i)
-            clone.mimes.append(mimes[i].isolatedCopy());
-        return clone;
-    }
 };
 

trunk/Source/WebKit2/ChangeLog

@@ +1 @@
+2013-02-16  Andreas Kling  <akling@apple.com>
+
+        Remove multi-threading gunk from PluginInfoStore.
+        <http://webkit.org/b/110046>
+
+        Reviewed by Alexey Proskuryakov.
+
+        PluginInfoStore is never accessed from multiple threads anymore, so remove the Mutex locking
+        and stop making isolated copies of everything.
+
+        * Shared/Plugins/PluginModuleInfo.h:
+        (PluginModuleInfo):
+        * UIProcess/Plugins/PluginInfoStore.cpp:
+        (WebKit::PluginInfoStore::loadPluginsIfNecessary):
+        (WebKit::PluginInfoStore::plugins):
+        (WebKit::PluginInfoStore::findPluginForMIMEType):
+        (WebKit::PluginInfoStore::findPluginForExtension):
+        (WebKit::PluginInfoStore::findPlugin):
+        (WebKit::PluginInfoStore::infoForPluginWithPath):
+        * UIProcess/Plugins/PluginInfoStore.h:
+        (PluginInfoStore):
+
 2013-02-16  Sam Weinig  <sam@webkit.org>
 

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

@@ -56 +56 @@
     String versionString;
 #endif
-
-    PluginModuleInfo isolatedCopy() const
-    {
-        PluginModuleInfo clone;
-        clone.path = path.isolatedCopy();
-        clone.info = info.isolatedCopy();
-#if PLATFORM(MAC)
-        clone.pluginArchitecture = pluginArchitecture;
-        clone.bundleIdentifier = bundleIdentifier.isolatedCopy();
-        clone.versionString = versionString.isolatedCopy();
-#endif
-        return clone;
-    }
 };
 

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

@@ -72 +72 @@
 #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()
 {
@@ -101 +91 @@
     addFromVector(uniquePluginPaths, individualPluginPaths());
 
-    Vector<PluginModuleInfo> plugins;
-
     PathHashSet::const_iterator end = uniquePluginPaths.end();
     for (PathHashSet::const_iterator it = uniquePluginPaths.begin(); it != end; ++it)
-        loadPlugin(plugins, *it);
-
-    m_plugins = deepIsolatedCopyPluginInfoVector(plugins);
+        loadPlugin(m_plugins, *it);
 
     m_pluginListIsUpToDate = true;
@@ -127 +113 @@
 Vector<PluginModuleInfo> PluginInfoStore::plugins()
 {
-    MutexLocker locker(m_pluginsLock);
     loadPluginsIfNecessary();
-    return deepIsolatedCopyPluginInfoVector(m_plugins);
+    return m_plugins;
 }
 
 PluginModuleInfo PluginInfoStore::findPluginForMIMEType(const String& mimeType) const
 {
-    MutexLocker locker(m_pluginsLock);
-
     ASSERT(!mimeType.isNull());
     
@@ -153 +136 @@
 PluginModuleInfo PluginInfoStore::findPluginForExtension(const String& extension, String& mimeType) const
 {
-    MutexLocker locker(m_pluginsLock);
-
     ASSERT(!extension.isNull());
     
@@ -208 +189 @@
 PluginModuleInfo PluginInfoStore::findPlugin(String& mimeType, const KURL& url)
 {
-    {
-        MutexLocker locker(m_pluginsLock);
-        loadPluginsIfNecessary();
-    }
+    loadPluginsIfNecessary();
     
     // First, check if we can get the plug-in based on its MIME type.
@@ -243 +221 @@
 PluginModuleInfo PluginInfoStore::infoForPluginWithPath(const String& pluginPath) const
 {
-    MutexLocker locker(m_pluginsLock);
-
     for (size_t i = 0; i < m_plugins.size(); ++i) {
         if (m_plugins[i].path == pluginPath)

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

@@ -30 +30 @@
 
 #include "PluginModuleInfo.h"
-#include <wtf/ThreadingPrimitives.h>
 
 namespace WebCore {
@@ -90 +89 @@
     Vector<PluginModuleInfo> m_plugins;
     bool m_pluginListIsUpToDate;
-
-    mutable Mutex m_pluginsLock;
 };