Title: [142409] trunk/Source/WebKit2
- Revision
- 142409
- Author
- [email protected]
- Date
- 2013-02-10 09:55:59 -0800 (Sun, 10 Feb 2013)
Log Message
Add back code that was accidentally removed when moving plug-in enumeration back to the main thread
https://bugs.webkit.org/show_bug.cgi?id=109379
Reviewed by Andreas Kling.
* UIProcess/WebProcessProxy.cpp:
(WebKit::WebProcessProxy::getPlugins):
Modified Paths
Diff
Modified: trunk/Source/WebKit2/ChangeLog (142408 => 142409)
--- trunk/Source/WebKit2/ChangeLog 2013-02-10 17:48:53 UTC (rev 142408)
+++ trunk/Source/WebKit2/ChangeLog 2013-02-10 17:55:59 UTC (rev 142409)
@@ -1,3 +1,13 @@
+2013-02-10 Anders Carlsson <[email protected]>
+
+ Add back code that was accidentally removed when moving plug-in enumeration back to the main thread
+ https://bugs.webkit.org/show_bug.cgi?id=109379
+
+ Reviewed by Andreas Kling.
+
+ * UIProcess/WebProcessProxy.cpp:
+ (WebKit::WebProcessProxy::getPlugins):
+
2013-02-10 Kent Tamura <[email protected]>
Unreviewed, rolling out r142347.
Modified: trunk/Source/WebKit2/UIProcess/WebProcessProxy.cpp (142408 => 142409)
--- trunk/Source/WebKit2/UIProcess/WebProcessProxy.cpp 2013-02-10 17:48:53 UTC (rev 142408)
+++ trunk/Source/WebKit2/UIProcess/WebProcessProxy.cpp 2013-02-10 17:55:59 UTC (rev 142409)
@@ -306,11 +306,20 @@
Vector<PluginModuleInfo> pluginModules = m_context->pluginInfoStore().plugins();
for (size_t i = 0; i < pluginModules.size(); ++i)
plugins.append(pluginModules[i].info);
+
+#if PLATFORM(MAC)
+ // Add built-in PDF last, so that it's not used when a real plug-in is installed.
+ if (!m_context->omitPDFSupport()) {
+#if ENABLE(PDFKIT_PLUGIN)
+ plugins.append(PDFPlugin::pluginInfo());
+#endif
+ plugins.append(SimplePDFPlugin::pluginInfo());
+ }
+#endif
}
#endif // ENABLE(NETSCAPE_PLUGIN_API)
#if ENABLE(PLUGIN_PROCESS)
-
void WebProcessProxy::getPluginProcessConnection(const String& pluginPath, uint32_t processType, PassRefPtr<Messages::WebProcessProxy::GetPluginProcessConnection::DelayedReply> reply)
{
PluginProcessManager::shared().getPluginProcessConnection(m_context->pluginInfoStore(), pluginPath, static_cast<PluginProcess::Type>(processType), reply);
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
