diff options
| author | Dan Sinclair <dsinclair@chromium.org> | 2018-01-03 16:39:18 -0500 |
|---|---|---|
| committer | Chromium commit bot <commit-bot@chromium.org> | 2018-01-03 22:11:40 +0000 |
| commit | 45da0f2d84c97a9856492265a1fc706d04bdfccd (patch) | |
| tree | 94f0e37415c91fdd7b91d22037e2d7a421e30986 /fxjs/xfa/cjx_object.cpp | |
| parent | 8afa22d5701a6c47b3f34267a2c52948efc3d301 (diff) | |
| download | pdfium-45da0f2d84c97a9856492265a1fc706d04bdfccd.tar.xz | |
Fold CXFA_FillData into CXFA_Fill
This CL removes the CXFA_FillData wrapper and puts the code directly in
CXFA_Fill.
Change-Id: I44ae8b53978b659480a4bb32719d086c7b91b49b
Reviewed-on: https://pdfium-review.googlesource.com/22210
Reviewed-by: Ryan Harrison <rharrison@chromium.org>
Commit-Queue: dsinclair <dsinclair@chromium.org>
Diffstat (limited to 'fxjs/xfa/cjx_object.cpp')
| -rw-r--r-- | fxjs/xfa/cjx_object.cpp | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/fxjs/xfa/cjx_object.cpp b/fxjs/xfa/cjx_object.cpp index a6ae86ef9f..81a6c2e64e 100644 --- a/fxjs/xfa/cjx_object.cpp +++ b/fxjs/xfa/cjx_object.cpp @@ -24,7 +24,7 @@ #include "xfa/fxfa/parser/cxfa_border.h" #include "xfa/fxfa/parser/cxfa_document.h" #include "xfa/fxfa/parser/cxfa_edge.h" -#include "xfa/fxfa/parser/cxfa_filldata.h" +#include "xfa/fxfa/parser/cxfa_fill.h" #include "xfa/fxfa/parser/cxfa_layoutprocessor.h" #include "xfa/fxfa/parser/cxfa_measurement.h" #include "xfa/fxfa/parser/cxfa_node.h" @@ -1339,9 +1339,8 @@ void CJX_Object::Script_Som_FillColor(CFXJSE_Value* pValue, return; CXFA_Border* border = widget_data_->GetBorder(true); - CXFA_FillData borderfillData = border->GetFillData(true); - CXFA_Node* pNode = borderfillData.GetNode(); - if (!pNode) + CXFA_Fill* borderfill = border->GetFill(true); + if (!borderfill) return; if (bSetting) { @@ -1350,11 +1349,11 @@ void CJX_Object::Script_Som_FillColor(CFXJSE_Value* pValue, int32_t b; std::tie(r, g, b) = StrToRGB(pValue->ToWideString()); FX_ARGB color = ArgbEncode(0xff, r, g, b); - borderfillData.SetColor(color); + borderfill->SetColor(color); return; } - FX_ARGB color = borderfillData.GetColor(false); + FX_ARGB color = borderfill->GetColor(false); int32_t a; int32_t r; int32_t g; |