From 72fe435e80807c91dbf8edc41d5bf3ec3c9bd9e4 Mon Sep 17 00:00:00 2001
From: Dan Sinclair <dsinclair@chromium.org>
Date: Thu, 4 Jan 2018 10:05:36 -0500
Subject: Remove CXFA_DataData

This CL removes the CXFA_DataData base class and the functionality is
moved to where it's needed.

Change-Id: Ieba31aa924b9b513466144b31f0e1613923c50aa
Reviewed-on: https://pdfium-review.googlesource.com/22250
Reviewed-by: Ryan Harrison <rharrison@chromium.org>
Commit-Queue: dsinclair <dsinclair@chromium.org>
---
 xfa/fxfa/parser/cxfa_fill.cpp | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

(limited to 'xfa/fxfa/parser/cxfa_fill.cpp')

diff --git a/xfa/fxfa/parser/cxfa_fill.cpp b/xfa/fxfa/parser/cxfa_fill.cpp
index e4bde509c9..f5138d5e2e 100644
--- a/xfa/fxfa/parser/cxfa_fill.cpp
+++ b/xfa/fxfa/parser/cxfa_fill.cpp
@@ -77,7 +77,7 @@ FX_ARGB CXFA_Fill::GetColor(bool bText) {
     pdfium::Optional<WideString> wsColor =
         pNode->JSObject()->TryCData(XFA_Attribute::Value, false);
     if (wsColor)
-      return CXFA_DataData::ToColor(wsColor->AsStringView());
+      return StringToFXARGB(wsColor->AsStringView());
   }
   if (bText)
     return 0xFF000000;
@@ -106,7 +106,7 @@ FX_ARGB CXFA_Fill::GetPatternColor() {
     pdfium::Optional<WideString> wsColor =
         pColor->JSObject()->TryCData(XFA_Attribute::Value, false);
     if (wsColor)
-      return CXFA_DataData::ToColor(wsColor->AsStringView());
+      return StringToFXARGB(wsColor->AsStringView());
   }
   return 0xFF000000;
 }
@@ -124,7 +124,7 @@ FX_ARGB CXFA_Fill::GetStippleColor() {
     pdfium::Optional<WideString> wsColor =
         pColor->JSObject()->TryCData(XFA_Attribute::Value, false);
     if (wsColor)
-      return CXFA_DataData::ToColor(wsColor->AsStringView());
+      return StringToFXARGB(wsColor->AsStringView());
   }
   return 0xFF000000;
 }
@@ -142,7 +142,7 @@ FX_ARGB CXFA_Fill::GetLinearColor() {
     pdfium::Optional<WideString> wsColor =
         pColor->JSObject()->TryCData(XFA_Attribute::Value, false);
     if (wsColor)
-      return CXFA_DataData::ToColor(wsColor->AsStringView());
+      return StringToFXARGB(wsColor->AsStringView());
   }
   return 0xFF000000;
 }
@@ -160,7 +160,7 @@ FX_ARGB CXFA_Fill::GetRadialColor() {
     pdfium::Optional<WideString> wsColor =
         pColor->JSObject()->TryCData(XFA_Attribute::Value, false);
     if (wsColor)
-      return CXFA_DataData::ToColor(wsColor->AsStringView());
+      return StringToFXARGB(wsColor->AsStringView());
   }
   return 0xFF000000;
 }
-- 
cgit v1.2.3