Changeset 67423 in webkit for trunk/JavaScriptCore

Timestamp:

Sep 13, 2010, 4:42:02 PM (15 years ago)

Author:

Darin Adler

Message:

2010-09-13 Darin Adler <Darin Adler>

Reviewed by Adam Barth.

Preparation for eliminating deprecatedParseURL
​https://bugs.webkit.org/show_bug.cgi?id=45695

• wtf/text/WTFString.h: Added isAllSpecialCharacters, moved here from the HTML tree builder.

2010-09-13 Darin Adler <Darin Adler>

Reviewed by Adam Barth.

Preparation for eliminating deprecatedParseURL
​https://bugs.webkit.org/show_bug.cgi?id=45695

• DOM/WebDOMOperations.mm: (-[DOMDocument webFrame]): Get rid of unneeded local variable. (-[DOMDocument URLWithAttributeString:]): Remove unhelpful comment.

2010-09-13 Darin Adler <Darin Adler>

Reviewed by Adam Barth.

Preparation for eliminating deprecatedParseURL
​https://bugs.webkit.org/show_bug.cgi?id=45695

Added new HTMLParserIdioms source file, with a name inspired by the HTML
specification, which has a section defining things like "space character"
that talks about common parser idioms. These are idioms for the main HTML
parser and for parsers for various microlanguages as well.

• Android.mk:
• CMakeLists.txt:
• GNUmakefile.am:
• WebCore.gypi:
• WebCore.pro:
• WebCore.vcproj/WebCore.vcproj:
• WebCore.xcodeproj/project.pbxproj: Added HTMLParserIdioms.

• css/CSSHelper.h: Fixed indentation and comments here. Point to the new stripLeadingAndTrailingHTMLSpaces function.

• html/parser/HTMLParserIdioms.cpp: Added.
• html/parser/HTMLParserIdioms.h: Added.

• html/parser/HTMLTreeBuilder.cpp: (WebCore::HTMLTreeBuilder::ExternalCharacterTokenBuffer::skipLeadingWhitespace): (WebCore::HTMLTreeBuilder::ExternalCharacterTokenBuffer::takeLeadingWhitespace): (WebCore::HTMLTreeBuilder::ExternalCharacterTokenBuffer::takeLeadingNonWhitespace): (WebCore::HTMLTreeBuilder::ExternalCharacterTokenBuffer::takeRemainingWhitespace): Updated for name changes.

• html/parser/HTMLTreeBuilder.h: Moved functions to HTMLParserIdioms.h.

• html/HTMLInputElement.cpp:
• html/HTMLMeterElement.cpp:
• html/HTMLProgressElement.cpp:
• html/StepRange.cpp:
• rendering/RenderSlider.cpp: Updated includes.

• svg/SVGImageLoader.cpp: (WebCore::SVGImageLoader::sourceURI): Fixed incorrect use of deprecatedParseURL. This is for use on the attribute value before building the URL, not on the URL after building it. I did not add a test case; this is an obscure corner and soon we will be moving to stripLeadingAndTrailingHTMLSpaces anyway.
• wml/WMLImageLoader.cpp: (WebCore::WMLImageLoader::sourceURI): Ditto.

Location:

trunk/JavaScriptCore

Files:

• ChangeLog (modified) (1 diff)
• wtf/text/WTFString.h (modified) (5 diffs)

trunk/JavaScriptCore/ChangeLog

@@ +1 @@
+2010-09-13  Darin Adler  <[email protected]>
+
+        Reviewed by Adam Barth.
+
+        Preparation for eliminating deprecatedParseURL
+        https://bugs.webkit.org/show_bug.cgi?id=45695
+
+        * wtf/text/WTFString.h: Added isAllSpecialCharacters, moved here from
+        the HTML tree builder.
+
 2010-09-13  Darin Fisher  <[email protected]>
 

trunk/JavaScriptCore/wtf/text/WTFString.h

@@ -54 +54 @@
 
 class CString;
+struct StringHash;
 
 // Declarations of string operations
@@ -72 +73 @@
 double charactersToDouble(const UChar*, size_t, bool* ok = 0);
 float charactersToFloat(const UChar*, size_t, bool* ok = 0);
+
+template<bool isSpecialCharacter(UChar)> bool isAllSpecialCharacters(const UChar*, size_t);
 
 class String {
@@ -221 +224 @@
 
     String removeCharacters(CharacterMatchFunctionPtr) const;
+    template<bool isSpecialCharacter(UChar)> bool isAllSpecialCharacters() const;
 
     // Return the string with case folded for case insensitive comparison.
@@ -424 +428 @@
 }
 
-struct StringHash;
+template<bool isSpecialCharacter(UChar)> inline bool isAllSpecialCharacters(const UChar* characters, size_t length)
+{
+    for (size_t i = 0; i < length; ++i) {
+        if (!isSpecialCharacter(characters[i]))
+            return false;
+    }
+    return true;
+}
+
+template<bool isSpecialCharacter(UChar)> inline bool String::isAllSpecialCharacters() const
+{
+    return WTF::isAllSpecialCharacters<isSpecialCharacter>(characters(), length());
+}
 
 // StringHash is the default hash for String
@@ -441 +457 @@
 using WTF::CString;
 using WTF::String;
-
-using WTF::isSpaceOrNewline;
-using WTF::find;
-using WTF::reverseFind;
 using WTF::append;
 using WTF::appendNumber;
+using WTF::charactersAreAllASCII;
+using WTF::charactersToDouble;
+using WTF::charactersToFloat;
+using WTF::charactersToInt;
 using WTF::equal;
 using WTF::equalIgnoringCase;
-using WTF::charactersAreAllASCII;
-using WTF::charactersToInt;
-using WTF::charactersToFloat;
-using WTF::charactersToDouble;
-
-#endif
+using WTF::find;
+using WTF::isAllSpecialCharacters;
+using WTF::isSpaceOrNewline;
+using WTF::reverseFind;
+
+#endif