Title: [185293] trunk/Source/WebKit/mac
- Revision
- 185293
- Author
- [email protected]
- Date
- 2015-06-06 13:01:09 -0700 (Sat, 06 Jun 2015)
Log Message
Remove now unused category methods
https://bugs.webkit.org/show_bug.cgi?id=145729
Reviewed by Dan Bernstein.
* Configurations/WebKitLegacy.xcconfig:
* Misc/WebKitNSStringExtras.h:
* Misc/WebKitNSStringExtras.mm:
(-[NSString _webkit_fixedCarbonPOSIXPath]): Deleted.
* Misc/WebNSFileManagerExtras.h:
* Misc/WebNSFileManagerExtras.mm:
(-[NSFileManager _webkit_startupVolumeName]): Deleted.
Modified Paths
Diff
Modified: trunk/Source/WebKit/mac/ChangeLog (185292 => 185293)
--- trunk/Source/WebKit/mac/ChangeLog 2015-06-06 19:50:18 UTC (rev 185292)
+++ trunk/Source/WebKit/mac/ChangeLog 2015-06-06 20:01:09 UTC (rev 185293)
@@ -1,5 +1,20 @@
2015-06-06 Anders Carlsson <[email protected]>
+ Remove now unused category methods
+ https://bugs.webkit.org/show_bug.cgi?id=145729
+
+ Reviewed by Dan Bernstein.
+
+ * Configurations/WebKitLegacy.xcconfig:
+ * Misc/WebKitNSStringExtras.h:
+ * Misc/WebKitNSStringExtras.mm:
+ (-[NSString _webkit_fixedCarbonPOSIXPath]): Deleted.
+ * Misc/WebNSFileManagerExtras.h:
+ * Misc/WebNSFileManagerExtras.mm:
+ (-[NSFileManager _webkit_startupVolumeName]): Deleted.
+
+2015-06-06 Anders Carlsson <[email protected]>
+
Fix build.
* WebKit.mac.exp:
Modified: trunk/Source/WebKit/mac/Configurations/WebKitLegacy.xcconfig (185292 => 185293)
--- trunk/Source/WebKit/mac/Configurations/WebKitLegacy.xcconfig 2015-06-06 19:50:18 UTC (rev 185292)
+++ trunk/Source/WebKit/mac/Configurations/WebKitLegacy.xcconfig 2015-06-06 20:01:09 UTC (rev 185293)
@@ -71,7 +71,7 @@
UMBRELLA_FRAMEWORKS_DIR = $(PRODUCTION_FRAMEWORKS_DIR)/WebKit.framework/Versions/A/Frameworks;
OTHER_LDFLAGS[sdk=iphone*] = $(inherited) -lobjc -lsqlite3 -framework CFNetwork -framework CoreFoundation -framework CoreGraphics -framework CoreText -framework Foundation -framework GraphicsServices -framework ImageIO -framework OpenGLES -framework MobileCoreServices -lMobileGestalt;
-OTHER_LDFLAGS[sdk=macosx*] = $(inherited) -framework Carbon -framework Cocoa -framework DiskArbitration -framework IOKit -framework OpenGL;
+OTHER_LDFLAGS[sdk=macosx*] = $(inherited) -framework Carbon -framework Cocoa -framework IOKit -framework OpenGL;
SECTORDER_FLAGS = $(SECTORDER_FLAGS_$(CONFIGURATION));
SECTORDER_FLAGS_Production[sdk=iphoneos*] = -Wl,-order_file,$(SDKROOT)/AppleInternal/OrderFiles/WebKitLegacy.order;
Modified: trunk/Source/WebKit/mac/Misc/WebKitNSStringExtras.h (185292 => 185293)
--- trunk/Source/WebKit/mac/Misc/WebKitNSStringExtras.h 2015-06-06 19:50:18 UTC (rev 185292)
+++ trunk/Source/WebKit/mac/Misc/WebKitNSStringExtras.h 2015-06-06 20:01:09 UTC (rev 185293)
@@ -63,9 +63,6 @@
- (NSString *)_webkit_stringByTrimmingWhitespace;
- (NSString *)_webkit_stringByCollapsingNonPrintingCharacters;
- (NSString *)_webkit_stringByCollapsingWhitespaceCharacters;
-#if !TARGET_OS_IPHONE
-- (NSString *)_webkit_fixedCarbonPOSIXPath;
-#endif
#if TARGET_OS_IPHONE
+ (NSString *)_web_stringWithData:(NSData *)data textEncodingName:(NSString *)textEncodingName;
Modified: trunk/Source/WebKit/mac/Misc/WebKitNSStringExtras.mm (185292 => 185293)
--- trunk/Source/WebKit/mac/Misc/WebKitNSStringExtras.mm 2015-06-06 19:50:18 UTC (rev 185292)
+++ trunk/Source/WebKit/mac/Misc/WebKitNSStringExtras.mm 2015-06-06 20:01:09 UTC (rev 185293)
@@ -285,50 +285,6 @@
return [result autorelease];
}
-#if !PLATFORM(IOS)
--(NSString *)_webkit_fixedCarbonPOSIXPath
-{
- NSFileManager *fileManager = [NSFileManager defaultManager];
- if ([fileManager fileExistsAtPath:self]) {
- // Files exists, no need to fix.
- return self;
- }
-
- NSMutableArray *pathComponents = [[[self pathComponents] mutableCopy] autorelease];
- NSString *volumeName = [pathComponents objectAtIndex:1];
- if ([volumeName isEqualToString:@"Volumes"]) {
- // Path starts with "/Volumes", so the volume name is the next path component.
- volumeName = [pathComponents objectAtIndex:2];
- // Remove "Volumes" from the path because it may incorrectly be part of the path (3163647).
- // We'll add it back if we have to.
- [pathComponents removeObjectAtIndex:1];
- }
-
- if (!volumeName) {
- // Should only happen if self == "/", so this shouldn't happen because that always exists.
- return self;
- }
-
- if ([[fileManager _webkit_startupVolumeName] isEqualToString:volumeName]) {
- // Startup volume name is included in path, remove it.
- [pathComponents removeObjectAtIndex:1];
- } else if ([[fileManager contentsOfDirectoryAtPath:@"/Volumes" error:NULL] containsObject:volumeName]) {
- // Path starts with other volume name, prepend "/Volumes".
- [pathComponents insertObject:@"Volumes" atIndex:1];
- } else
- // It's valid.
- return self;
-
- NSString *path = [NSString pathWithComponents:pathComponents];
-
- if (![fileManager fileExistsAtPath:path])
- // File at canonicalized path doesn't exist, return original.
- return self;
-
- return path;
-}
-#endif // !PLATFORM(IOS)
-
#if PLATFORM(IOS)
+ (NSString *)_web_stringWithData:(NSData *)data textEncodingName:(NSString *)textEncodingName
{
Modified: trunk/Source/WebKit/mac/Misc/WebNSFileManagerExtras.h (185292 => 185293)
--- trunk/Source/WebKit/mac/Misc/WebNSFileManagerExtras.h 2015-06-06 19:50:18 UTC (rev 185292)
+++ trunk/Source/WebKit/mac/Misc/WebNSFileManagerExtras.h 2015-06-06 20:01:09 UTC (rev 185293)
@@ -31,7 +31,6 @@
@interface NSFileManager (WebNSFileManagerExtras)
#if !TARGET_OS_IPHONE
- (void)_webkit_setMetadataURL:(NSString *)URLString referrer:(NSString *)referrer atPath:(NSString *)path;
-- (NSString *)_webkit_startupVolumeName;
#endif
- (NSString *)_webkit_pathWithUniqueFilenameForPath:(NSString *)path;
Modified: trunk/Source/WebKit/mac/Misc/WebNSFileManagerExtras.mm (185292 => 185293)
--- trunk/Source/WebKit/mac/Misc/WebNSFileManagerExtras.mm 2015-06-06 19:50:18 UTC (rev 185292)
+++ trunk/Source/WebKit/mac/Misc/WebNSFileManagerExtras.mm 2015-06-06 20:01:09 UTC (rev 185293)
@@ -97,13 +97,6 @@
pthread_attr_destroy(&attr);
}
-- (NSString *)_webkit_startupVolumeName
-{
- RetainPtr<DASessionRef> session = adoptCF(DASessionCreate(kCFAllocatorDefault));
- RetainPtr<DADiskRef> disk = adoptCF(DADiskCreateFromVolumePath(kCFAllocatorDefault, session.get(), (CFURLRef)[NSURL fileURLWithPath:@"/"]));
- return [[(NSString *)CFDictionaryGetValue(adoptCF(DADiskCopyDescription(disk.get())).get(), kDADiskDescriptionVolumeNameKey) copy] autorelease];
-}
-
#endif // !PLATFORM(IOS)
// -[NSFileManager fileExistsAtPath:] returns NO if there is a broken symlink at the path.
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
