Changeset 246491 in webkit

Timestamp:

Jun 16, 2019, 6:59:28 PM (7 years ago)

Author:

Darin Adler

Message:

Convert some uses of fixed width and fixed precision floating point formatting to use shortest instead
​https://bugs.webkit.org/show_bug.cgi?id=198896

Reviewed by Sam Weinig.

Source/WebCore:

• Modules/indexeddb/IDBKeyData.cpp:

(WebCore::IDBKeyData::loggingString const): Removed unneeded use of
FormattedNumber::fixedWidth to override the default shortest-form formatting.

• page/History.cpp:

(WebCore::History::stateObjectAdded): Ditto.

• page/PrintContext.cpp:

(WebCore::PrintContext::pageProperty): Use String::number instead of
String::numberToStringFixedPrecision. Also removed some uses of
FormattedNumber::fixedPrecision.

• platform/graphics/FloatPolygon.cpp:

(WebCore::FloatPolygonEdge::debugString const): Ditto.

LayoutTests:

• fast/loader/stateobjects/pushstate-frequency-expected.txt:
• fast/loader/stateobjects/pushstate-frequency-iframe-expected.txt:
• fast/loader/stateobjects/replacestate-frequency-expected.txt:
• fast/loader/stateobjects/replacestate-frequency-iframe-expected.txt:

Updated to expect cleaner output without ".000000".

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/fast/loader/stateobjects/pushstate-frequency-expected.txt (modified) (1 diff)
• LayoutTests/fast/loader/stateobjects/pushstate-frequency-iframe-expected.txt (modified) (1 diff)
• LayoutTests/fast/loader/stateobjects/replacestate-frequency-expected.txt (modified) (1 diff)
• LayoutTests/fast/loader/stateobjects/replacestate-frequency-iframe-expected.txt (modified) (1 diff)
• Source/WebCore/ChangeLog (modified) (1 diff)
• Source/WebCore/Modules/indexeddb/IDBKeyData.cpp (modified) (1 diff)
• Source/WebCore/page/History.cpp (modified) (1 diff)
• Source/WebCore/page/PrintContext.cpp (modified) (2 diffs)
• Source/WebCore/platform/graphics/FloatPolygon.cpp (modified) (1 diff)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2019-06-16  Darin Adler  <darin@apple.com>
+
+        Convert some uses of fixed width and fixed precision floating point formatting to use shortest instead
+        https://bugs.webkit.org/show_bug.cgi?id=198896
+
+        Reviewed by Sam Weinig.
+
+        * fast/loader/stateobjects/pushstate-frequency-expected.txt:
+        * fast/loader/stateobjects/pushstate-frequency-iframe-expected.txt:
+        * fast/loader/stateobjects/replacestate-frequency-expected.txt:
+        * fast/loader/stateobjects/replacestate-frequency-iframe-expected.txt:
+        Updated to expect cleaner output without ".000000".
+
 2019-06-15  Simon Fraser  <simon.fraser@apple.com>
 

trunk/LayoutTests/fast/loader/stateobjects/pushstate-frequency-expected.txt

@@ -100 +100 @@
 Successfully added item: 98
 Successfully added item: 99
-SecurityError: Attempt to use history.pushState() more than 100 times per 30.000000 seconds
+SecurityError: Attempt to use history.pushState() more than 100 times per 30 seconds
 Test complete
 

trunk/LayoutTests/fast/loader/stateobjects/pushstate-frequency-iframe-expected.txt

@@ -108 +108 @@
 Successfully added item: 23
 Successfully added item: 24
-Expected exception: SecurityError: Attempt to use history.pushState() more than 100 times per 30.000000 seconds
+Expected exception: SecurityError: Attempt to use history.pushState() more than 100 times per 30 seconds
 

trunk/LayoutTests/fast/loader/stateobjects/replacestate-frequency-expected.txt

@@ -100 +100 @@
 Successfully added item: 98
 Successfully added item: 99
-SecurityError: Attempt to use history.replaceState() more than 100 times per 30.000000 seconds
+SecurityError: Attempt to use history.replaceState() more than 100 times per 30 seconds
 Test complete
 

trunk/LayoutTests/fast/loader/stateobjects/replacestate-frequency-iframe-expected.txt

@@ -107 +107 @@
 Successfully added item: 23
 Successfully added item: 24
