<!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>[164633] 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/164633">164633</a></dd>
<dt>Author</dt> <dd>ap@apple.com</dd>
<dt>Date</dt> <dd>2014-02-24 23:49:46 -0800 (Mon, 24 Feb 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>[Mac] Stop looking for plug-in profiles in /S/L/Sandbox/Profiles
https://bugs.webkit.org/show_bug.cgi?id=129262
<rdar://problem/16149420>
Reviewed by Sam Weinig.
Remove unused code.
* Shared/Plugins/mac/PluginSandboxProfile.mm:
(WebKit::pluginSandboxProfileDirectory):
(WebKit::pluginSandboxCommonProfile):
(WebKit::pluginSandboxProfile):
(WebKit::pluginHasSandboxProfile):</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebKit2ChangeLog">trunk/Source/WebKit2/ChangeLog</a></li>
<li><a href="#trunkSourceWebKit2SharedPluginsmacPluginSandboxProfilemm">trunk/Source/WebKit2/Shared/Plugins/mac/PluginSandboxProfile.mm</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebKit2ChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/ChangeLog (164632 => 164633)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/ChangeLog 2014-02-25 07:30:21 UTC (rev 164632)
+++ trunk/Source/WebKit2/ChangeLog 2014-02-25 07:49:46 UTC (rev 164633)
</span><span class="lines">@@ -1,3 +1,19 @@
</span><ins>+2014-02-24 Alexey Proskuryakov <ap@apple.com>
+
+ [Mac] Stop looking for plug-in profiles in /S/L/Sandbox/Profiles
+ https://bugs.webkit.org/show_bug.cgi?id=129262
+ <rdar://problem/16149420>
+
+ Reviewed by Sam Weinig.
+
+ Remove unused code.
+
+ * Shared/Plugins/mac/PluginSandboxProfile.mm:
+ (WebKit::pluginSandboxProfileDirectory):
+ (WebKit::pluginSandboxCommonProfile):
+ (WebKit::pluginSandboxProfile):
+ (WebKit::pluginHasSandboxProfile):
+
</ins><span class="cx"> 2014-02-24 Martin Robinson <mrobinson@igalia.com>
</span><span class="cx">
</span><span class="cx"> [GTK] generate-gtkdoc should not generate documentation for source files for unbuilt source files
</span></span></pre></div>
<a id="trunkSourceWebKit2SharedPluginsmacPluginSandboxProfilemm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/Shared/Plugins/mac/PluginSandboxProfile.mm (164632 => 164633)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/Shared/Plugins/mac/PluginSandboxProfile.mm 2014-02-25 07:30:21 UTC (rev 164632)
+++ trunk/Source/WebKit2/Shared/Plugins/mac/PluginSandboxProfile.mm 2014-02-25 07:49:46 UTC (rev 164633)
</span><span class="lines">@@ -32,22 +32,11 @@
</span><span class="cx">
</span><span class="cx"> namespace WebKit {
</span><span class="cx">
</span><del>-static NSString *pluginSandboxProfileDefaultDirectory()
</del><ins>+static NSString *pluginSandboxProfileDirectory()
</ins><span class="cx"> {
</span><span class="cx"> return [[[NSBundle bundleForClass:NSClassFromString(@"WKView")] resourcePath] stringByAppendingPathComponent:@"PlugInSandboxProfiles"];
</span><span class="cx"> }
</span><span class="cx">
</span><del>-static NSArray *pluginSandboxProfileDirectories()
-{
- return @[
- // First look in the WebKit2 bundle.
- pluginSandboxProfileDefaultDirectory(),
-
- // Then try /System/Library/Sandbox/Profiles/.
- @"/System/Library/Sandbox/Profiles/"
- ];
-}
-
</del><span class="cx"> static NSString *pluginSandboxProfileName(const String& bundleIdentifier)
</span><span class="cx"> {
</span><span class="cx"> // Fold all / characters to : to prevent the plugin bundle-id from trying to escape the profile directory
</span><span class="lines">@@ -59,20 +48,10 @@
</span><span class="cx">
</span><span class="cx"> static String pluginSandboxCommonProfile()
</span><span class="cx"> {
</span><del>- NSString *profilePath = [pluginSandboxProfileDefaultDirectory() stringByAppendingPathComponent:@"com.apple.WebKit.plugin-common.sb"];
</del><ins>+ NSString *profilePath = [pluginSandboxProfileDirectory() stringByAppendingPathComponent:@"com.apple.WebKit.plugin-common.sb"];
</ins><span class="cx"> return [NSString stringWithContentsOfFile:profilePath encoding:NSUTF8StringEncoding error:NULL];
</span><span class="cx"> }
</span><span class="cx">
</span><del>-static String pluginSandboxProfileForDirectory(NSString *profileName, NSString *sandboxProfileDirectoryPath)
-{
- NSString *profilePath = [sandboxProfileDirectoryPath stringByAppendingPathComponent:profileName];
- NSString *profileString = [NSString stringWithContentsOfFile:profilePath encoding:NSUTF8StringEncoding error:NULL];
- if (!profileString)
- return String();
-
- return makeString(pluginSandboxCommonProfile(), String(profileString));
-}
-
</del><span class="cx"> String pluginSandboxProfile(const String& bundleIdentifier)
</span><span class="cx"> {
</span><span class="cx"> if (bundleIdentifier.isEmpty())
</span><span class="lines">@@ -80,34 +59,23 @@
</span><span class="cx">
</span><span class="cx"> NSString *profileName = pluginSandboxProfileName(bundleIdentifier);
</span><span class="cx">
</span><del>- for (NSString *directory in pluginSandboxProfileDirectories()) {
- String sandboxProfile = pluginSandboxProfileForDirectory(profileName, directory);
- if (!sandboxProfile.isEmpty())
- return sandboxProfile;
- }
</del><ins>+ NSString *profilePath = [pluginSandboxProfileDirectory() stringByAppendingPathComponent:profileName];
+ NSString *profileString = [NSString stringWithContentsOfFile:profilePath encoding:NSUTF8StringEncoding error:NULL];
+ if (!profileString)
+ return String();
</ins><span class="cx">
</span><del>- return String();
</del><ins>+ return makeString(pluginSandboxCommonProfile(), String(profileString));
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-static bool pluginHasSandboxProfileForDirectory(NSString *profileName, NSString *sandboxProfileDirectoryPath)
-{
- NSString *profilePath = [sandboxProfileDirectoryPath stringByAppendingPathComponent:profileName];
- return [[NSFileManager defaultManager] fileExistsAtPath:profilePath];
-}
-
</del><span class="cx"> bool pluginHasSandboxProfile(const String& bundleIdentifier)
</span><span class="cx"> {
</span><span class="cx"> if (bundleIdentifier.isEmpty())
</span><span class="cx"> return false;
</span><span class="cx">
</span><span class="cx"> NSString *profileName = pluginSandboxProfileName(bundleIdentifier);
</span><ins>+ NSString *profilePath = [pluginSandboxProfileDirectory() stringByAppendingPathComponent:profileName];
</ins><span class="cx">
</span><del>- for (NSString *directory in pluginSandboxProfileDirectories()) {
- if (pluginHasSandboxProfileForDirectory(profileName, directory))
- return true;
- }
-
- return false;
</del><ins>+ return [[NSFileManager defaultManager] fileExistsAtPath:profilePath];
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> } // namespace WebKit
</span></span></pre>
</div>
</div>
</body>
</html>