diff options
| author | Dan Sinclair <dsinclair@chromium.org> | 2018-01-04 10:05:36 -0500 |
|---|---|---|
| committer | Chromium commit bot <commit-bot@chromium.org> | 2018-01-04 16:14:31 +0000 |
| commit | 72fe435e80807c91dbf8edc41d5bf3ec3c9bd9e4 (patch) | |
| tree | f171ca51a643ea905908e98daf9bbe99590fdb73 /xfa/fxfa/parser/cxfa_fill.cpp | |
| parent | a0af75cc4d1e50bb2832dc58636043afe565b02b (diff) | |
| download | pdfium-72fe435e80807c91dbf8edc41d5bf3ec3c9bd9e4.tar.xz | |
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>
Diffstat (limited to 'xfa/fxfa/parser/cxfa_fill.cpp')
| -rw-r--r-- | xfa/fxfa/parser/cxfa_fill.cpp | 10 |
1 files changed, 5 insertions, 5 deletions
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; } |