diff options
| author | Dan Sinclair <dsinclair@chromium.org> | 2017-12-12 18:54:48 +0000 |
|---|---|---|
| committer | Chromium commit bot <commit-bot@chromium.org> | 2017-12-12 18:54:48 +0000 |
| commit | ebcbb85ea364605baf8e382ad66793bf1b4db029 (patch) | |
| tree | 2c546368c63f65d7786a1ab9c818cb07b80d599c /fxjs/xfa/cjx_node.h | |
| parent | 4b004930490e416a2a404deee5de4b97e649a1c1 (diff) | |
| download | pdfium-ebcbb85ea364605baf8e382ad66793bf1b4db029.tar.xz | |
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>
Diffstat (limited to 'fxjs/xfa/cjx_node.h')
| -rw-r--r-- | fxjs/xfa/cjx_node.h | 11 |
1 files changed, 0 insertions, 11 deletions
diff --git a/fxjs/xfa/cjx_node.h b/fxjs/xfa/cjx_node.h index 2cf41a0735..8c42b340a8 100644 --- a/fxjs/xfa/cjx_node.h +++ b/fxjs/xfa/cjx_node.h @@ -8,7 +8,6 @@ #define FXJS_XFA_CJX_NODE_H_ #include <memory> -#include <utility> #include <vector> #include "core/fxcrt/unowned_ptr.h" @@ -47,9 +46,6 @@ class CJX_Node : public CJX_Tree { bool bSyncData); WideString GetContent(bool bScriptModify); - void SetWidgetData(std::unique_ptr<CXFA_WidgetData> data); - CXFA_WidgetData* GetWidgetData() const { return widget_data_.get(); } - void SetLayoutItem(CXFA_LayoutItem* item) { layout_item_ = item; } CXFA_LayoutItem* GetLayoutItem() const { return layout_item_.Get(); } @@ -126,12 +122,6 @@ class CJX_Node : public CJX_Tree { void Script_Som_Message(CFXJSE_Value* pValue, bool bSetting, XFA_SOM_MESSAGETYPE iMessageType); - void Script_Som_BorderColor(CFXJSE_Value* pValue, - bool bSetting, - XFA_Attribute eAttribute); - void Script_Som_BorderWidth(CFXJSE_Value* pValue, - bool bSetting, - XFA_Attribute eAttribute); void Script_Som_FillColor(CFXJSE_Value* pValue, bool bSetting, XFA_Attribute eAttribute); @@ -239,7 +229,6 @@ class CJX_Node : public CJX_Tree { XFA_Element eType); private: - std::unique_ptr<CXFA_WidgetData> widget_data_; UnownedPtr<CXFA_LayoutItem> layout_item_; size_t calc_recursion_count_ = 0; static const CJX_MethodSpec MethodSpecs[]; |