Clean up CSS property table

Reorganizes the free functions to be static methods on a
class. Converts the Table struct to be an Entry struct defined in the
class.

Change-Id: I9eca0dfb15187af10cbe2dc4b4c2756d55d957be
Reviewed-on: https://pdfium-review.googlesource.com/24712
Commit-Queue: Ryan Harrison <rharrison@chromium.org>
Reviewed-by: dsinclair <dsinclair@chromium.org>

1 files changed, 7 insertions, 7 deletions

diff --git a/core/fxcrt/css/cfx_cssstylesheet.cpp b/core/fxcrt/css/cfx_cssstylesheet.cpp
index 183765f3b0..01c68fce7d 100644
--- a/core/fxcrt/css/cfx_cssstylesheet.cpp
+++ b/core/fxcrt/css/cfx_cssstylesheet.cpp
@@ -8,8 +8,8 @@
 
 #include <utility>
 
-#include "core/fxcrt/css/cfx_cssdatatable.h"
 #include "core/fxcrt/css/cfx_cssdeclaration.h"
+#include "core/fxcrt/css/cfx_csspropertytable.h"
 #include "core/fxcrt/css/cfx_cssstylerule.h"
 #include "core/fxcrt/fx_codepage.h"
 #include "third_party/base/ptr_util.h"
@@ -62,7 +62,7 @@ CFX_CSSSyntaxStatus CFX_CSSStyleSheet::LoadStyleRule(
 
   CFX_CSSStyleRule* pStyleRule = nullptr;
   int32_t iValueLen = 0;
-  const CFX_CSSPropertyTable* propertyTable = nullptr;
+  const CFX_CSSPropertyTable::Entry* entry = nullptr;
   WideString wsName;
   while (1) {
     switch (pSyntax->DoSyntaxParse()) {
@@ -75,18 +75,18 @@ CFX_CSSSyntaxStatus CFX_CSSStyleSheet::LoadStyleRule(
       }
       case CFX_CSSSyntaxStatus::PropertyName: {
         WideStringView strValue = pSyntax->GetCurrentString();
-        propertyTable = CFX_GetCSSPropertyByName(strValue);
-        if (!propertyTable)
+        entry = CFX_CSSPropertyTable::GetByName(strValue);
+        if (!entry)
           wsName = WideString(strValue);
         break;
       }
       case CFX_CSSSyntaxStatus::PropertyValue: {
-        if (propertyTable || iValueLen > 0) {
+        if (entry || iValueLen > 0) {
           WideStringView strValue = pSyntax->GetCurrentString();
           auto* decl = pStyleRule->GetDeclaration();
           if (!strValue.IsEmpty()) {
-            if (propertyTable) {
-              decl->AddProperty(propertyTable, strValue);
+            if (entry) {
+              decl->AddProperty(entry, strValue);
             } else {
               decl->AddProperty(wsName, WideString(strValue));
             }