Convert CFX_CSSPropertyTable to CFX_CSSData

This converts the existing class naming and references. The ::Entry
struct is converted to ::Property. The GetBy* methods are renamed to
GetPropertyBy*.

Free functions from other parts of the CSS code base are merged into
the class. GetCSSPropertyValueByName becomes ::GetPropertyValueByName
with a return value of ::PropertyValue*. GetCSSLengthUnitByName
becomes ::GetLengthUnitByName with a return value of
::LengthUnit*. GetCSSColorByName becomes ::GetColorByName with a
return value of ::Color*.

BUG=pdfium:998

Change-Id: I5b78c69d0fe53ad714ac3545cfdda8c26b95e4d5
Reviewed-on: https://pdfium-review.googlesource.com/25010
Reviewed-by: dsinclair <dsinclair@chromium.org>
Reviewed-by: Henrique Nakashima <hnakashima@chromium.org>
Commit-Queue: Ryan Harrison <rharrison@chromium.org>

1 files changed, 7 insertions, 7 deletions

diff --git a/core/fxcrt/css/cfx_cssstyleselector.cpp b/core/fxcrt/css/cfx_cssstyleselector.cpp
index f079a35f59..4a47798d31 100644
--- a/core/fxcrt/css/cfx_cssstyleselector.cpp
+++ b/core/fxcrt/css/cfx_cssstyleselector.cpp
@@ -91,7 +91,7 @@ void CFX_CSSStyleSelector::ComputeStyle(
       AppendInlineStyle(pDecl.get(), styleString);
     if (!alignString.IsEmpty()) {
       pDecl->AddProperty(
-          CFX_CSSPropertyTable::GetByEnum(CFX_CSSProperty::TextAlign),
+          CFX_CSSData::GetPropertyByEnum(CFX_CSSProperty::TextAlign),
           alignString.AsStringView());
     }
   }
@@ -144,21 +144,21 @@ void CFX_CSSStyleSelector::AppendInlineStyle(CFX_CSSDeclaration* pDecl,
   auto pSyntax = pdfium::MakeUnique<CFX_CSSSyntaxParser>(
       style.c_str(), style.GetLength(), 32, true);
   int32_t iLen2 = 0;
-  const CFX_CSSPropertyTable::Entry* entry = nullptr;
+  const CFX_CSSData::Property* property = nullptr;
   WideString wsName;
   while (1) {
     CFX_CSSSyntaxStatus eStatus = pSyntax->DoSyntaxParse();
     if (eStatus == CFX_CSSSyntaxStatus::PropertyName) {
       WideStringView strValue = pSyntax->GetCurrentString();
-      entry = CFX_CSSPropertyTable::GetByName(strValue);
-      if (!entry)
+      property = CFX_CSSData::GetPropertyByName(strValue);
+      if (!property)
         wsName = WideString(strValue);
     } else if (eStatus == CFX_CSSSyntaxStatus::PropertyValue) {
-      if (entry || iLen2 > 0) {
+      if (property || iLen2 > 0) {
         WideStringView strValue = pSyntax->GetCurrentString();
         if (!strValue.IsEmpty()) {
-          if (entry)
-            pDecl->AddProperty(entry, strValue);
+          if (property)
+            pDecl->AddProperty(property, strValue);
           else if (iLen2 > 0)
             pDecl->AddProperty(wsName, WideString(strValue));
         }