<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[185274] trunk/Source/WebKit2</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://trac.webkit.org/projects/webkit/changeset/185274">185274</a></dd>
<dt>Author</dt> <dd>andersca@apple.com</dd>
<dt>Date</dt> <dd>2015-06-05 16:49:43 -0700 (Fri, 05 Jun 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>Only allow plug-ins to create custom MIME property lists on older versions of OS X
https://bugs.webkit.org/show_bug.cgi?id=145716
Reviewed by Dan Bernstein.
* PluginProcess/EntryPoint/mac/LegacyProcess/PluginProcessMain.mm:
* Shared/Plugins/Netscape/NetscapePluginModule.h:
* Shared/Plugins/Netscape/mac/NetscapePluginModuleMac.mm:
(WebKit::getMIMETypesFromPluginBundle):
* UIProcess/Plugins/PluginProcessProxy.h:
* UIProcess/Plugins/mac/PluginProcessProxyMac.mm:</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebKit2ChangeLog">trunk/Source/WebKit2/ChangeLog</a></li>
<li><a href="#trunkSourceWebKit2PluginProcessEntryPointmacLegacyProcessPluginProcessMainmm">trunk/Source/WebKit2/PluginProcess/EntryPoint/mac/LegacyProcess/PluginProcessMain.mm</a></li>
<li><a href="#trunkSourceWebKit2SharedPluginsNetscapeNetscapePluginModuleh">trunk/Source/WebKit2/Shared/Plugins/Netscape/NetscapePluginModule.h</a></li>
<li><a href="#trunkSourceWebKit2SharedPluginsNetscapemacNetscapePluginModuleMacmm">trunk/Source/WebKit2/Shared/Plugins/Netscape/mac/NetscapePluginModuleMac.mm</a></li>
<li><a href="#trunkSourceWebKit2UIProcessPluginsPluginProcessProxyh">trunk/Source/WebKit2/UIProcess/Plugins/PluginProcessProxy.h</a></li>
<li><a href="#trunkSourceWebKit2UIProcessPluginsmacPluginProcessProxyMacmm">trunk/Source/WebKit2/UIProcess/Plugins/mac/PluginProcessProxyMac.mm</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebKit2ChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/ChangeLog (185273 => 185274)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/ChangeLog 2015-06-05 23:20:06 UTC (rev 185273)
+++ trunk/Source/WebKit2/ChangeLog 2015-06-05 23:49:43 UTC (rev 185274)
</span><span class="lines">@@ -1,3 +1,17 @@
</span><ins>+2015-06-05 Anders Carlsson <andersca@apple.com>
+
+ Only allow plug-ins to create custom MIME property lists on older versions of OS X
+ https://bugs.webkit.org/show_bug.cgi?id=145716
+
+ Reviewed by Dan Bernstein.
+
+ * PluginProcess/EntryPoint/mac/LegacyProcess/PluginProcessMain.mm:
+ * Shared/Plugins/Netscape/NetscapePluginModule.h:
+ * Shared/Plugins/Netscape/mac/NetscapePluginModuleMac.mm:
+ (WebKit::getMIMETypesFromPluginBundle):
+ * UIProcess/Plugins/PluginProcessProxy.h:
+ * UIProcess/Plugins/mac/PluginProcessProxyMac.mm:
+
</ins><span class="cx"> 2015-06-05 Chris Dumez <cdumez@apple.com>
</span><span class="cx">
</span><span class="cx"> [WK2][iOS] Limit the number of vnodes used by the WebContent processes
</span></span></pre></div>
<a id="trunkSourceWebKit2PluginProcessEntryPointmacLegacyProcessPluginProcessMainmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/PluginProcess/EntryPoint/mac/LegacyProcess/PluginProcessMain.mm (185273 => 185274)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/PluginProcess/EntryPoint/mac/LegacyProcess/PluginProcessMain.mm 2015-06-05 23:20:06 UTC (rev 185273)
+++ trunk/Source/WebKit2/PluginProcess/EntryPoint/mac/LegacyProcess/PluginProcessMain.mm 2015-06-05 23:49:43 UTC (rev 185274)
</span><span class="lines">@@ -74,6 +74,7 @@
</span><span class="cx"> [NSApp _installAutoreleasePoolsOnCurrentThreadIfNecessary];
</span><span class="cx"> #endif
</span><span class="cx">
</span><ins>+#if __MAC_OS_X_VERSION_MIN_REQUIRED <= 101000
</ins><span class="cx"> // Check if we're being spawned to write a MIME type preferences file.
</span><span class="cx"> String pluginPath = m_commandLine["createPluginMIMETypesPreferences"];
</span><span class="cx"> if (!pluginPath.isEmpty()) {
</span><span class="lines">@@ -84,6 +85,7 @@
</span><span class="cx"> exit(EXIT_FAILURE);
</span><span class="cx"> exit(EXIT_SUCCESS);
</span><span class="cx"> }
</span><ins>+#endif
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> virtual bool getExtraInitializationData(HashMap<String, String>& extraInitializationData) override
</span></span></pre></div>
<a id="trunkSourceWebKit2SharedPluginsNetscapeNetscapePluginModuleh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/Shared/Plugins/Netscape/NetscapePluginModule.h (185273 => 185274)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/Shared/Plugins/Netscape/NetscapePluginModule.h 2015-06-05 23:20:06 UTC (rev 185273)
+++ trunk/Source/WebKit2/Shared/Plugins/Netscape/NetscapePluginModule.h 2015-06-05 23:49:43 UTC (rev 185274)
</span><span class="lines">@@ -65,7 +65,7 @@
</span><span class="cx">
</span><span class="cx"> Module* module() const { return m_module.get(); }
</span><span class="cx">
</span><del>-#if PLUGIN_ARCHITECTURE(MAC)
</del><ins>+#if PLUGIN_ARCHITECTURE(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED <= 101000
</ins><span class="cx"> static bool createPluginMIMETypesPreferences(const String& pluginPath);
</span><span class="cx"> #endif
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebKit2SharedPluginsNetscapemacNetscapePluginModuleMacmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/Shared/Plugins/Netscape/mac/NetscapePluginModuleMac.mm (185273 => 185274)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/Shared/Plugins/Netscape/mac/NetscapePluginModuleMac.mm 2015-06-05 23:20:06 UTC (rev 185273)
+++ trunk/Source/WebKit2/Shared/Plugins/Netscape/mac/NetscapePluginModuleMac.mm 2015-06-05 23:49:43 UTC (rev 185274)
</span><span class="lines">@@ -92,6 +92,7 @@
</span><span class="cx"> return false;
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+#if __MAC_OS_X_VERSION_MIN_REQUIRED <= 101000
</ins><span class="cx"> static RetainPtr<CFDictionaryRef> contentsOfPropertyListAtURL(CFURLRef propertyListURL)
</span><span class="cx"> {
</span><span class="cx"> RetainPtr<NSData> propertyListData = adoptNS([[NSData alloc] initWithContentsOfURL:(NSURL *)propertyListURL]);
</span><span class="lines">@@ -107,9 +108,11 @@
</span><span class="cx">
</span><span class="cx"> return static_cast<CFDictionaryRef>(propertyList.get());
</span><span class="cx"> }
</span><ins>+#endif
</ins><span class="cx">
</span><span class="cx"> static RetainPtr<CFDictionaryRef> getMIMETypesFromPluginBundle(CFBundleRef bundle, const PluginModuleInfo& plugin)
</span><span class="cx"> {
</span><ins>+#if __MAC_OS_X_VERSION_MIN_REQUIRED <= 101000
</ins><span class="cx"> CFStringRef propertyListFilename = static_cast<CFStringRef>(CFBundleGetValueForInfoDictionaryKey(bundle, CFSTR("WebPluginMIMETypesFilename")));
</span><span class="cx"> if (propertyListFilename) {
</span><span class="cx"> RetainPtr<CFStringRef> propertyListPath = adoptCF(CFStringCreateWithFormat(kCFAllocatorDefault, 0, CFSTR("%@/Library/Preferences/%@"), NSHomeDirectory(), propertyListFilename));
</span><span class="lines">@@ -125,6 +128,7 @@
</span><span class="cx">
</span><span class="cx"> return static_cast<CFDictionaryRef>(CFDictionaryGetValue(propertyList.get(), CFSTR("WebPluginMIMETypes")));
</span><span class="cx"> }
</span><ins>+#endif
</ins><span class="cx">
</span><span class="cx"> return static_cast<CFDictionaryRef>(CFBundleGetValueForInfoDictionaryKey(bundle, CFSTR("WebPluginMIMETypes")));
</span><span class="cx"> }
</span><span class="lines">@@ -408,6 +412,7 @@
</span><span class="cx"> return true;
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+#if __MAC_OS_X_VERSION_MIN_REQUIRED <= 101000
</ins><span class="cx"> bool NetscapePluginModule::createPluginMIMETypesPreferences(const String& pluginPath)
</span><span class="cx"> {
</span><span class="cx"> RetainPtr<CFURLRef> bundleURL = adoptCF(CFURLCreateWithFileSystemPath(kCFAllocatorDefault, pluginPath.createCFString().get(), kCFURLPOSIXPathStyle, false));
</span><span class="lines">@@ -426,6 +431,7 @@
</span><span class="cx"> createPluginMIMETypesPreferences();
</span><span class="cx"> return true;
</span><span class="cx"> }
</span><ins>+#endif
</ins><span class="cx">
</span><span class="cx"> // FIXME: This doesn't need to be platform-specific.
</span><span class="cx"> class PluginVersion {
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessPluginsPluginProcessProxyh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/Plugins/PluginProcessProxy.h (185273 => 185274)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/Plugins/PluginProcessProxy.h 2015-06-05 23:20:06 UTC (rev 185273)
+++ trunk/Source/WebKit2/UIProcess/Plugins/PluginProcessProxy.h 2015-06-05 23:49:43 UTC (rev 185274)
</span><span class="lines">@@ -93,10 +93,13 @@
</span><span class="cx"> // Returns whether the plug-in needs the heap to be marked executable.
</span><span class="cx"> static bool pluginNeedsExecutableHeap(const PluginModuleInfo&);
</span><span class="cx">
</span><ins>+#if __MAC_OS_X_VERSION_MIN_REQUIRED <= 101000
</ins><span class="cx"> // Creates a property list in ~/Library/Preferences that contains all the MIME types supported by the plug-in.
</span><span class="cx"> static bool createPropertyListFile(const PluginModuleInfo&);
</span><span class="cx"> #endif
</span><span class="cx">
</span><ins>+#endif
+
</ins><span class="cx"> #if PLUGIN_ARCHITECTURE(X11)
</span><span class="cx"> static bool scanPlugin(const String& pluginPath, RawPluginMetaData& result);
</span><span class="cx"> #endif
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessPluginsmacPluginProcessProxyMacmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/Plugins/mac/PluginProcessProxyMac.mm (185273 => 185274)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/Plugins/mac/PluginProcessProxyMac.mm 2015-06-05 23:20:06 UTC (rev 185273)
+++ trunk/Source/WebKit2/UIProcess/Plugins/mac/PluginProcessProxyMac.mm 2015-06-05 23:49:43 UTC (rev 185274)
</span><span class="lines">@@ -77,6 +77,7 @@
</span><span class="cx"> return false;
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+#if __MAC_OS_X_VERSION_MIN_REQUIRED <= 101000
</ins><span class="cx"> bool PluginProcessProxy::createPropertyListFile(const PluginModuleInfo& plugin)
</span><span class="cx"> {
</span><span class="cx"> NSBundle *webKit2Bundle = [NSBundle bundleWithIdentifier:@"com.apple.WebKit"];
</span><span class="lines">@@ -126,6 +127,7 @@
</span><span class="cx">
</span><span class="cx"> return true;
</span><span class="cx"> }
</span><ins>+#endif
</ins><span class="cx">
</span><span class="cx"> static bool shouldUseXPC(ProcessLauncher::LaunchOptions& launchOptions, const PluginProcessAttributes& pluginProcessAttributes)
</span><span class="cx"> {
</span></span></pre>
</div>
</div>
</body>
</html>