Changeset 108001 in webkit for trunk/Source/JavaScriptCore/wtf

Timestamp:

Feb 16, 2012, 4:54:37 PM (13 years ago)

Author:

[email protected]

Message:

Fix the broken viewport tests
​https://bugs.webkit.org/show_bug.cgi?id=78774

Reviewed by Kenneth Rohde Christiansen.

Source/JavaScriptCore:

• JavaScriptCore.vcproj/JavaScriptCore/JavaScriptCore.def:
• wtf/text/WTFString.cpp:

(WTF):
(WTF::toDoubleType): Template-ized to allow other functions to specify whether they
want to allow trailing junk or not when calling strtod.
(WTF::charactersToDouble):
(WTF::charactersToFloat):
(WTF::charactersToFloatIgnoringJunk): Created new version of charactersToFloat that allows
trailing junk.

• wtf/text/WTFString.h:

(WTF):

Source/WebCore:

No new tests.

• dom/ViewportArguments.cpp:

(WebCore::numericPrefix): Changed to use the new charactersToFloatWithJunk function(s).

LayoutTests:

• platform/gtk/Skipped: Undoing tests skipped due to earlier breakage.
• platform/qt/Skipped: Ditto.

Location:

trunk/Source/JavaScriptCore/wtf/text

Files:

• WTFString.cpp (modified) (5 diffs)
• WTFString.h (modified) (1 diff)

trunk/Source/JavaScriptCore/wtf/text/WTFString.cpp

@@ -1037 +1037 @@
 }
 
-template <typename CharType>
+template <typename CharType, WTF::AllowTrailingJunkTag allowTrailingJunk>
 static inline double toDoubleType(const CharType* data, size_t length, bool* ok, bool* didReadNumber)
 {
@@ -1054 +1054 @@
     char* start = bytes.data();
     char* end;
-    double val = WTF::strtod<WTF::DisallowTrailingJunk>(start, &end);
+    double val = WTF::strtod<allowTrailingJunk>(start, &end);
     if (ok)
         *ok = (end == 0 || *end == '\0') && !isnan(val);
@@ -1064 +1064 @@
 double charactersToDouble(const LChar* data, size_t length, bool* ok, bool* didReadNumber)
 {
-    return toDoubleType<LChar>(data, length, ok, didReadNumber);
+    return toDoubleType<LChar, WTF::DisallowTrailingJunk>(data, length, ok, didReadNumber);
 }
 
 double charactersToDouble(const UChar* data, size_t length, bool* ok, bool* didReadNumber)
 {
-    return toDoubleType<UChar>(data, length, ok, didReadNumber);
+    return toDoubleType<UChar, WTF::DisallowTrailingJunk>(data, length, ok, didReadNumber);
 }
 
@@ -1075 +1075 @@
 {
     // FIXME: This will return ok even when the string fits into a double but not a float.
-    return static_cast<float>(toDoubleType<LChar>(data, length, ok, didReadNumber));
+    return static_cast<float>(toDoubleType<LChar, WTF::DisallowTrailingJunk>(data, length, ok, didReadNumber));
 }
 
@@ -1081 +1081 @@
 {
     // FIXME: This will return ok even when the string fits into a double but not a float.
-    return static_cast<float>(toDoubleType<UChar>(data, length, ok, didReadNumber));
+    return static_cast<float>(toDoubleType<UChar, WTF::DisallowTrailingJunk>(data, length, ok, didReadNumber));
+}
+
+float charactersToFloatIgnoringJunk(const LChar* data, size_t length, bool* ok, bool* didReadNumber)
+{
+    // FIXME: This will return ok even when the string fits into a double but not a float.
+    return static_cast<float>(toDoubleType<LChar, WTF::AllowTrailingJunk>(data, length, ok, didReadNumber));
+}
+
+float charactersToFloatIgnoringJunk(const UChar* data, size_t length, bool* ok, bool* didReadNumber)
+{
+    // FIXME: This will return ok even when the string fits into a double but not a float.
+    return static_cast<float>(toDoubleType<UChar, WTF::AllowTrailingJunk>(data, length, ok, didReadNumber));
 }
 

trunk/Source/JavaScriptCore/wtf/text/WTFString.h

@@ -88 +88 @@
 WTF_EXPORT_PRIVATE double charactersToDouble(const UChar*, size_t, bool* ok = 0, bool* didReadNumber = 0);
 float charactersToFloat(const LChar*, size_t, bool* ok = 0, bool* didReadNumber = 0);
+WTF_EXPORT_PRIVATE float charactersToFloatIgnoringJunk(const LChar*, size_t, bool* ok = 0, bool* didReadNumber = 0);
 WTF_EXPORT_PRIVATE float charactersToFloat(const UChar*, size_t, bool* ok = 0, bool* didReadNumber = 0);
+WTF_EXPORT_PRIVATE float charactersToFloatIgnoringJunk(const UChar*, size_t, bool* ok = 0, bool* didReadNumber = 0);
 
 enum FloatConversionFlags {