- Revision
- 195946
- Author
- [email protected]
- Date
- 2016-01-31 17:50:50 -0800 (Sun, 31 Jan 2016)
Log 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.
Modified Paths
Diff
Modified: trunk/Source/WTF/ChangeLog (195945 => 195946)
--- 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)
@@ -1,3 +1,13 @@
+2016-01-31 Darin Adler <[email protected]>
+
+ 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 <[email protected]>
[Cocoa] Remove unused definition of HAVE_HEADER_DETECTION_H
Modified: trunk/Source/WTF/wtf/text/AtomicString.h (195945 => 195946)
--- 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)
@@ -156,7 +156,6 @@
WTF_EXPORT_STRING_API AtomicString convertToASCIILowercase() const;
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); }
double toDouble(bool* ok = 0) const { return m_string.toDouble(ok); }
Modified: trunk/Source/WebCore/ChangeLog (195945 => 195946)
--- 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)
@@ -1,3 +1,25 @@
+2016-01-31 Darin Adler <[email protected]>
+
+ 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 <[email protected]>
[Cocoa] Remove __has_include guards around use of WebKitAdditions
Modified: trunk/Source/WebCore/editing/cocoa/HTMLConverter.mm (195945 => 195946)
--- 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)
@@ -1089,7 +1089,7 @@
if (!font) {
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];
Modified: trunk/Source/WebCore/platform/network/cf/ResourceResponseCFNet.cpp (195945 => 195946)
--- 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)
@@ -86,8 +86,7 @@
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);
if (initLevel < AllFields) {
Modified: trunk/Source/WebCore/platform/network/cocoa/ResourceResponseCocoa.mm (195945 => 195946)
--- 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)
@@ -187,8 +187,7 @@
NSHTTPURLResponse *httpResponse = (NSHTTPURLResponse *)m_nsResponse.get();
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];
if (initLevel < AllFields) {
Modified: trunk/Source/WebCore/rendering/svg/SVGRenderTreeAsText.cpp (195945 => 195946)
--- 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)
@@ -145,7 +145,7 @@
static TextStream& operator<<(TextStream& ts, const SVGSpreadMethodType& type)
{
- ts << SVGPropertyTraits<SVGSpreadMethodType>::toString(type).upper();
+ ts << SVGPropertyTraits<SVGSpreadMethodType>::toString(type).convertToASCIIUppercase();
return ts;
}
Modified: trunk/Source/WebKit2/ChangeLog (195945 => 195946)
--- 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)
@@ -1,3 +1,13 @@
+2016-01-31 Darin Adler <[email protected]>
+
+ 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 <[email protected]>
[Cocoa] Remove __has_include guards around use of WebKitAdditions
Modified: trunk/Source/WebKit2/UIProcess/API/efl/tests/test_ewk2_text_checker.cpp (195945 => 195946)
--- 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)
@@ -700,9 +700,9 @@
// Case sensitivity of dictionaries doesn't affect on loading the dictionaries,
// 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.
ewk_text_checker_spell_checking_languages_set(languages.toString().utf8().data());
