Title: [206004] trunk/Source/WebKit/mac
- Revision
- 206004
- Author
- [email protected]
- Date
- 2016-09-15 16:42:17 -0700 (Thu, 15 Sep 2016)
Log Message
This was supposed to be committed with the previous patch!
* Plugins/WebBasePluginPackage.mm:
(pathByResolvingSymlinksAndAliases): Deleted.
Modified Paths
Diff
Modified: trunk/Source/WebKit/mac/ChangeLog (206003 => 206004)
--- trunk/Source/WebKit/mac/ChangeLog 2016-09-15 23:38:43 UTC (rev 206003)
+++ trunk/Source/WebKit/mac/ChangeLog 2016-09-15 23:42:17 UTC (rev 206004)
@@ -1,5 +1,12 @@
2016-09-15 Anders Carlsson <[email protected]>
+ This was supposed to be committed with the previous patch!
+
+ * Plugins/WebBasePluginPackage.mm:
+ (pathByResolvingSymlinksAndAliases): Deleted.
+
+2016-09-15 Anders Carlsson <[email protected]>
+
Replace use of Carbon file system APIs in plug-in loading
https://bugs.webkit.org/show_bug.cgi?id=162040
rdar://problem/6017896
Modified: trunk/Source/WebKit/mac/Plugins/WebBasePluginPackage.mm (206003 => 206004)
--- trunk/Source/WebKit/mac/Plugins/WebBasePluginPackage.mm 2016-09-15 23:38:43 UTC (rev 206003)
+++ trunk/Source/WebKit/mac/Plugins/WebBasePluginPackage.mm 2016-09-15 23:42:17 UTC (rev 206004)
@@ -87,38 +87,6 @@
return [pluginPackage autorelease];
}
-#pragma clang diagnostic push
-#pragma clang diagnostic ignored "-Wdeprecated-declarations"
-// FIXME: Rewrite this in terms of -[NSURL URLByResolvingBookmarkData:…].
-static NSString *pathByResolvingSymlinksAndAliases(NSString *thePath)
-{
- NSString *newPath = [thePath stringByResolvingSymlinksInPath];
-
-#if !PLATFORM(IOS)
- FSRef fref;
- OSStatus err;
-
- err = FSPathMakeRef((const UInt8 *)[thePath fileSystemRepresentation], &fref, NULL);
- if (err != noErr)
- return newPath;
-
- Boolean targetIsFolder;
- Boolean wasAliased;
- err = FSResolveAliasFileWithMountFlags(&fref, TRUE, &targetIsFolder, &wasAliased, kResolveAliasFileNoUI);
- if (err != noErr)
- return newPath;
-
- if (wasAliased) {
- CFURLRef URL = "" &fref);
- newPath = [(NSURL *)URL path];
- CFRelease(URL);
- }
-#endif
-
- return newPath;
-}
-#pragma clang diagnostic pop
-
- (id)initWithPath:(NSString *)pluginPath
{
if (!(self = [super init]))
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
