summaryrefslogtreecommitdiff
path: root/fxjs
diff options
context:
space:
mode:
authorDan Sinclair <dsinclair@chromium.org>2017-11-07 20:24:10 +0000
committerChromium commit bot <commit-bot@chromium.org>2017-11-07 20:24:10 +0000
commit4d48bbfd5378ffe70a17ad613b9c167ad3ef03b2 (patch)
tree6726e3a65a59e152d075746a1af6a49967949ac7 /fxjs
parentd32fa8b75a3af1cddc4517a3085a43f7a3544c90 (diff)
downloadpdfium-4d48bbfd5378ffe70a17ad613b9c167ad3ef03b2.tar.xz
Rename CXFA_Font to CXFA_FontData
This CL renames CXFA_Font to CXFA_FontData to make it clear this is part of the data hierarchy. The GetFontNode methods were renamed to GetFontData to match the return type. Change-Id: I5d5b9200eedc9c8c1bd8929a5a0df3d2663d7e3d Reviewed-on: https://pdfium-review.googlesource.com/17983 Reviewed-by: Tom Sepez <tsepez@chromium.org> Commit-Queue: dsinclair <dsinclair@chromium.org>
Diffstat (limited to 'fxjs')
-rw-r--r--fxjs/cjx_node.cpp16
1 files changed, 8 insertions, 8 deletions
diff --git a/fxjs/cjx_node.cpp b/fxjs/cjx_node.cpp
index 490e3a1094..dcdd0c5bd3 100644
--- a/fxjs/cjx_node.cpp
+++ b/fxjs/cjx_node.cpp
@@ -1735,23 +1735,23 @@ void CJX_Node::Script_Som_FontColor(CFXJSE_Value* pValue,
bool bSetting,
XFA_ATTRIBUTE eAttribute) {
CXFA_WidgetData* pWidgetData = GetXFANode()->GetWidgetData();
- if (!pWidgetData) {
+ if (!pWidgetData)
return;
- }
- CXFA_Font font = pWidgetData->GetFont(true);
- CXFA_Node* pNode = font.GetNode();
- if (!pNode) {
+
+ CXFA_FontData fontData = pWidgetData->GetFontData(true);
+ CXFA_Node* pNode = fontData.GetNode();
+ if (!pNode)
return;
- }
+
if (bSetting) {
int32_t r;
int32_t g;
int32_t b;
StrToRGB(pValue->ToWideString(), r, g, b);
FX_ARGB color = ArgbEncode(0xff, r, g, b);
- font.SetColor(color);
+ fontData.SetColor(color);
} else {
- FX_ARGB color = font.GetColor();
+ FX_ARGB color = fontData.GetColor();
int32_t a;
int32_t r;
int32_t g;