<!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>[195946] trunk/Source</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/195946">195946</a></dd>
<dt>Author</dt> <dd>darin@apple.com</dd>
<dt>Date</dt> <dd>2016-01-31 17:50:50 -0800 (Sun, 31 Jan 2016)</dd>
</dl>

<h3>Log Message</h3>
<pre>Get rid of most calls to String::upper; mostly replace them with convertToASCIIUppercase
https://bugs.webkit.org/show_bug.cgi?id=153715

Reviewed by Gyuyoung Kim.

Source/WebCore:

* editing/cocoa/HTMLConverter.mm:
(HTMLConverter::computedAttributesForElement): Use convertToASCIILowercase to fold
ASCII case when searching for fonts by name.

* platform/network/cf/ResourceResponseCFNet.cpp:
(WebCore::ResourceResponse::platformLazyInit): Use convertToASCIIUppercase to make
the HTTP version string canonical. Not sure why it's needed at all, but the letters
we might be uppercasing are &quot;HTTP&quot;, so no need to handle non-ASCII.
* platform/network/cocoa/ResourceResponseCocoa.mm:
(WebCore::ResourceResponse::platformLazyInit): Ditto.

* rendering/svg/SVGRenderTreeAsText.cpp:
(WebCore::operator&lt;&lt;): Use convertToASCIIUppercase when writing the spread
method type into a text stream. The method types are all ASCII.

Source/WebKit2:

* UIProcess/API/efl/tests/test_ewk2_text_checker.cpp:
Use convertToASCIIUppercase on language names.

Source/WTF:

* wtf/text/AtomicString.h:
(WTF::AtomicString::upper): Deleted.</pre>

<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWTFChangeLog">trunk/Source/WTF/ChangeLog</a></li>
<li><a href="#trunkSourceWTFwtftextAtomicStringh">trunk/Source/WTF/wtf/text/AtomicString.h</a></li>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoreeditingcocoaHTMLConvertermm">trunk/Source/WebCore/editing/cocoa/HTMLConverter.mm</a></li>
<li><a href="#trunkSourceWebCoreplatformnetworkcfResourceResponseCFNetcpp">trunk/Source/WebCore/platform/network/cf/ResourceResponseCFNet.cpp</a></li>
<li><a href="#trunkSourceWebCoreplatformnetworkcocoaResourceResponseCocoamm">trunk/Source/WebCore/platform/network/cocoa/ResourceResponseCocoa.mm</a></li>
<li><a href="#trunkSourceWebCorerenderingsvgSVGRenderTreeAsTextcpp">trunk/Source/WebCore/rendering/svg/SVGRenderTreeAsText.cpp</a></li>
<li><a href="#trunkSourceWebKit2ChangeLog">trunk/Source/WebKit2/ChangeLog</a></li>
<li><a href="#trunkSourceWebKit2UIProcessAPIeflteststest_ewk2_text_checkercpp">trunk/Source/WebKit2/UIProcess/API/efl/tests/test_ewk2_text_checker.cpp</a></li>
</ul>

