summaryrefslogtreecommitdiff
path: root/xfa/fxfa/parser/xfa_document_datamerger_imp.cpp
diff options
context:
space:
mode:
authorDan Sinclair <dsinclair@chromium.org>2018-01-22 18:43:17 +0000
committerChromium commit bot <commit-bot@chromium.org>2018-01-22 18:43:17 +0000
commited4038bc335385b7e341d8de5c2bec8db5dcdcb6 (patch)
tree86af694f9185c0be181c778cf45ede8f57791534 /xfa/fxfa/parser/xfa_document_datamerger_imp.cpp
parentd7d584df24fda9c9a28330959cc28f94dc0294e2 (diff)
downloadpdfium-ed4038bc335385b7e341d8de5c2bec8db5dcdcb6.tar.xz
Move the UI elements from CXFA_WidgetAcc to CXFA_Node
This CL moves the methods and members related to the UI nodes from the CXFA_WidgetAcc class to the CXFA_Node class. Change-Id: I1fdc5173787141065f1e607bbfefa3b22af738b4 Reviewed-on: https://pdfium-review.googlesource.com/23290 Reviewed-by: Henrique Nakashima <hnakashima@chromium.org> Commit-Queue: dsinclair <dsinclair@chromium.org>
Diffstat (limited to 'xfa/fxfa/parser/xfa_document_datamerger_imp.cpp')
-rw-r--r--xfa/fxfa/parser/xfa_document_datamerger_imp.cpp8
1 files changed, 4 insertions, 4 deletions
diff --git a/xfa/fxfa/parser/xfa_document_datamerger_imp.cpp b/xfa/fxfa/parser/xfa_document_datamerger_imp.cpp
index 422ba4e58a..05846f2e3f 100644
--- a/xfa/fxfa/parser/xfa_document_datamerger_imp.cpp
+++ b/xfa/fxfa/parser/xfa_document_datamerger_imp.cpp
@@ -71,7 +71,8 @@ CXFA_Node* FormValueNode_CreateChild(CXFA_Node* pValueNode, XFA_Element iType) {
void FormValueNode_MatchNoneCreateChild(CXFA_Node* pFormNode) {
ASSERT(pFormNode->IsWidgetReady());
- pFormNode->GetWidgetAcc()->GetUIType();
+ // GetUIChild has the side effect of creating the UI child.
+ pFormNode->GetUIChild();
}
bool FormValueNode_SetChildContent(CXFA_Node* pValueNode,
@@ -133,12 +134,11 @@ void CreateDataBinding(CXFA_Node* pFormNode,
ASSERT(pFormNode->IsWidgetReady());
CXFA_WidgetAcc* pWidgetAcc = pFormNode->GetWidgetAcc();
- XFA_Element eUIType = pWidgetAcc->GetUIType();
auto* defValue = pFormNode->JSObject()->GetOrCreateProperty<CXFA_Value>(
0, XFA_Element::Value);
if (!bDataToForm) {
WideString wsValue;
- switch (eUIType) {
+ switch (pFormNode->GetUIType()) {
case XFA_Element::ImageEdit: {
CXFA_Image* image = defValue ? defValue->GetImageIfExists() : nullptr;
WideString wsContentType;
@@ -289,7 +289,7 @@ void CreateDataBinding(CXFA_Node* pFormNode,
pDataNode->JSObject()->SetAttributeValue(wsNormalizeValue, wsXMLValue, false,
false);
- switch (eUIType) {
+ switch (pFormNode->GetUIType()) {
case XFA_Element::ImageEdit: {
FormValueNode_SetChildContent(defValue, wsNormalizeValue,
XFA_Element::Image);