Title: [293062] trunk/Source/WebCore
- Revision
- 293062
- Author
- [email protected]
- Date
- 2022-04-19 22:31:33 -0700 (Tue, 19 Apr 2022)
Log Message
Remove unnecessary String allocations in CSSPrimitiveValue::unitTypeString
https://bugs.webkit.org/show_bug.cgi?id=239529
Patch by Alex Christensen <[email protected]> on 2022-04-19
Reviewed by Chris Dumez.
* css/CSSPrimitiveValue.cpp:
(WebCore::CSSPrimitiveValue::unitTypeString):
* css/CSSPrimitiveValue.h:
* css/typedom/CSSUnitValue.cpp:
(WebCore::CSSUnitValue::unit const):
(WebCore::CSSUnitValue::unitSerialization const):
* css/typedom/CSSUnitValue.h:
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (293061 => 293062)
--- trunk/Source/WebCore/ChangeLog 2022-04-20 05:16:07 UTC (rev 293061)
+++ trunk/Source/WebCore/ChangeLog 2022-04-20 05:31:33 UTC (rev 293062)
@@ -1,3 +1,18 @@
+2022-04-19 Alex Christensen <[email protected]>
+
+ Remove unnecessary String allocations in CSSPrimitiveValue::unitTypeString
+ https://bugs.webkit.org/show_bug.cgi?id=239529
+
+ Reviewed by Chris Dumez.
+
+ * css/CSSPrimitiveValue.cpp:
+ (WebCore::CSSPrimitiveValue::unitTypeString):
+ * css/CSSPrimitiveValue.h:
+ * css/typedom/CSSUnitValue.cpp:
+ (WebCore::CSSUnitValue::unit const):
+ (WebCore::CSSUnitValue::unitSerialization const):
+ * css/typedom/CSSUnitValue.h:
+
2022-04-19 Ben Nham <[email protected]>
Handle public token updates in webpushd
Modified: trunk/Source/WebCore/css/CSSPrimitiveValue.cpp (293061 => 293062)
--- trunk/Source/WebCore/css/CSSPrimitiveValue.cpp 2022-04-20 05:16:07 UTC (rev 293061)
+++ trunk/Source/WebCore/css/CSSPrimitiveValue.cpp 2022-04-20 05:31:33 UTC (rev 293062)
@@ -1239,8 +1239,7 @@
return makeString(m_value.num, suffix);
}
-// FIXME: Should return const char*.
-String CSSPrimitiveValue::unitTypeString(CSSUnitType unitType)
+ASCIILiteral CSSPrimitiveValue::unitTypeString(CSSUnitType unitType)
{
switch (unitType) {
case CSSUnitType::CSS_PERCENTAGE: return "%"_s;
@@ -1326,10 +1325,10 @@
case CSSUnitType::CSS_PROPERTY_ID:
case CSSUnitType::CSS_VALUE_ID:
case CSSUnitType::CSS_QUIRKY_EMS:
- return emptyString();
+ return ""_s;
}
ASSERT_NOT_REACHED();
- return emptyString();
+ return ""_s;
}
ALWAYS_INLINE String CSSPrimitiveValue::formatNumberForCustomCSSText() const
Modified: trunk/Source/WebCore/css/CSSPrimitiveValue.h (293061 => 293062)
--- trunk/Source/WebCore/css/CSSPrimitiveValue.h 2022-04-20 05:16:07 UTC (rev 293061)
+++ trunk/Source/WebCore/css/CSSPrimitiveValue.h 2022-04-20 05:31:33 UTC (rev 293062)
@@ -195,7 +195,7 @@
bool equals(const CSSPrimitiveValue&) const;
static std::optional<double> conversionToCanonicalUnitsScaleFactor(CSSUnitType);
- static String unitTypeString(CSSUnitType);
+ static ASCIILiteral unitTypeString(CSSUnitType);
static double computeUnzoomedNonCalcLengthDouble(CSSUnitType, double value, CSSPropertyID, const FontMetrics* = nullptr, const FontCascadeDescription* = nullptr, const FontCascadeDescription* rootFontDescription = nullptr, const RenderView* = nullptr);
static double computeNonCalcLengthDouble(const CSSToLengthConversionData&, CSSUnitType, double value);
Modified: trunk/Source/WebCore/css/typedom/CSSUnitValue.cpp (293061 => 293062)
--- trunk/Source/WebCore/css/typedom/CSSUnitValue.cpp 2022-04-20 05:16:07 UTC (rev 293061)
+++ trunk/Source/WebCore/css/typedom/CSSUnitValue.cpp 2022-04-20 05:31:33 UTC (rev 293062)
@@ -93,7 +93,7 @@
return CSSParserToken::stringToUnitType(unit);
}
-String CSSUnitValue::unit() const
+ASCIILiteral CSSUnitValue::unit() const
{
switch (m_unit) {
case CSSUnitType::CSS_NUMBER:
@@ -106,7 +106,7 @@
return unitSerialization();
}
-String CSSUnitValue::unitSerialization() const
+ASCIILiteral CSSUnitValue::unitSerialization() const
{
return CSSPrimitiveValue::unitTypeString(m_unit);
}
Modified: trunk/Source/WebCore/css/typedom/CSSUnitValue.h (293061 => 293062)
--- trunk/Source/WebCore/css/typedom/CSSUnitValue.h 2022-04-20 05:16:07 UTC (rev 293061)
+++ trunk/Source/WebCore/css/typedom/CSSUnitValue.h 2022-04-20 05:31:33 UTC (rev 293062)
@@ -46,8 +46,8 @@
double value() const { return m_value; }
void setValue(double value) { m_value = value; }
- String unit() const;
- String unitSerialization() const;
+ ASCIILiteral unit() const;
+ ASCIILiteral unitSerialization() const;
CSSUnitType unitEnum() const { return m_unit; }
private:
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
