Title: [164633] trunk/Source/WebKit2
- Revision
- 164633
- Author
- [email protected]
- Date
- 2014-02-24 23:49:46 -0800 (Mon, 24 Feb 2014)
Log Message
[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):
Modified Paths
Diff
Modified: trunk/Source/WebKit2/ChangeLog (164632 => 164633)
--- 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)
@@ -1,3 +1,19 @@
+2014-02-24 Alexey Proskuryakov <[email protected]>
+
+ [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):
+
2014-02-24 Martin Robinson <[email protected]>
[GTK] generate-gtkdoc should not generate documentation for source files for unbuilt source files
Modified: trunk/Source/WebKit2/Shared/Plugins/mac/PluginSandboxProfile.mm (164632 => 164633)
--- 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)
@@ -32,22 +32,11 @@
namespace WebKit {
-static NSString *pluginSandboxProfileDefaultDirectory()
+static NSString *pluginSandboxProfileDirectory()
{
return [[[NSBundle bundleForClass:NSClassFromString(@"WKView")] resourcePath] stringByAppendingPathComponent:@"PlugInSandboxProfiles"];
}
-static NSArray *pluginSandboxProfileDirectories()
-{
- return @[
- // First look in the WebKit2 bundle.
- pluginSandboxProfileDefaultDirectory(),
-
- // Then try /System/Library/Sandbox/Profiles/.
- @"/System/Library/Sandbox/Profiles/"
- ];
-}
-
static NSString *pluginSandboxProfileName(const String& bundleIdentifier)
{
// Fold all / characters to : to prevent the plugin bundle-id from trying to escape the profile directory
@@ -59,20 +48,10 @@
static String pluginSandboxCommonProfile()
{
- NSString *profilePath = [pluginSandboxProfileDefaultDirectory() stringByAppendingPathComponent:@"com.apple.WebKit.plugin-common.sb"];
+ NSString *profilePath = [pluginSandboxProfileDirectory() stringByAppendingPathComponent:@"com.apple.WebKit.plugin-common.sb"];
return [NSString stringWithContentsOfFile:profilePath encoding:NSUTF8StringEncoding error:NULL];
}
-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));
-}
-
String pluginSandboxProfile(const String& bundleIdentifier)
{
if (bundleIdentifier.isEmpty())
@@ -80,34 +59,23 @@
NSString *profileName = pluginSandboxProfileName(bundleIdentifier);
- for (NSString *directory in pluginSandboxProfileDirectories()) {
- String sandboxProfile = pluginSandboxProfileForDirectory(profileName, directory);
- if (!sandboxProfile.isEmpty())
- return sandboxProfile;
- }
+ NSString *profilePath = [pluginSandboxProfileDirectory() stringByAppendingPathComponent:profileName];
+ NSString *profileString = [NSString stringWithContentsOfFile:profilePath encoding:NSUTF8StringEncoding error:NULL];
+ if (!profileString)
+ return String();
- return String();
+ return makeString(pluginSandboxCommonProfile(), String(profileString));
}
-static bool pluginHasSandboxProfileForDirectory(NSString *profileName, NSString *sandboxProfileDirectoryPath)
-{
- NSString *profilePath = [sandboxProfileDirectoryPath stringByAppendingPathComponent:profileName];
- return [[NSFileManager defaultManager] fileExistsAtPath:profilePath];
-}
-
bool pluginHasSandboxProfile(const String& bundleIdentifier)
{
if (bundleIdentifier.isEmpty())
return false;
NSString *profileName = pluginSandboxProfileName(bundleIdentifier);
+ NSString *profilePath = [pluginSandboxProfileDirectory() stringByAppendingPathComponent:profileName];
- for (NSString *directory in pluginSandboxProfileDirectories()) {
- if (pluginHasSandboxProfileForDirectory(profileName, directory))
- return true;
- }
-
- return false;
+ return [[NSFileManager defaultManager] fileExistsAtPath:profilePath];
}
} // namespace WebKit
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
