Title: [117471] trunk/Source
- Revision
- 117471
- Author
- kl...@webkit.org
- Date
- 2012-05-17 11:48:29 -0700 (Thu, 17 May 2012)
Log 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):
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (117470 => 117471)
--- trunk/Source/WebCore/ChangeLog 2012-05-17 18:44:39 UTC (rev 117470)
+++ trunk/Source/WebCore/ChangeLog 2012-05-17 18:48:29 UTC (rev 117471)
@@ -1,3 +1,15 @@
+2012-05-16 Andreas Kling <kl...@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 <hb...@chromium.org>
[Refactoring] Move platform-specific code in Editor::respondToChangedSelection to the WebKit layer
Modified: trunk/Source/WebCore/plugins/PluginData.h (117470 => 117471)
--- trunk/Source/WebCore/plugins/PluginData.h 2012-05-17 18:44:39 UTC (rev 117470)
+++ trunk/Source/WebCore/plugins/PluginData.h 2012-05-17 18:48:29 UTC (rev 117471)
@@ -34,7 +34,7 @@
String desc;
Vector<String> extensions;
- MimeClassInfo isolatedCopy()
+ MimeClassInfo isolatedCopy() const
{
MimeClassInfo clone;
clone.type = type.isolatedCopy();
@@ -56,7 +56,7 @@
String desc;
Vector<MimeClassInfo> mimes;
- PluginInfo isolatedCopy()
+ PluginInfo isolatedCopy() const
{
PluginInfo clone;
clone.name = name.isolatedCopy();
Modified: trunk/Source/WebKit2/ChangeLog (117470 => 117471)
--- trunk/Source/WebKit2/ChangeLog 2012-05-17 18:44:39 UTC (rev 117470)
+++ trunk/Source/WebKit2/ChangeLog 2012-05-17 18:48:29 UTC (rev 117471)
@@ -1,3 +1,21 @@
+2012-05-16 Andreas Kling <kl...@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 <hb...@chromium.org>
[Refactoring] Move platform-specific code in Editor::respondToChangedSelection to the WebKit layer
Modified: trunk/Source/WebKit2/Shared/Plugins/PluginModuleInfo.h (117470 => 117471)
--- trunk/Source/WebKit2/Shared/Plugins/PluginModuleInfo.h 2012-05-17 18:44:39 UTC (rev 117470)
+++ trunk/Source/WebKit2/Shared/Plugins/PluginModuleInfo.h 2012-05-17 18:48:29 UTC (rev 117471)
@@ -42,7 +42,7 @@
uint64_t fileVersion;
#endif
- PluginModuleInfo isolatedCopy()
+ PluginModuleInfo isolatedCopy() const
{
PluginModuleInfo clone;
clone.path = path.isolatedCopy();
Modified: trunk/Source/WebKit2/UIProcess/Plugins/PluginInfoStore.cpp (117470 => 117471)
--- trunk/Source/WebKit2/UIProcess/Plugins/PluginInfoStore.cpp 2012-05-17 18:44:39 UTC (rev 117470)
+++ trunk/Source/WebKit2/UIProcess/Plugins/PluginInfoStore.cpp 2012-05-17 18:48:29 UTC (rev 117471)
@@ -69,6 +69,16 @@
typedef ListHashSet<String, 32> PathHashSet;
#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()
{
if (m_pluginListIsUpToDate)
@@ -94,7 +104,8 @@
for (PathHashSet::const_iterator it = uniquePluginPaths.begin(); it != end; ++it)
loadPlugin(plugins, *it);
- m_plugins.swap(plugins);
+ m_plugins = deepIsolatedCopyPluginInfoVector(plugins);
+
m_pluginListIsUpToDate = true;
}
@@ -115,13 +126,7 @@
{
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);
}
PluginModuleInfo PluginInfoStore::findPluginForMIMEType(const String& mimeType) const
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
