Changeset 26676 in webkit for trunk/JavaScriptCore/kjs/function.cpp

Timestamp:

Oct 16, 2007, 1:13:24 PM (18 years ago)

Author:

darin

Message:

JavaScriptCore:

Reviewed by Maciej and Geoff (and looked over by Eric).

• ​http://bugs.webkit.org/show_bug.cgi?id=15519 eliminate use of <ctype.h> for processing ASCII

• wtf/ASCIICType.h: Added.
• wtf/DisallowCType.h: Added.

• kjs/config.h: Include DisallowCType.h.

• kjs/date_object.cpp: (KJS::skipSpacesAndComments): (KJS::findMonth): (KJS::parseDate):
• kjs/function.cpp: (KJS::decode):
• kjs/ustring.cpp: (KJS::UString::toDouble): Use ASCIICType.h functions instead of ctype.h ones.

WebCore:

Reviewed by Maciej and Geoff (and looked over by Eric).

• ​http://bugs.webkit.org/show_bug.cgi?id=15519 eliminate use of <ctype.h> for processing ASCII

• ForwardingHeaders/wtf/ASCIICType.h: Added.
• ForwardingHeaders/wtf/DisallowCType.h: Added.

• WebCorePrefix.h: Get rid of inclusion of <ctype.h>.
• config.h: Include DisallowCType.h.

• css/CSSParser.cpp: (WebCore::ParseString::lower):
• css/CSSPrimitiveValue.cpp: (WebCore::isCSSTokenizerIdentifier):
• css/CSSStyleDeclaration.cpp: (WebCore::propertyID):
• html/HTMLSelectElement.cpp: (WebCore::stripLeadingWhiteSpace):
• html/HTMLTokenizer.cpp: (WebCore::tagMatch):
• loader/FTPDirectoryParser.cpp: (WebCore::parseOneFTPLine):
• loader/TextResourceDecoder.cpp: (WebCore::TextResourceDecoder::checkForHeadCharset):
• platform/DeprecatedCString.cpp: (WebCore::DeprecatedCString::lower): (WebCore::DeprecatedCString::upper): (WebCore::DeprecatedCString::find): (WebCore::DeprecatedCString::contains):
• platform/DeprecatedString.cpp: (WebCore::equalCaseInsensitive): (WebCore::isCharacterAllowedInBase): (WebCore::DeprecatedString::find): (WebCore::DeprecatedString::contains): (WebCore::toIntegralType):
• platform/DeprecatedString.h: (WebCore::DeprecatedChar::isSpace): (WebCore::DeprecatedChar::lower): (WebCore::DeprecatedChar::upper):
• platform/KURL.cpp: (WebCore::KURL::parse):
• platform/StringImpl.cpp: (WebCore::isSpace): (WebCore::StringImpl::containsOnlyWhitespace): (WebCore::StringImpl::isLower): (WebCore::StringImpl::lower): (WebCore::StringImpl::find): (WebCore::StringImpl::reverseFind): (WebCore::equalIgnoringCase):
• platform/TextEncodingRegistry.cpp: (WebCore::TextEncodingNameHash::equal): (WebCore::TextEncodingNameHash::hash): (WebCore::atomicCanonicalTextEncodingName):
• platform/mac/KeyEventMac.mm: (WebCore::keyIdentifierForKeyEvent):
• platform/win/KeyEventWin.cpp: (WebCore::keyIdentifierForWindowsKeyCode):
• platform/win/PopupMenuWin.cpp: (WebCore::isASCIIPrintable): (WebCore::PopupWndProc):
• plugins/win/PluginViewWin.cpp: (WebCore::capitalizeRFC822HeaderFieldName):
• rendering/RenderText.cpp: (WebCore::RenderText::widthFromCache): Use ASCIICType.h functions instead of ctype.h ones.

WebKit:

Reviewed by Maciej and Geoff (and looked over by Eric).

• ​http://bugs.webkit.org/show_bug.cgi?id=15519 eliminate use of <ctype.h> for processing ASCII

• ForwardingHeaders/wtf/ASCIICType.h: Added.
• ForwardingHeaders/wtf/DisallowCType.h: Added.

• WebKitPrefix.h: Include DisallowCType.h.

• Misc/WebNSURLExtras.mm: (-[NSURL _web_URLWithLowercasedScheme]): Use toASCIILower.
• WebView/WebHTMLView.mm: (-[WebHTMLView callWebCoreCommand:]): Use toASCIIUpper. (-[WebTextCompleteController filterKeyDown:]): Add a list of specific character codes, instead of using ispunct.

File:

• trunk/JavaScriptCore/kjs/function.cpp (modified) (5 diffs)

trunk/JavaScriptCore/kjs/function.cpp

@@ -1 +1 @@
 // -*- c-basic-offset: 2 -*-
 /*
- *  This file is part of the KDE libraries
  *  Copyright (C) 1999-2002 Harri Porten ([email protected])
  *  Copyright (C) 2001 Peter Kelly ([email protected])
- *  Copyright (C) 2003 Apple Computer, Inc.
+ *  Copyright (C) 2003, 2004, 2005, 2006, 2007 Apple Inc. All rights reserved.
  *  Copyright (C) 2007 Cameron Zwarich ([email protected])
  *
@@ -41 +40 @@
 #include <assert.h>
 #include <string.h>
-#include <ctype.h>
-
+
+#include <wtf/ASCIICType.h>
 #include <wtf/unicode/Unicode.h>
 
@@ -583 +582 @@
     if (c == '%') {
       int charLen = 0;
-      if (k <= len - 3 && isxdigit(p[1].uc) && isxdigit(p[2].uc)) {
+      if (k <= len - 3 && isASCIIHexDigit(p[1].uc) && isASCIIHexDigit(p[2].uc)) {
         const char b0 = Lexer::convertHex(p[1].uc, p[2].uc);
         const int sequenceLen = UTF8SequenceLength(b0);
@@ -592 +591 @@
           for (int i = 1; i < sequenceLen; ++i) {
             const UChar* q = p + i * 3;
-            if (q[0] == '%' && isxdigit(q[1].uc) && isxdigit(q[2].uc))
+            if (q[0] == '%' && isASCIIHexDigit(q[1].uc) && isASCIIHexDigit(q[2].uc))
               sequence[i] = Lexer::convertHex(q[1].uc, q[2].uc);
             else {
@@ -620 +619 @@
         // For that, it's good to support the wonky "%u" syntax for compatibility with WinIE.
         if (k <= len - 6 && p[1] == 'u'
-            && isxdigit(p[2].uc) && isxdigit(p[3].uc)
-            && isxdigit(p[4].uc) && isxdigit(p[5].uc)) {
+            && isASCIIHexDigit(p[2].uc) && isASCIIHexDigit(p[3].uc)
+            && isASCIIHexDigit(p[4].uc) && isASCIIHexDigit(p[5].uc)) {
           charLen = 6;
           u = Lexer::convertUnicode(p[2].uc, p[3].uc, p[4].uc, p[5].uc);