From 94fc2af0c9a800f39e4dbcac859f1ad490f7d725 Mon Sep 17 00:00:00 2001 From: Dan Sinclair Date: Mon, 8 Jan 2018 15:12:10 -0500 Subject: Move CXFA_WidgetAcc from CJX_Object to CXFA_Object This CL change the CJX code to not store the pointer to the CXFA_WidgetAcc. If needed the CJX object gets the Acc from the Node itself. Change-Id: I5a5a500b8fbc1749d362346d72678acd5250d112 Reviewed-on: https://pdfium-review.googlesource.com/22411 Reviewed-by: Henrique Nakashima Commit-Queue: dsinclair --- fxjs/xfa/cjx_draw.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'fxjs/xfa/cjx_draw.cpp') diff --git a/fxjs/xfa/cjx_draw.cpp b/fxjs/xfa/cjx_draw.cpp index 036cfc76bc..a1baabfd2c 100644 --- a/fxjs/xfa/cjx_draw.cpp +++ b/fxjs/xfa/cjx_draw.cpp @@ -7,6 +7,7 @@ #include "fxjs/xfa/cjx_draw.h" #include "fxjs/cfxjse_value.h" +#include "xfa/fxfa/cxfa_widgetacc.h" #include "xfa/fxfa/parser/cxfa_draw.h" CJX_Draw::CJX_Draw(CXFA_Draw* node) : CJX_Container(node) {} @@ -119,8 +120,7 @@ void CJX_Draw::defaultValue(CFXJSE_Value* pValue, if (!pValue || !pValue->IsString()) return; - CXFA_WidgetAcc* pWidgetAcc = GetXFANode()->GetWidgetAcc(); - XFA_Element uiType = pWidgetAcc->GetUIType(); + XFA_Element uiType = GetXFANode()->GetWidgetAcc()->GetUIType(); if (uiType != XFA_Element::Text) return; -- cgit v1.2.3