<!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>[201763] 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/201763">201763</a></dd>
<dt>Author</dt> <dd>ddkilzer@apple.com</dd>
<dt>Date</dt> <dd>2016-06-07 11:56:01 -0700 (Tue, 07 Jun 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>[iOS WK1] Remove unused -_webkit_unescapedQueryValue and -_webkit_queryKeysAndValues NSString category methods
<https://webkit.org/b/158485>
<rdar://problem/16960445>
Reviewed by Dan Bernstein.
* Misc/WebNSURLExtras.h:
(-[NSString _webkit_unescapedQueryValue]): Deleted declaration.
(-[NSString _webkit_queryKeysAndValues]): Deleted declaration.
* Misc/WebNSURLExtras.mm:
(-[NSString _webkit_unescapedQueryValue]): Deleted.
(-[NSString _webkit_queryKeysAndValues]): Deleted.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebKitmacChangeLog">trunk/Source/WebKit/mac/ChangeLog</a></li>
<li><a href="#trunkSourceWebKitmacMiscWebNSURLExtrash">trunk/Source/WebKit/mac/Misc/WebNSURLExtras.h</a></li>
<li><a href="#trunkSourceWebKitmacMiscWebNSURLExtrasmm">trunk/Source/WebKit/mac/Misc/WebNSURLExtras.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 (201762 => 201763)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/mac/ChangeLog 2016-06-07 18:55:08 UTC (rev 201762)
+++ trunk/Source/WebKit/mac/ChangeLog 2016-06-07 18:56:01 UTC (rev 201763)
</span><span class="lines">@@ -1,3 +1,18 @@
</span><ins>+2016-06-07 David Kilzer <ddkilzer@apple.com>
+
+ [iOS WK1] Remove unused -_webkit_unescapedQueryValue and -_webkit_queryKeysAndValues NSString category methods
+ <https://webkit.org/b/158485>
+ <rdar://problem/16960445>
+
+ Reviewed by Dan Bernstein.
+
+ * Misc/WebNSURLExtras.h:
+ (-[NSString _webkit_unescapedQueryValue]): Deleted declaration.
+ (-[NSString _webkit_queryKeysAndValues]): Deleted declaration.
+ * Misc/WebNSURLExtras.mm:
+ (-[NSString _webkit_unescapedQueryValue]): Deleted.
+ (-[NSString _webkit_queryKeysAndValues]): Deleted.
+
</ins><span class="cx"> 2016-06-07 Alex Christensen <achristensen@webkit.org>
</span><span class="cx">
</span><span class="cx"> Adopt [PDFView documentScrollView]
</span></span></pre></div>
<a id="trunkSourceWebKitmacMiscWebNSURLExtrash"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/mac/Misc/WebNSURLExtras.h (201762 => 201763)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/mac/Misc/WebNSURLExtras.h 2016-06-07 18:55:08 UTC (rev 201762)
+++ trunk/Source/WebKit/mac/Misc/WebNSURLExtras.h 2016-06-07 18:56:01 UTC (rev 201763)
</span><span class="lines">@@ -100,9 +100,4 @@
</span><span class="cx"> - (NSRange)_webkit_rangeOfURLScheme;
</span><span class="cx"> - (NSString *)_webkit_scriptIfJavaScriptURL;
</span><span class="cx">
</span><del>-#if TARGET_OS_IPHONE
-- (NSString *)_webkit_unescapedQueryValue;
-- (NSDictionary *)_webkit_queryKeysAndValues;
-#endif
-
</del><span class="cx"> @end
</span></span></pre></div>
<a id="trunkSourceWebKitmacMiscWebNSURLExtrasmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/mac/Misc/WebNSURLExtras.mm (201762 => 201763)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/mac/Misc/WebNSURLExtras.mm 2016-06-07 18:55:08 UTC (rev 201762)
+++ trunk/Source/WebKit/mac/Misc/WebNSURLExtras.mm 2016-06-07 18:56:01 UTC (rev 201763)
</span><span class="lines">@@ -313,76 +313,4 @@
</span><span class="cx"> return [[self _webkit_stringByTrimmingWhitespace] _webkit_rangeOfURLScheme].location != NSNotFound;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-#if PLATFORM(IOS)
-
-- (NSString *)_webkit_unescapedQueryValue
-{
-#pragma clang diagnostic push
-#pragma clang diagnostic ignored "-Wdeprecated-declarations"
- NSMutableString *string = [[[self stringByReplacingPercentEscapesUsingEncoding:NSUTF8StringEncoding] mutableCopy] autorelease];
- if (!string) // If we failed to decode the URL as UTF8, fall back to Latin1
- string = [[[self stringByReplacingPercentEscapesUsingEncoding:NSISOLatin1StringEncoding] mutableCopy] autorelease];
-#pragma clang diagnostic pop
- [string replaceOccurrencesOfString:@"+" withString:@" " options:NSLiteralSearch range:NSMakeRange(0, [string length])];
- return string;
-}
-
-- (NSDictionary *)_webkit_queryKeysAndValues
-{
- unsigned queryLength = [self length];
- if (!queryLength)
- return nil;
-
- NSMutableDictionary *queryKeysAndValues = nil;
- NSRange equalSearchRange = NSMakeRange(0, queryLength);
-
- while (equalSearchRange.location < queryLength - 1 && equalSearchRange.length) {
-
- // Search for "=".
- NSRange equalRange = [self rangeOfString:@"=" options:NSLiteralSearch range:equalSearchRange];
- if (equalRange.location == NSNotFound)
- break;
-
- unsigned indexAfterEqual = equalRange.location + 1;
- if (indexAfterEqual > queryLength - 1)
- break;
-
- // Get the key before the "=".
- NSRange keyRange = NSMakeRange(equalSearchRange.location, equalRange.location - equalSearchRange.location);
-
- // Seach for the ampersand.
- NSRange ampersandSearchRange = NSMakeRange(indexAfterEqual, queryLength - indexAfterEqual);
- NSRange ampersandRange = [self rangeOfString:@"&" options:NSLiteralSearch range:ampersandSearchRange];
-
- // Get the value after the "=", before the ampersand.
- NSRange valueRange;
- if (ampersandRange.location != NSNotFound)
- valueRange = NSMakeRange(indexAfterEqual, ampersandRange.location - indexAfterEqual);
- else
- valueRange = NSMakeRange(indexAfterEqual, queryLength - indexAfterEqual);
-
- // Save the key and the value.
- if (keyRange.length && valueRange.length) {
- if (queryKeysAndValues == nil)
- queryKeysAndValues = [NSMutableDictionary dictionary];
- NSString *key = [[self substringWithRange:keyRange] lowercaseString];
- NSString *value = [[self substringWithRange:valueRange] _webkit_unescapedQueryValue];
- if ([key length] && [value length])
- [queryKeysAndValues setObject:value forKey:key];
- }
-
- // At the end.
- if (ampersandRange.location == NSNotFound)
- break;
-
- // Continue searching after the ampersand.
- unsigned indexAfterAmpersand = ampersandRange.location + 1;
- equalSearchRange = NSMakeRange(indexAfterAmpersand, queryLength - indexAfterAmpersand);
- }
-
- return queryKeysAndValues;
-}
-
-#endif // PLATFORM(IOS)
-
</del><span class="cx"> @end
</span></span></pre>
</div>
</div>
</body>
</html>