Title: [158613] branches/safari-537.73-branch/Source/WebKit2
- Revision
- 158613
- Author
- [email protected]
- Date
- 2013-11-04 16:33:16 -0800 (Mon, 04 Nov 2013)
Log Message
Merge change for <rdar://problem/15374298>.
Modified Paths
Diff
Modified: branches/safari-537.73-branch/Source/WebKit2/ChangeLog (158612 => 158613)
--- branches/safari-537.73-branch/Source/WebKit2/ChangeLog 2013-11-05 00:15:32 UTC (rev 158612)
+++ branches/safari-537.73-branch/Source/WebKit2/ChangeLog 2013-11-05 00:33:16 UTC (rev 158613)
@@ -1,3 +1,10 @@
+2013-11-04 Lucas Forschler <[email protected]>
+
+ Merge change from <rdar://problem/15374298>
+
+ * UIProcess/WebProcessProxy.cpp:
+ (WebKit::WebProcessProxy::getPlugins):
+
2013-10-31 Lucas Forschler <[email protected]>
Merge r157056
Modified: branches/safari-537.73-branch/Source/WebKit2/UIProcess/WebProcessProxy.cpp (158612 => 158613)
--- branches/safari-537.73-branch/Source/WebKit2/UIProcess/WebProcessProxy.cpp 2013-11-05 00:15:32 UTC (rev 158612)
+++ branches/safari-537.73-branch/Source/WebKit2/UIProcess/WebProcessProxy.cpp 2013-11-05 00:33:16 UTC (rev 158613)
@@ -323,8 +323,10 @@
if (!m_context->omitPDFSupport()) {
#if ENABLE(PDFKIT_PLUGIN)
// Add built-in PDF last, so that it's not used when a real plug-in is installed.
+ plugins.append(PDFPlugin::pluginInfo());
applicationPlugins.append(PDFPlugin::pluginInfo());
#endif
+ plugins.append(SimplePDFPlugin::pluginInfo());
applicationPlugins.append(SimplePDFPlugin::pluginInfo());
}
#endif
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
