Changeset 195946 in webkit

Timestamp:

Jan 31, 2016 5:50:50 PM (8 years ago)

Author:

Darin Adler

Message:

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 "HTTP", so no need to handle non-ASCII.

• platform/network/cocoa/ResourceResponseCocoa.mm:

(WebCore::ResourceResponse::platformLazyInit): Ditto.

• rendering/svg/SVGRenderTreeAsText.cpp:

(WebCore::operator<<): 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.

Location:

trunk/Source

Files:

• WTF/ChangeLog (modified) (1 diff)
• WTF/wtf/text/AtomicString.h (modified) (1 diff)
• WebCore/ChangeLog (modified) (1 diff)
• WebCore/editing/cocoa/HTMLConverter.mm (modified) (1 diff)
• WebCore/platform/network/cf/ResourceResponseCFNet.cpp (modified) (1 diff)
• WebCore/platform/network/cocoa/ResourceResponseCocoa.mm (modified) (1 diff)
• WebCore/rendering/svg/SVGRenderTreeAsText.cpp (modified) (1 diff)
• WebKit2/ChangeLog (modified) (1 diff)
• WebKit2/UIProcess/API/efl/tests/test_ewk2_text_checker.cpp (modified) (1 diff)

trunk/Source/WTF/ChangeLog

@@ +1 @@
+2016-01-31  Darin Adler  <darin@apple.com>
+
+        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.
+
 2016-01-31  Dan Bernstein  <mitz@apple.com>
 

trunk/Source/WTF/wtf/text/AtomicString.h

@@ -157 +157 @@
     WTF_EXPORT_STRING_API AtomicString convertToASCIIUppercase() const;
     WTF_EXPORT_STRING_API AtomicString lower() const;
-    AtomicString upper() const { return AtomicString(impl()->upper()); }
 
     int toInt(bool* ok = 0) const { return m_string.toInt(ok); }

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2016-01-31  Darin Adler  <darin@apple.com>
+
+        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 "HTTP", so no need to handle non-ASCII.
+        * platform/network/cocoa/ResourceResponseCocoa.mm:
+        (WebCore::ResourceResponse::platformLazyInit): Ditto.
+
+        * rendering/svg/SVGRenderTreeAsText.cpp:
+        (WebCore::operator<<): Use convertToASCIIUppercase when writing the spread
+        method type into a text stream. The method types are all ASCII.
+
 2016-01-31  Dan Bernstein  <mitz@apple.com>
 

trunk/Source/WebCore/editing/cocoa/HTMLConverter.mm

@@ -1090 +1090 @@
         String fontName = _caches->propertyValueForNode(element, CSSPropertyFontFamily);
         if (fontName.length())
-            font = _fontForNameAndSize(fontName.upper(), fontSize, _fontCache);
+            font = _fontForNameAndSize(fontName.convertToASCIILowercase(), fontSize, _fontCache);
         if (!font)
             font = [PlatformFontClass fontWithName:@"Times" size:fontSize];

trunk/Source/WebCore/platform/network/cf/ResourceResponseCFNet.cpp

@@ -87 +87 @@
         CFHTTPMessageRef httpResponse = CFURLResponseGetHTTPResponse(m_cfResponse.get());
         if (httpResponse) {
-            RetainPtr<CFStringRef> messageString = adoptCF(CFHTTPMessageCopyVersion(httpResponse));
-            m_httpVersion = String(messageString.get()).upper();
+            m_httpVersion = String(adoptCF(CFHTTPMessageCopyVersion(httpResponse)).get()).convertToASCIIUppercase();
             m_httpStatusCode = CFHTTPMessageGetResponseStatusCode(httpResponse);
             

trunk/Source/WebCore/platform/network/cocoa/ResourceResponseCocoa.mm

@@ -188 +188 @@
 
             CFHTTPMessageRef messageRef = CFURLResponseGetHTTPResponse([httpResponse _CFURLResponse]);
-            RetainPtr<CFStringRef> messageString = adoptCF(CFHTTPMessageCopyVersion(messageRef));
-            m_httpVersion = String(messageString.get()).upper();
+            m_httpVersion = String(adoptCF(CFHTTPMessageCopyVersion(messageRef)).get()).convertToASCIIUppercase();
             m_httpStatusCode = [httpResponse statusCode];
             

trunk/Source/WebCore/rendering/svg/SVGRenderTreeAsText.cpp

@@ -146 +146 @@
 static TextStream& operator<<(TextStream& ts, const SVGSpreadMethodType& type)
 {
-    ts << SVGPropertyTraits<SVGSpreadMethodType>::toString(type).upper();
+    ts << SVGPropertyTraits<SVGSpreadMethodType>::toString(type).convertToASCIIUppercase();
     return ts;
 }

trunk/Source/WebKit2/ChangeLog

@@ +1 @@
+2016-01-31  Darin Adler  <darin@apple.com>
+
+        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.
+
 2016-01-31  Dan Bernstein  <mitz@apple.com>
 

trunk/Source/WebKit2/UIProcess/API/efl/tests/test_ewk2_text_checker.cpp

@@ -701 +701 @@
     // the Enchant library will 'normalize' them.
     WTF::StringBuilder languages;
-    languages.append(String(firstExpected).upper());
+    languages.append(String(firstExpected).convertToASCIIUppercase());
     languages.append(',');
-    languages.append(String(lastExpected).lower());
+    languages.append(String(lastExpected).convertToASCIILowercase());
 
     // Set both languages (the first and the last) from the list.