<!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>[185293] trunk/Source/WebKit/mac</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/185293">185293</a></dd>
<dt>Author</dt> <dd>andersca@apple.com</dd>
<dt>Date</dt> <dd>2015-06-06 13:01:09 -0700 (Sat, 06 Jun 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>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.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebKitmacChangeLog">trunk/Source/WebKit/mac/ChangeLog</a></li>
<li><a href="#trunkSourceWebKitmacConfigurationsWebKitLegacyxcconfig">trunk/Source/WebKit/mac/Configurations/WebKitLegacy.xcconfig</a></li>
<li><a href="#trunkSourceWebKitmacMiscWebKitNSStringExtrash">trunk/Source/WebKit/mac/Misc/WebKitNSStringExtras.h</a></li>
<li><a href="#trunkSourceWebKitmacMiscWebKitNSStringExtrasmm">trunk/Source/WebKit/mac/Misc/WebKitNSStringExtras.mm</a></li>
<li><a href="#trunkSourceWebKitmacMiscWebNSFileManagerExtrash">trunk/Source/WebKit/mac/Misc/WebNSFileManagerExtras.h</a></li>
<li><a href="#trunkSourceWebKitmacMiscWebNSFileManagerExtrasmm">trunk/Source/WebKit/mac/Misc/WebNSFileManagerExtras.mm</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebKitmacChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/mac/ChangeLog (185292 => 185293)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -1,5 +1,20 @@
</span><span class="cx"> 2015-06-06 Anders Carlsson <andersca@apple.com>
</span><span class="cx">
</span><ins>+ 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 <andersca@apple.com>
+
</ins><span class="cx"> Fix build.
</span><span class="cx">
</span><span class="cx"> * WebKit.mac.exp:
</span></span></pre></div>
<a id="trunkSourceWebKitmacConfigurationsWebKitLegacyxcconfig"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/mac/Configurations/WebKitLegacy.xcconfig (185292 => 185293)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -71,7 +71,7 @@
</span><span class="cx"> UMBRELLA_FRAMEWORKS_DIR = $(PRODUCTION_FRAMEWORKS_DIR)/WebKit.framework/Versions/A/Frameworks;
</span><span class="cx">
</span><span class="cx"> 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;
</span><del>-OTHER_LDFLAGS[sdk=macosx*] = $(inherited) -framework Carbon -framework Cocoa -framework DiskArbitration -framework IOKit -framework OpenGL;
</del><ins>+OTHER_LDFLAGS[sdk=macosx*] = $(inherited) -framework Carbon -framework Cocoa -framework IOKit -framework OpenGL;
</ins><span class="cx">
</span><span class="cx"> SECTORDER_FLAGS = $(SECTORDER_FLAGS_$(CONFIGURATION));
</span><span class="cx"> SECTORDER_FLAGS_Production[sdk=iphoneos*] = -Wl,-order_file,$(SDKROOT)/AppleInternal/OrderFiles/WebKitLegacy.order;
</span></span></pre></div>
<a id="trunkSourceWebKitmacMiscWebKitNSStringExtrash"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/mac/Misc/WebKitNSStringExtras.h (185292 => 185293)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -63,9 +63,6 @@
</span><span class="cx"> - (NSString *)_webkit_stringByTrimmingWhitespace;
</span><span class="cx"> - (NSString *)_webkit_stringByCollapsingNonPrintingCharacters;
</span><span class="cx"> - (NSString *)_webkit_stringByCollapsingWhitespaceCharacters;
</span><del>-#if !TARGET_OS_IPHONE
-- (NSString *)_webkit_fixedCarbonPOSIXPath;
-#endif
</del><span class="cx">
</span><span class="cx"> #if TARGET_OS_IPHONE
</span><span class="cx"> + (NSString *)_web_stringWithData:(NSData *)data textEncodingName:(NSString *)textEncodingName;
</span></span></pre></div>
<a id="trunkSourceWebKitmacMiscWebKitNSStringExtrasmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/mac/Misc/WebKitNSStringExtras.mm (185292 => 185293)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -285,50 +285,6 @@
</span><span class="cx"> return [result autorelease];
</span><span class="cx"> }
</span><span class="cx">
</span><del>-#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)
-
</del><span class="cx"> #if PLATFORM(IOS)
</span><span class="cx"> + (NSString *)_web_stringWithData:(NSData *)data textEncodingName:(NSString *)textEncodingName
</span><span class="cx"> {
</span></span></pre></div>
<a id="trunkSourceWebKitmacMiscWebNSFileManagerExtrash"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/mac/Misc/WebNSFileManagerExtras.h (185292 => 185293)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -31,7 +31,6 @@
</span><span class="cx"> @interface NSFileManager (WebNSFileManagerExtras)
</span><span class="cx"> #if !TARGET_OS_IPHONE
</span><span class="cx"> - (void)_webkit_setMetadataURL:(NSString *)URLString referrer:(NSString *)referrer atPath:(NSString *)path;
</span><del>-- (NSString *)_webkit_startupVolumeName;
</del><span class="cx"> #endif
</span><span class="cx"> - (NSString *)_webkit_pathWithUniqueFilenameForPath:(NSString *)path;
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebKitmacMiscWebNSFileManagerExtrasmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/mac/Misc/WebNSFileManagerExtras.mm (185292 => 185293)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -97,13 +97,6 @@
</span><span class="cx"> pthread_attr_destroy(&attr);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-- (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];
-}
-
</del><span class="cx"> #endif // !PLATFORM(IOS)
</span><span class="cx">
</span><span class="cx"> // -[NSFileManager fileExistsAtPath:] returns NO if there is a broken symlink at the path.
</span></span></pre>
</div>
</div>
</body>
</html>