diff options
author | Dan Sinclair <dsinclair@chromium.org> | 2017-11-08 17:11:21 +0000 |
---|---|---|
committer | Chromium commit bot <commit-bot@chromium.org> | 2017-11-08 17:11:21 +0000 |
commit | 269ef77ccbb20db68c0b5049bb6a3a867623db64 (patch) | |
tree | 4e1437072ce86d4973d6d42e92a3c44b64016455 /xfa/fxfa/fxfa_basic.h | |
parent | 20f22a0a38a6c6d9ccd0ead2e65093e79f0bd051 (diff) | |
download | pdfium-269ef77ccbb20db68c0b5049bb6a3a867623db64.tar.xz |
Fix XFA_SCRIPTATTRIBUTEINFO attribute type
This CL changes XFA_SCRIPTATTRIBUTEINFO attribute field to be a
XFA_ATTRIBUTE from an in32_t. This necessitated adding an
XFA_ATTRIBUTE_Unknown and updating the various -1 values in the script
data description.
Change-Id: I837602e38b3785d7c8515830fae8dc427d449e9f
Reviewed-on: https://pdfium-review.googlesource.com/18030
Reviewed-by: Tom Sepez <tsepez@chromium.org>
Commit-Queue: dsinclair <dsinclair@chromium.org>
Diffstat (limited to 'xfa/fxfa/fxfa_basic.h')
-rw-r--r-- | xfa/fxfa/fxfa_basic.h | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/xfa/fxfa/fxfa_basic.h b/xfa/fxfa/fxfa_basic.h index be8fcf2833..ccd44cdc13 100644 --- a/xfa/fxfa/fxfa_basic.h +++ b/xfa/fxfa/fxfa_basic.h @@ -367,6 +367,8 @@ enum XFA_ATTRIBUTEENUM { XFA_ATTRIBUTEENUM_Lowered, }; enum XFA_ATTRIBUTE { + XFA_ATTRIBUTE_Unknown = -1, + XFA_ATTRIBUTE_H, XFA_ATTRIBUTE_W, XFA_ATTRIBUTE_X, @@ -995,7 +997,7 @@ enum XFA_UNIT { struct XFA_NOTSUREATTRIBUTE { XFA_Element eElement; - XFA_ATTRIBUTE eAttribute; + XFA_ATTRIBUTE attribute; XFA_ATTRIBUTETYPE eType; void* pValue; }; @@ -1014,11 +1016,12 @@ enum XFA_SCRIPT_TYPE { XFA_SCRIPT_Basic, XFA_SCRIPT_Object, }; + struct XFA_SCRIPTATTRIBUTEINFO { uint32_t uHash; const wchar_t* pName; XFA_ATTRIBUTE_CALLBACK callback; - int32_t eAttribute; + XFA_ATTRIBUTE attribute; uint16_t eValueType; }; |