From ebcbb85ea364605baf8e382ad66793bf1b4db029 Mon Sep 17 00:00:00 2001
From: Dan Sinclair <dsinclair@chromium.org>
Date: Tue, 12 Dec 2017 18:54:48 +0000
Subject: Move Script_Som_Border{Width|Color} to CJX_Object

The CJX_Node isn't the root of the CJX hierarchy. This causes issues
now that CJX_Object has child objects which don't inherit from CJX_Node.
This CL moves Script_Som_Border{Width|Color} from CJX_Node to CJX_Object.

Change-Id: I07ba9ef2af675993c9f4d14cb74f48252a907569
Reviewed-on: https://pdfium-review.googlesource.com/20990
Reviewed-by: Henrique Nakashima <hnakashima@chromium.org>
Commit-Queue: dsinclair <dsinclair@chromium.org>
---
 fxjs/xfa/cjx_field.cpp | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

(limited to 'fxjs/xfa/cjx_field.cpp')

diff --git a/fxjs/xfa/cjx_field.cpp b/fxjs/xfa/cjx_field.cpp
index 4b5f840322..857aa50d40 100644
--- a/fxjs/xfa/cjx_field.cpp
+++ b/fxjs/xfa/cjx_field.cpp
@@ -40,7 +40,7 @@ CJX_Field::~CJX_Field() {}
 CJS_Return CJX_Field::clearItems(
     CJS_V8* runtime,
     const std::vector<v8::Local<v8::Value>>& params) {
-  CXFA_WidgetData* pWidgetData = GetXFANode()->GetWidgetData();
+  CXFA_WidgetData* pWidgetData = GetWidgetData();
   if (pWidgetData)
     pWidgetData->DeleteItem(-1, true, false);
   return CJS_Return(true);
@@ -81,7 +81,7 @@ CJS_Return CJX_Field::deleteItem(
   if (params.size() != 1)
     return CJS_Return(JSGetStringFromID(JSMessage::kParamError));
 
-  CXFA_WidgetData* pWidgetData = GetXFANode()->GetWidgetData();
+  CXFA_WidgetData* pWidgetData = GetWidgetData();
   if (!pWidgetData)
     return CJS_Return(true);
 
@@ -100,7 +100,7 @@ CJS_Return CJX_Field::getSaveItem(
   if (iIndex < 0)
     return CJS_Return(runtime->NewNull());
 
-  CXFA_WidgetData* pWidgetData = GetXFANode()->GetWidgetData();
+  CXFA_WidgetData* pWidgetData = GetWidgetData();
   if (!pWidgetData)
     return CJS_Return(runtime->NewNull());
 
@@ -118,7 +118,7 @@ CJS_Return CJX_Field::boundItem(
   if (params.size() != 1)
     return CJS_Return(JSGetStringFromID(JSMessage::kParamError));
 
-  CXFA_WidgetData* pWidgetData = GetXFANode()->GetWidgetData();
+  CXFA_WidgetData* pWidgetData = GetWidgetData();
   if (!pWidgetData)
     return CJS_Return(true);
 
@@ -133,7 +133,7 @@ CJS_Return CJX_Field::getItemState(
   if (params.size() != 1)
     return CJS_Return(JSGetStringFromID(JSMessage::kParamError));
 
-  CXFA_WidgetData* pWidgetData = GetXFANode()->GetWidgetData();
+  CXFA_WidgetData* pWidgetData = GetWidgetData();
   if (!pWidgetData)
     return CJS_Return(true);
 
@@ -165,7 +165,7 @@ CJS_Return CJX_Field::getDisplayItem(
   if (iIndex < 0)
     return CJS_Return(runtime->NewNull());
 
-  CXFA_WidgetData* pWidgetData = GetXFANode()->GetWidgetData();
+  CXFA_WidgetData* pWidgetData = GetWidgetData();
   if (!pWidgetData)
     return CJS_Return(runtime->NewNull());
 
@@ -183,7 +183,7 @@ CJS_Return CJX_Field::setItemState(
   if (params.size() != 2)
     return CJS_Return(JSGetStringFromID(JSMessage::kParamError));
 
-  CXFA_WidgetData* pWidgetData = GetXFANode()->GetWidgetData();
+  CXFA_WidgetData* pWidgetData = GetWidgetData();
   if (!pWidgetData)
     return CJS_Return(true);
 
@@ -203,7 +203,7 @@ CJS_Return CJX_Field::addItem(CJS_V8* runtime,
   if (params.size() != 1 && params.size() != 2)
     return CJS_Return(JSGetStringFromID(JSMessage::kParamError));
 
-  CXFA_WidgetData* pWidgetData = GetXFANode()->GetWidgetData();
+  CXFA_WidgetData* pWidgetData = GetWidgetData();
   if (!pWidgetData)
     return CJS_Return(true);
 
-- 
cgit v1.2.3