</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWTFChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WTF/ChangeLog (195945 => 195946)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WTF/ChangeLog        2016-02-01 01:20:55 UTC (rev 195945)
+++ trunk/Source/WTF/ChangeLog        2016-02-01 01:50:50 UTC (rev 195946)
</span><span class="lines">@@ -1,3 +1,13 @@
</span><ins>+2016-01-31  Darin Adler  &lt;darin@apple.com&gt;
+
+        Get rid of most calls to String::upper; mostly replace them with convertToASCIIUppercase
+        https://bugs.webkit.org/show_bug.cgi?id=153715
+
+        Reviewed by Gyuyoung Kim.
+
+        * wtf/text/AtomicString.h:
+        (WTF::AtomicString::upper): Deleted.
+
</ins><span class="cx"> 2016-01-31  Dan Bernstein  &lt;mitz@apple.com&gt;
</span><span class="cx"> 
</span><span class="cx">         [Cocoa] Remove unused definition of HAVE_HEADER_DETECTION_H
</span></span></pre></div>
<a id="trunkSourceWTFwtftextAtomicStringh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WTF/wtf/text/AtomicString.h (195945 => 195946)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WTF/wtf/text/AtomicString.h        2016-02-01 01:20:55 UTC (rev 195945)
+++ trunk/Source/WTF/wtf/text/AtomicString.h        2016-02-01 01:50:50 UTC (rev 195946)
</span><span class="lines">@@ -156,7 +156,6 @@
</span><span class="cx">     WTF_EXPORT_STRING_API AtomicString convertToASCIILowercase() const;
</span><span class="cx">     WTF_EXPORT_STRING_API AtomicString convertToASCIIUppercase() const;
</span><span class="cx">     WTF_EXPORT_STRING_API AtomicString lower() const;
</span><del>-    AtomicString upper() const { return AtomicString(impl()-&gt;upper()); }
</del><span class="cx"> 
</span><span class="cx">     int toInt(bool* ok = 0) const { return m_string.toInt(ok); }
</span><span class="cx">     double toDouble(bool* ok = 0) const { return m_string.toDouble(ok); }
</span></span></pre></div>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (195945 => 195946)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog        2016-02-01 01:20:55 UTC (rev 195945)
+++ trunk/Source/WebCore/ChangeLog        2016-02-01 01:50:50 UTC (rev 195946)
</span><span class="lines">@@ -1,3 +1,25 @@
</span><ins>+2016-01-31  Darin Adler  &lt;darin@apple.com&gt;
+
+        Get rid of most calls to String::upper; mostly replace them with convertToASCIIUppercase
+        https://bugs.webkit.org/show_bug.cgi?id=153715
+
+        Reviewed by Gyuyoung Kim.
+
+        * editing/cocoa/HTMLConverter.mm:
+        (HTMLConverter::computedAttributesForElement): Use convertToASCIILowercase to fold
+        ASCII case when searching for fonts by name.
+
+        * platform/network/cf/ResourceResponseCFNet.cpp:
+        (WebCore::ResourceResponse::platformLazyInit): Use convertToASCIIUppercase to make
+        the HTTP version string canonical. Not sure why it's needed at all, but the letters
+        we might be uppercasing are &quot;HTTP&quot;, so no need to handle non-ASCII.
+        * platform/network/cocoa/ResourceResponseCocoa.mm:
+        (WebCore::ResourceResponse::platformLazyInit): Ditto.
+
+        * rendering/svg/SVGRenderTreeAsText.cpp:
+        (WebCore::operator&lt;&lt;): Use convertToASCIIUppercase when writing the spread
+        method type into a text stream. The method types are all ASCII.
+
</ins><span class="cx"> 2016-01-31  Dan Bernstein  &lt;mitz@apple.com&gt;
</span><span class="cx"> 
</span><span class="cx">         [Cocoa] Remove __has_include guards around use of WebKitAdditions
</span></span></pre></div>
<a id="trunkSourceWebCoreeditingcocoaHTMLConvertermm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/editing/cocoa/HTMLConverter.mm (195945 => 195946)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/editing/cocoa/HTMLConverter.mm        2016-02-01 01:20:55 UTC (rev 195945)
+++ trunk/Source/WebCore/editing/cocoa/HTMLConverter.mm        2016-02-01 01:50:50 UTC (rev 195946)
</span><span class="lines">@@ -1089,7 +1089,7 @@
</span><span class="cx">     if (!font) {
</span><span class="cx">         String fontName = _caches-&gt;propertyValueForNode(element, CSSPropertyFontFamily);
</span><span class="cx">         if (fontName.length())
</span><del>-            font = _fontForNameAndSize(fontName.upper(), fontSize, _fontCache);
</del><ins>+            font = _fontForNameAndSize(fontName.convertToASCIILowercase(), fontSize, _fontCache);
</ins><span class="cx">         if (!font)
</span><span class="cx">             font = [PlatformFontClass fontWithName:@&quot;Times&quot; size:fontSize];
</span><span class="cx"> 
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformnetworkcfResourceResponseCFNetcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/network/cf/ResourceResponseCFNet.cpp (195945 => 195946)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/network/cf/ResourceResponseCFNet.cpp        2016-02-01 01:20:55 UTC (rev 195945)
+++ trunk/Source/WebCore/platform/network/cf/ResourceResponseCFNet.cpp        2016-02-01 01:50:50 UTC (rev 195946)
</span><span class="lines">@@ -86,8 +86,7 @@
</span><span class="cx"> 
</span><span class="cx">         CFHTTPMessageRef httpResponse = CFURLResponseGetHTTPResponse(m_cfResponse.get());
</span><span class="cx">         if (httpResponse) {
</span><del>-            RetainPtr&lt;CFStringRef&gt; messageString = adoptCF(CFHTTPMessageCopyVersion(httpResponse));
-            m_httpVersion = String(messageString.get()).upper();
</del><ins>+            m_httpVersion = String(adoptCF(CFHTTPMessageCopyVersion(httpResponse)).get()).convertToASCIIUppercase();
</ins><span class="cx">             m_httpStatusCode = CFHTTPMessageGetResponseStatusCode(httpResponse);
</span><span class="cx">             
</span><span class="cx">             if (initLevel &lt; AllFields) {
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformnetworkcocoaResourceResponseCocoamm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/network/cocoa/ResourceResponseCocoa.mm (195945 => 195946)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/network/cocoa/ResourceResponseCocoa.mm        2016-02-01 01:20:55 UTC (rev 195945)
+++ trunk/Source/WebCore/platform/network/cocoa/ResourceResponseCocoa.mm        2016-02-01 01:50:50 UTC (rev 195946)
</span><span class="lines">@@ -187,8 +187,7 @@
</span><span class="cx">             NSHTTPURLResponse *httpResponse = (NSHTTPURLResponse *)m_nsResponse.get();
</span><span class="cx"> 
</span><span class="cx">             CFHTTPMessageRef messageRef = CFURLResponseGetHTTPResponse([httpResponse _CFURLResponse]);
</span><del>-            RetainPtr&lt;CFStringRef&gt; messageString = adoptCF(CFHTTPMessageCopyVersion(messageRef));
-            m_httpVersion = String(messageString.get()).upper();
</del><ins>+            m_httpVersion = String(adoptCF(CFHTTPMessageCopyVersion(messageRef)).get()).convertToASCIIUppercase();
</ins><span class="cx">             m_httpStatusCode = [httpResponse statusCode];
</span><span class="cx">             
</span><span class="cx">             if (initLevel &lt; AllFields) {
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingsvgSVGRenderTreeAsTextcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/svg/SVGRenderTreeAsText.cpp (195945 => 195946)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/svg/SVGRenderTreeAsText.cpp        2016-02-01 01:20:55 UTC (rev 195945)
+++ trunk/Source/WebCore/rendering/svg/SVGRenderTreeAsText.cpp        2016-02-01 01:50:50 UTC (rev 195946)
</span><span class="lines">@@ -145,7 +145,7 @@
</span><span class="cx"> 
</span><span class="cx"> static TextStream&amp; operator&lt;&lt;(TextStream&amp; ts, const SVGSpreadMethodType&amp; type)
</span><span class="cx"> {
</span><del>-    ts &lt;&lt; SVGPropertyTraits&lt;SVGSpreadMethodType&gt;::toString(type).upper();
</del><ins>+    ts &lt;&lt; SVGPropertyTraits&lt;SVGSpreadMethodType&gt;::toString(type).convertToASCIIUppercase();
</ins><span class="cx">     return ts;
</span><span class="cx"> }
</span><span class="cx"> 
</span></span></pre></div>
<a id="trunkSourceWebKit2ChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/ChangeLog (195945 => 195946)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/ChangeLog        2016-02-01 01:20:55 UTC (rev 195945)
+++ trunk/Source/WebKit2/ChangeLog        2016-02-01 01:50:50 UTC (rev 195946)
</span><span class="lines">@@ -1,3 +1,13 @@
</span><ins>+2016-01-31  Darin Adler  &lt;darin@apple.com&gt;
+
+        Get rid of most calls to String::upper; mostly replace them with convertToASCIIUppercase
+        https://bugs.webkit.org/show_bug.cgi?id=153715
+
+        Reviewed by Gyuyoung Kim.
+
+        * UIProcess/API/efl/tests/test_ewk2_text_checker.cpp:
+        Use convertToASCIIUppercase on language names.
+
</ins><span class="cx"> 2016-01-31  Dan Bernstein  &lt;mitz@apple.com&gt;
</span><span class="cx"> 
</span><span class="cx">         [Cocoa] Remove __has_include guards around use of WebKitAdditions
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessAPIeflteststest_ewk2_text_checkercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/API/efl/tests/test_ewk2_text_checker.cpp (195945 => 195946)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/API/efl/tests/test_ewk2_text_checker.cpp        2016-02-01 01:20:55 UTC (rev 195945)
+++ trunk/Source/WebKit2/UIProcess/API/efl/tests/test_ewk2_text_checker.cpp        2016-02-01 01:50:50 UTC (rev 195946)
</span><span class="lines">@@ -700,9 +700,9 @@
</span><span class="cx">     // Case sensitivity of dictionaries doesn't affect on loading the dictionaries,
</span><span class="cx">     // the Enchant library will 'normalize' them.
</span><span class="cx">     WTF::StringBuilder languages;
</span><del>-    languages.append(String(firstExpected).upper());
</del><ins>+    languages.append(String(firstExpected).convertToASCIIUppercase());
</ins><span class="cx">     languages.append(',');
</span><del>-    languages.append(String(lastExpected).lower());
</del><ins>+    languages.append(String(lastExpected).convertToASCIILowercase());
</ins><span class="cx"> 
</span><span class="cx">     // Set both languages (the first and the last) from the list.
</span><span class="cx">     ewk_text_checker_spell_checking_languages_set(languages.toString().utf8().data());
</span></span></pre>
</div>
</div>

</body>
</html>