-Expected exception: SecurityError: Attempt to use history.replaceState() more than 100 times per 30.000000 seconds
+Expected exception: SecurityError: Attempt to use history.replaceState() more than 100 times per 30 seconds
 

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2019-06-16  Darin Adler  <darin@apple.com>
+
+        Convert some uses of fixed width and fixed precision floating point formatting to use shortest instead
+        https://bugs.webkit.org/show_bug.cgi?id=198896
+
+        Reviewed by Sam Weinig.
+
+        * Modules/indexeddb/IDBKeyData.cpp:
+        (WebCore::IDBKeyData::loggingString const): Removed unneeded use of
+        FormattedNumber::fixedWidth to override the default shortest-form formatting.
+        * page/History.cpp:
+        (WebCore::History::stateObjectAdded): Ditto.
+
+        * page/PrintContext.cpp:
+        (WebCore::PrintContext::pageProperty): Use String::number instead of
+        String::numberToStringFixedPrecision. Also removed some uses of
+        FormattedNumber::fixedPrecision.
+        * platform/graphics/FloatPolygon.cpp:
+        (WebCore::FloatPolygonEdge::debugString const): Ditto.
+
 2019-06-16  Darin Adler  <darin@apple.com>
 

trunk/Source/WebCore/Modules/indexeddb/IDBKeyData.cpp

@@ -365 +365 @@
         break;
     case IndexedDB::KeyType::Date:
-        return makeString("<date> - ", FormattedNumber::fixedWidth(WTF::get<double>(m_value), 6));
-    case IndexedDB::KeyType::Number:
-        return makeString("<number> - ", FormattedNumber::fixedWidth(WTF::get<double>(m_value), 6));
+        return makeString("<date> - ", WTF::get<double>(m_value));
+    case IndexedDB::KeyType::Number:
+        return makeString("<number> - ", WTF::get<double>(m_value));
     case IndexedDB::KeyType::Max:
         return "<maximum>"_s;

trunk/Source/WebCore/page/History.cpp

@@ -227 +227 @@
     if (mainHistory.m_currentStateObjectTimeSpanObjectsAdded >= perStateObjectTimeSpanLimit) {
         if (stateObjectType == StateObjectType::Replace)
-            return Exception { SecurityError, makeString("Attempt to use history.replaceState() more than ", perStateObjectTimeSpanLimit, " times per ", FormattedNumber::fixedWidth(stateObjectTimeSpan.seconds(), 6), " seconds") };
-        return Exception { SecurityError, makeString("Attempt to use history.pushState() more than ", perStateObjectTimeSpanLimit, " times per ", FormattedNumber::fixedWidth(stateObjectTimeSpan.seconds(), 6), " seconds") };
+            return Exception { SecurityError, makeString("Attempt to use history.replaceState() more than ", perStateObjectTimeSpanLimit, " times per ", stateObjectTimeSpan.seconds(), " seconds") };
+        return Exception { SecurityError, makeString("Attempt to use history.pushState() more than ", perStateObjectTimeSpanLimit, " times per ", stateObjectTimeSpan.seconds(), " seconds") };
     }
 

trunk/Source/WebCore/page/PrintContext.cpp

@@ -358 +358 @@
         if (style->marginLeft().isAuto())
             return "auto"_s;
-        return String::numberToStringFixedPrecision(style->marginLeft().value());
+        return String::number(style->marginLeft().value());
     }
     if (!strcmp(propertyName, "line-height"))
-        return String::numberToStringFixedPrecision(style->lineHeight().value());
+        return String::number(style->lineHeight().value());
     if (!strcmp(propertyName, "font-size"))
         return String::number(style->fontDescription().computedPixelSize());
@@ -367 +367 @@
         return style->fontDescription().firstFamily();
     if (!strcmp(propertyName, "size"))
-        return makeString(FormattedNumber::fixedPrecision(style->pageSize().width.value()), ' ', FormattedNumber::fixedPrecision(style->pageSize().height.value()));
+        return makeString(style->pageSize().width.value(), ' ', style->pageSize().height.value());
 
     return makeString("pageProperty() unimplemented for: ", propertyName);

trunk/Source/WebCore/platform/graphics/FloatPolygon.cpp

@@ -260 +260 @@
 String FloatPolygonEdge::debugString() const
 {
-    return makeString("0x", hex(reinterpret_cast<uintptr_t>(this)), " (", FormattedNumber::fixedPrecision(vertex1().x()), ',', FormattedNumber::fixedPrecision(vertex1().y()), ' ', FormattedNumber::fixedPrecision(vertex2().x()), ',', FormattedNumber::fixedPrecision(vertex2().y()), ')');
+    return makeString("0x", hex(reinterpret_cast<uintptr_t>(this)), " (", vertex1().x(), ',', vertex1().y(), ' ', vertex2().x(), ',', vertex2().y(), ')');
 }