Make the unused string literals in cfx_cssdata.cpp be narrow
Another case where these are already excluded by a macro, but
as long as we are not using them, we might as well not use
narrow literals.
Change-Id: I1f799d32006dd89bbd3268063f1b458417966a87
Reviewed-on: https://pdfium-review.googlesource.com/c/46230
Commit-Queue: Tom Sepez <tsepez@chromium.org>
Reviewed-by: Lei Zhang <thestig@chromium.org>
diff --git a/core/fxcrt/css/cfx_cssdata.cpp b/core/fxcrt/css/cfx_cssdata.cpp
index 3ee9459..cfef220 100644
--- a/core/fxcrt/css/cfx_cssdata.cpp
+++ b/core/fxcrt/css/cfx_cssdata.cpp
@@ -21,183 +21,183 @@
const CFX_CSSData::Property propertyTable[] = {
{PROP(CFX_CSSProperty::BorderLeft,
- L"border-left",
+ "border-left",
0x04080036,
CFX_CSSVALUETYPE_Shorthand)},
{PROP(CFX_CSSProperty::Top,
- L"top",
+ "top",
0x0BEDAF33,
CFX_CSSVALUETYPE_Primitive | CFX_CSSVALUETYPE_MaybeEnum |
CFX_CSSVALUETYPE_MaybeNumber)},
{PROP(CFX_CSSProperty::Margin,
- L"margin",
+ "margin",
0x0CB016BE,
CFX_CSSVALUETYPE_List | CFX_CSSVALUETYPE_MaybeEnum |
CFX_CSSVALUETYPE_MaybeNumber)},
{PROP(CFX_CSSProperty::TextIndent,
- L"text-indent",
+ "text-indent",
0x169ADB74,
CFX_CSSVALUETYPE_Primitive | CFX_CSSVALUETYPE_MaybeNumber)},
{PROP(CFX_CSSProperty::Right,
- L"right",
+ "right",
0x193ADE3E,
CFX_CSSVALUETYPE_Primitive | CFX_CSSVALUETYPE_MaybeEnum |
CFX_CSSVALUETYPE_MaybeNumber)},
{PROP(CFX_CSSProperty::PaddingLeft,
- L"padding-left",
+ "padding-left",
0x228CF02F,
CFX_CSSVALUETYPE_Primitive | CFX_CSSVALUETYPE_MaybeNumber)},
{PROP(CFX_CSSProperty::MarginLeft,
- L"margin-left",
+ "margin-left",
0x297C5656,
CFX_CSSVALUETYPE_Primitive | CFX_CSSVALUETYPE_MaybeNumber |
CFX_CSSVALUETYPE_MaybeEnum)},
{PROP(CFX_CSSProperty::Border,
- L"border",
+ "border",
0x2A23349E,
CFX_CSSVALUETYPE_Shorthand)},
{PROP(CFX_CSSProperty::BorderTop,
- L"border-top",
+ "border-top",
0x2B866ADE,
CFX_CSSVALUETYPE_Shorthand)},
{PROP(CFX_CSSProperty::Bottom,
- L"bottom",
+ "bottom",
0x399F02B5,
CFX_CSSVALUETYPE_Primitive | CFX_CSSVALUETYPE_MaybeEnum |
CFX_CSSVALUETYPE_MaybeNumber)},
{PROP(CFX_CSSProperty::PaddingRight,
- L"padding-right",
+ "padding-right",
0x3F616AC2,
CFX_CSSVALUETYPE_Primitive | CFX_CSSVALUETYPE_MaybeNumber)},
{PROP(CFX_CSSProperty::BorderBottom,
- L"border-bottom",
+ "border-bottom",
0x452CE780,
CFX_CSSVALUETYPE_Shorthand)},
{PROP(CFX_CSSProperty::FontFamily,
- L"font-family",
+ "font-family",
0x574686E6,
CFX_CSSVALUETYPE_List | CFX_CSSVALUETYPE_MaybeString)},
{PROP(CFX_CSSProperty::FontWeight,
- L"font-weight",
+ "font-weight",
0x6692F60C,
CFX_CSSVALUETYPE_Primitive | CFX_CSSVALUETYPE_MaybeEnum |
CFX_CSSVALUETYPE_MaybeNumber)},
{PROP(CFX_CSSProperty::Color,
- L"color",
+ "color",
0x6E67921F,
CFX_CSSVALUETYPE_Primitive | CFX_CSSVALUETYPE_MaybeEnum |
CFX_CSSVALUETYPE_MaybeColor)},
{PROP(CFX_CSSProperty::LetterSpacing,
- L"letter-spacing",
+ "letter-spacing",
0x70536102,
CFX_CSSVALUETYPE_Primitive | CFX_CSSVALUETYPE_MaybeEnum |
CFX_CSSVALUETYPE_MaybeNumber)},
{PROP(CFX_CSSProperty::TextAlign,
- L"text-align",
+ "text-align",
0x7553F1BD,
CFX_CSSVALUETYPE_Primitive | CFX_CSSVALUETYPE_MaybeEnum)},
{PROP(CFX_CSSProperty::BorderRightWidth,
- L"border-right-width",
+ "border-right-width",
0x8F5A6036,
CFX_CSSVALUETYPE_Primitive | CFX_CSSVALUETYPE_MaybeEnum |
CFX_CSSVALUETYPE_MaybeNumber)},
{PROP(CFX_CSSProperty::VerticalAlign,
- L"vertical-align",
+ "vertical-align",
0x934A87D2,
CFX_CSSVALUETYPE_Primitive | CFX_CSSVALUETYPE_MaybeEnum |
CFX_CSSVALUETYPE_MaybeNumber)},
{PROP(CFX_CSSProperty::PaddingTop,
- L"padding-top",
+ "padding-top",
0x959D22B7,
CFX_CSSVALUETYPE_Primitive | CFX_CSSVALUETYPE_MaybeNumber)},
{PROP(CFX_CSSProperty::FontVariant,
- L"font-variant",
+ "font-variant",
0x9C785779,
CFX_CSSVALUETYPE_Primitive | CFX_CSSVALUETYPE_MaybeEnum)},
{PROP(CFX_CSSProperty::BorderWidth,
- L"border-width",
+ "border-width",
0xA8DE4FEB,
CFX_CSSVALUETYPE_List | CFX_CSSVALUETYPE_MaybeEnum |
CFX_CSSVALUETYPE_MaybeNumber)},
{PROP(CFX_CSSProperty::BorderBottomWidth,
- L"border-bottom-width",
+ "border-bottom-width",
0xAE41204D,
CFX_CSSVALUETYPE_Primitive | CFX_CSSVALUETYPE_MaybeEnum |
CFX_CSSVALUETYPE_MaybeNumber)},
{PROP(CFX_CSSProperty::BorderRight,
- L"border-right",
+ "border-right",
0xB78E9EA9,
CFX_CSSVALUETYPE_Shorthand)},
{PROP(CFX_CSSProperty::FontSize,
- L"font-size",
+ "font-size",
0xB93956DF,
CFX_CSSVALUETYPE_Primitive | CFX_CSSVALUETYPE_MaybeEnum |
CFX_CSSVALUETYPE_MaybeNumber)},
{PROP(CFX_CSSProperty::BorderSpacing,
- L"border-spacing",
+ "border-spacing",
0xC72030F0,
CFX_CSSVALUETYPE_List | CFX_CSSVALUETYPE_MaybeNumber)},
{PROP(CFX_CSSProperty::FontStyle,
- L"font-style",
+ "font-style",
0xCB1950F5,
CFX_CSSVALUETYPE_Primitive | CFX_CSSVALUETYPE_MaybeEnum)},
{PROP(CFX_CSSProperty::Font,
- L"font",
+ "font",
0xCD308B77,
CFX_CSSVALUETYPE_Shorthand)},
{PROP(CFX_CSSProperty::LineHeight,
- L"line-height",
+ "line-height",
0xCFCACE2E,
CFX_CSSVALUETYPE_Primitive | CFX_CSSVALUETYPE_MaybeEnum |
CFX_CSSVALUETYPE_MaybeNumber)},
{PROP(CFX_CSSProperty::MarginRight,
- L"margin-right",
+ "margin-right",
0xD13C58C9,
CFX_CSSVALUETYPE_Primitive | CFX_CSSVALUETYPE_MaybeNumber |
CFX_CSSVALUETYPE_MaybeEnum)},
{PROP(CFX_CSSProperty::BorderLeftWidth,
- L"border-left-width",
+ "border-left-width",
0xD1E93D83,
CFX_CSSVALUETYPE_Primitive | CFX_CSSVALUETYPE_MaybeEnum |
CFX_CSSVALUETYPE_MaybeNumber)},
{PROP(CFX_CSSProperty::Display,
- L"display",
+ "display",
0xD4224C36,
CFX_CSSVALUETYPE_Primitive | CFX_CSSVALUETYPE_MaybeEnum)},
{PROP(CFX_CSSProperty::PaddingBottom,
- L"padding-bottom",
+ "padding-bottom",
0xE555B3B9,
CFX_CSSVALUETYPE_Primitive | CFX_CSSVALUETYPE_MaybeNumber)},
{PROP(CFX_CSSProperty::BorderTopWidth,
- L"border-top-width",
+ "border-top-width",
0xED2CB62B,
CFX_CSSVALUETYPE_Primitive | CFX_CSSVALUETYPE_MaybeEnum |
CFX_CSSVALUETYPE_MaybeNumber)},
{PROP(CFX_CSSProperty::WordSpacing,
- L"word-spacing",
+ "word-spacing",
0xEDA63BAE,
CFX_CSSVALUETYPE_Primitive | CFX_CSSVALUETYPE_MaybeEnum |
CFX_CSSVALUETYPE_MaybeNumber)},
{PROP(CFX_CSSProperty::Left,
- L"left",
+ "left",
0xF5AD782B,
CFX_CSSVALUETYPE_Primitive | CFX_CSSVALUETYPE_MaybeEnum |
CFX_CSSVALUETYPE_MaybeNumber)},
{PROP(CFX_CSSProperty::TextDecoration,
- L"text-decoration",
+ "text-decoration",
0xF7C634BA,
CFX_CSSVALUETYPE_List | CFX_CSSVALUETYPE_MaybeEnum)},
{PROP(CFX_CSSProperty::Padding,
- L"padding",
+ "padding",
0xF8C373F7,
CFX_CSSVALUETYPE_List | CFX_CSSVALUETYPE_MaybeNumber)},
{PROP(CFX_CSSProperty::MarginBottom,
- L"margin-bottom",
+ "margin-bottom",
0xF93485A0,
CFX_CSSVALUETYPE_Primitive | CFX_CSSVALUETYPE_MaybeNumber |
CFX_CSSVALUETYPE_MaybeEnum)},
{PROP(CFX_CSSProperty::MarginTop,
- L"margin-top",
+ "margin-top",
0xFE51DCFE,
CFX_CSSVALUETYPE_Primitive | CFX_CSSVALUETYPE_MaybeNumber |
CFX_CSSVALUETYPE_MaybeEnum)},
@@ -209,50 +209,50 @@
#define PVAL(a, b, c) a, c
const CFX_CSSData::PropertyValue propertyValueTable[] = {
- {PVAL(CFX_CSSPropertyValue::Bolder, L"bolder", 0x009F1058)},
- {PVAL(CFX_CSSPropertyValue::None, L"none", 0x048B6670)},
- {PVAL(CFX_CSSPropertyValue::Dot, L"dot", 0x0A48CB27)},
- {PVAL(CFX_CSSPropertyValue::Sub, L"sub", 0x0BD37FAA)},
- {PVAL(CFX_CSSPropertyValue::Top, L"top", 0x0BEDAF33)},
- {PVAL(CFX_CSSPropertyValue::Right, L"right", 0x193ADE3E)},
- {PVAL(CFX_CSSPropertyValue::Normal, L"normal", 0x247CF3E9)},
- {PVAL(CFX_CSSPropertyValue::Auto, L"auto", 0x2B35B6D9)},
- {PVAL(CFX_CSSPropertyValue::Text, L"text", 0x2D08AF85)},
- {PVAL(CFX_CSSPropertyValue::XSmall, L"x-small", 0x2D2FCAFE)},
- {PVAL(CFX_CSSPropertyValue::Thin, L"thin", 0x2D574D53)},
- {PVAL(CFX_CSSPropertyValue::Small, L"small", 0x316A3739)},
- {PVAL(CFX_CSSPropertyValue::Bottom, L"bottom", 0x399F02B5)},
- {PVAL(CFX_CSSPropertyValue::Underline, L"underline", 0x3A0273A6)},
- {PVAL(CFX_CSSPropertyValue::Double, L"double", 0x3D98515B)},
- {PVAL(CFX_CSSPropertyValue::Lighter, L"lighter", 0x45BEB7AF)},
- {PVAL(CFX_CSSPropertyValue::Oblique, L"oblique", 0x53EBDDB1)},
- {PVAL(CFX_CSSPropertyValue::Super, L"super", 0x6A4F842F)},
- {PVAL(CFX_CSSPropertyValue::Center, L"center", 0x6C51AFC1)},
- {PVAL(CFX_CSSPropertyValue::XxLarge, L"xx-large", 0x70BB1508)},
- {PVAL(CFX_CSSPropertyValue::Smaller, L"smaller", 0x849769F0)},
- {PVAL(CFX_CSSPropertyValue::Baseline, L"baseline", 0x87436BA3)},
- {PVAL(CFX_CSSPropertyValue::Thick, L"thick", 0x8CC35EB3)},
- {PVAL(CFX_CSSPropertyValue::Justify, L"justify", 0x8D269CAE)},
- {PVAL(CFX_CSSPropertyValue::Middle, L"middle", 0x947FA00F)},
- {PVAL(CFX_CSSPropertyValue::Medium, L"medium", 0xA084A381)},
- {PVAL(CFX_CSSPropertyValue::ListItem, L"list-item", 0xA32382B8)},
- {PVAL(CFX_CSSPropertyValue::XxSmall, L"xx-small", 0xADE1FC76)},
- {PVAL(CFX_CSSPropertyValue::Bold, L"bold", 0xB18313A1)},
- {PVAL(CFX_CSSPropertyValue::SmallCaps, L"small-caps", 0xB299428D)},
- {PVAL(CFX_CSSPropertyValue::Inline, L"inline", 0xC02D649F)},
- {PVAL(CFX_CSSPropertyValue::Overline, L"overline", 0xC0EC9FA4)},
- {PVAL(CFX_CSSPropertyValue::TextBottom, L"text-bottom", 0xC7D08D87)},
- {PVAL(CFX_CSSPropertyValue::Larger, L"larger", 0xCD3C409D)},
- {PVAL(CFX_CSSPropertyValue::InlineTable, L"inline-table", 0xD131F494)},
- {PVAL(CFX_CSSPropertyValue::InlineBlock, L"inline-block", 0xD26A8BD7)},
- {PVAL(CFX_CSSPropertyValue::Blink, L"blink", 0xDC36E390)},
- {PVAL(CFX_CSSPropertyValue::Block, L"block", 0xDCD480AB)},
- {PVAL(CFX_CSSPropertyValue::Italic, L"italic", 0xE31D5396)},
- {PVAL(CFX_CSSPropertyValue::LineThrough, L"line-through", 0xE4C5A276)},
- {PVAL(CFX_CSSPropertyValue::XLarge, L"x-large", 0xF008E390)},
- {PVAL(CFX_CSSPropertyValue::Large, L"large", 0xF4434FCB)},
- {PVAL(CFX_CSSPropertyValue::Left, L"left", 0xF5AD782B)},
- {PVAL(CFX_CSSPropertyValue::TextTop, L"text-top", 0xFCB58D45)},
+ {PVAL(CFX_CSSPropertyValue::Bolder, "bolder", 0x009F1058)},
+ {PVAL(CFX_CSSPropertyValue::None, "none", 0x048B6670)},
+ {PVAL(CFX_CSSPropertyValue::Dot, "dot", 0x0A48CB27)},
+ {PVAL(CFX_CSSPropertyValue::Sub, "sub", 0x0BD37FAA)},
+ {PVAL(CFX_CSSPropertyValue::Top, "top", 0x0BEDAF33)},
+ {PVAL(CFX_CSSPropertyValue::Right, "right", 0x193ADE3E)},
+ {PVAL(CFX_CSSPropertyValue::Normal, "normal", 0x247CF3E9)},
+ {PVAL(CFX_CSSPropertyValue::Auto, "auto", 0x2B35B6D9)},
+ {PVAL(CFX_CSSPropertyValue::Text, "text", 0x2D08AF85)},
+ {PVAL(CFX_CSSPropertyValue::XSmall, "x-small", 0x2D2FCAFE)},
+ {PVAL(CFX_CSSPropertyValue::Thin, "thin", 0x2D574D53)},
+ {PVAL(CFX_CSSPropertyValue::Small, "small", 0x316A3739)},
+ {PVAL(CFX_CSSPropertyValue::Bottom, "bottom", 0x399F02B5)},
+ {PVAL(CFX_CSSPropertyValue::Underline, "underline", 0x3A0273A6)},
+ {PVAL(CFX_CSSPropertyValue::Double, "double", 0x3D98515B)},
+ {PVAL(CFX_CSSPropertyValue::Lighter, "lighter", 0x45BEB7AF)},
+ {PVAL(CFX_CSSPropertyValue::Oblique, "oblique", 0x53EBDDB1)},
+ {PVAL(CFX_CSSPropertyValue::Super, "super", 0x6A4F842F)},
+ {PVAL(CFX_CSSPropertyValue::Center, "center", 0x6C51AFC1)},
+ {PVAL(CFX_CSSPropertyValue::XxLarge, "xx-large", 0x70BB1508)},
+ {PVAL(CFX_CSSPropertyValue::Smaller, "smaller", 0x849769F0)},
+ {PVAL(CFX_CSSPropertyValue::Baseline, "baseline", 0x87436BA3)},
+ {PVAL(CFX_CSSPropertyValue::Thick, "thick", 0x8CC35EB3)},
+ {PVAL(CFX_CSSPropertyValue::Justify, "justify", 0x8D269CAE)},
+ {PVAL(CFX_CSSPropertyValue::Middle, "middle", 0x947FA00F)},
+ {PVAL(CFX_CSSPropertyValue::Medium, "medium", 0xA084A381)},
+ {PVAL(CFX_CSSPropertyValue::ListItem, "list-item", 0xA32382B8)},
+ {PVAL(CFX_CSSPropertyValue::XxSmall, "xx-small", 0xADE1FC76)},
+ {PVAL(CFX_CSSPropertyValue::Bold, "bold", 0xB18313A1)},
+ {PVAL(CFX_CSSPropertyValue::SmallCaps, "small-caps", 0xB299428D)},
+ {PVAL(CFX_CSSPropertyValue::Inline, "inline", 0xC02D649F)},
+ {PVAL(CFX_CSSPropertyValue::Overline, "overline", 0xC0EC9FA4)},
+ {PVAL(CFX_CSSPropertyValue::TextBottom, "text-bottom", 0xC7D08D87)},
+ {PVAL(CFX_CSSPropertyValue::Larger, "larger", 0xCD3C409D)},
+ {PVAL(CFX_CSSPropertyValue::InlineTable, "inline-table", 0xD131F494)},
+ {PVAL(CFX_CSSPropertyValue::InlineBlock, "inline-block", 0xD26A8BD7)},
+ {PVAL(CFX_CSSPropertyValue::Blink, "blink", 0xDC36E390)},
+ {PVAL(CFX_CSSPropertyValue::Block, "block", 0xDCD480AB)},
+ {PVAL(CFX_CSSPropertyValue::Italic, "italic", 0xE31D5396)},
+ {PVAL(CFX_CSSPropertyValue::LineThrough, "line-through", 0xE4C5A276)},
+ {PVAL(CFX_CSSPropertyValue::XLarge, "x-large", 0xF008E390)},
+ {PVAL(CFX_CSSPropertyValue::Large, "large", 0xF4434FCB)},
+ {PVAL(CFX_CSSPropertyValue::Left, "left", 0xF5AD782B)},
+ {PVAL(CFX_CSSPropertyValue::TextTop, "text-top", 0xFCB58D45)},
};
#undef PVAL
diff --git a/core/fxcrt/css/cfx_cssdata.h b/core/fxcrt/css/cfx_cssdata.h
index b0592d6..8fa2488 100644
--- a/core/fxcrt/css/cfx_cssdata.h
+++ b/core/fxcrt/css/cfx_cssdata.h
@@ -17,13 +17,13 @@
public:
struct Property {
CFX_CSSProperty eName;
- uint32_t dwHash;
+ uint32_t dwHash; // Hashed as wide string.
uint32_t dwType;
};
struct PropertyValue {
CFX_CSSPropertyValue eName;
- uint32_t dwHash;
+ uint32_t dwHash; // Hashed as wide string.
};
struct LengthUnit {
