Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(80)

Side by Side Diff: xfa/fxfa/parser/xfa_object.h

Issue 1821043003: Remove FX_WORD in favor of uint16_t. (Closed) Base URL: https://pdfium.googlesource.com/pdfium.git@master
Patch Set: Use stdint.h directly, bitfield minefield. Created 4 years, 9 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
« no previous file with comments | « xfa/fxfa/parser/xfa_localevalue.cpp ('k') | xfa/fxfa/parser/xfa_object_imp.cpp » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright 2014 PDFium Authors. All rights reserved. 1 // Copyright 2014 PDFium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com 5 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
6 6
7 #ifndef XFA_FXFA_PARSER_XFA_OBJECT_H_ 7 #ifndef XFA_FXFA_PARSER_XFA_OBJECT_H_
8 #define XFA_FXFA_PARSER_XFA_OBJECT_H_ 8 #define XFA_FXFA_PARSER_XFA_OBJECT_H_
9 9
10 #include "xfa/fde/xml/fde_xml.h" 10 #include "xfa/fde/xml/fde_xml.h"
(...skipping 567 matching lines...) Expand 10 before | Expand all | Expand 10 after
578 FX_BOOL bSetting, 578 FX_BOOL bSetting,
579 XFA_ATTRIBUTE eAttribute); 579 XFA_ATTRIBUTE eAttribute);
580 void Script_Encrypt_Format(FXJSE_HVALUE hValue, 580 void Script_Encrypt_Format(FXJSE_HVALUE hValue,
581 FX_BOOL bSetting, 581 FX_BOOL bSetting,
582 XFA_ATTRIBUTE eAttribute); 582 XFA_ATTRIBUTE eAttribute);
583 void Script_Script_Stateless(FXJSE_HVALUE hValue, 583 void Script_Script_Stateless(FXJSE_HVALUE hValue,
584 FX_BOOL bSetting, 584 FX_BOOL bSetting,
585 XFA_ATTRIBUTE eAttribute); 585 XFA_ATTRIBUTE eAttribute);
586 586
587 protected: 587 protected:
588 CXFA_Node(CXFA_Document* pDoc, FX_WORD ePacket, XFA_ELEMENT eElement); 588 CXFA_Node(CXFA_Document* pDoc, uint16_t ePacket, XFA_ELEMENT eElement);
589 ~CXFA_Node(); 589 ~CXFA_Node();
590 friend class CXFA_Document; 590 friend class CXFA_Document;
591 CXFA_Node* Deprecated_GetPrevSibling(); 591 CXFA_Node* Deprecated_GetPrevSibling();
592 FX_BOOL SetValue(XFA_ATTRIBUTE eAttr, 592 FX_BOOL SetValue(XFA_ATTRIBUTE eAttr,
593 XFA_ATTRIBUTETYPE eType, 593 XFA_ATTRIBUTETYPE eType,
594 void* pValue, 594 void* pValue,
595 FX_BOOL bNotify); 595 FX_BOOL bNotify);
596 FX_BOOL GetValue(XFA_ATTRIBUTE eAttr, 596 FX_BOOL GetValue(XFA_ATTRIBUTE eAttr,
597 XFA_ATTRIBUTETYPE eType, 597 XFA_ATTRIBUTETYPE eType,
598 FX_BOOL bUseDefault, 598 FX_BOOL bUseDefault,
(...skipping 34 matching lines...) Expand 10 before | Expand all | Expand 10 after
633 CXFA_Node* pDstModule, 633 CXFA_Node* pDstModule,
634 void* pKey, 634 void* pKey,
635 FX_BOOL bRecursive = FALSE); 635 FX_BOOL bRecursive = FALSE);
636 636
637 CXFA_Node* m_pNext; 637 CXFA_Node* m_pNext;
638 CXFA_Node* m_pChild; 638 CXFA_Node* m_pChild;
639 CXFA_Node* m_pLastChild; 639 CXFA_Node* m_pLastChild;
640 CXFA_Node* m_pParent; 640 CXFA_Node* m_pParent;
641 IFDE_XMLNode* m_pXMLNode; 641 IFDE_XMLNode* m_pXMLNode;
642 XFA_ELEMENT m_eNodeClass; 642 XFA_ELEMENT m_eNodeClass;
643 FX_WORD m_ePacket; 643 uint16_t m_ePacket;
644 FX_DWORD m_dwNameHash; 644 FX_DWORD m_dwNameHash;
645 CXFA_Node* m_pAuxNode; 645 CXFA_Node* m_pAuxNode;
646 XFA_MAPMODULEDATA* m_pMapModuleData; 646 XFA_MAPMODULEDATA* m_pMapModuleData;
647 }; 647 };
648 class CXFA_OrdinaryObject : public CXFA_Object { 648 class CXFA_OrdinaryObject : public CXFA_Object {
649 public: 649 public:
650 CXFA_OrdinaryObject(CXFA_Document* pDocument, XFA_ELEMENT eElement) 650 CXFA_OrdinaryObject(CXFA_Document* pDocument, XFA_ELEMENT eElement)
651 : CXFA_Object(pDocument, XFA_OBJECTTYPE_OrdinaryObject), 651 : CXFA_Object(pDocument, XFA_OBJECTTYPE_OrdinaryObject),
652 m_uScriptHash(0) { 652 m_uScriptHash(0) {
653 m_eNodeClass = eElement; 653 m_eNodeClass = eElement;
(...skipping 141 matching lines...) Expand 10 before | Expand all | Expand 10 after
795 return pObj ? pObj->AsNode() : nullptr; 795 return pObj ? pObj->AsNode() : nullptr;
796 } 796 }
797 inline const CXFA_OrdinaryObject* ToOrdinaryObject(const CXFA_Object* pObj) { 797 inline const CXFA_OrdinaryObject* ToOrdinaryObject(const CXFA_Object* pObj) {
798 return pObj ? pObj->AsOrdinaryObject() : nullptr; 798 return pObj ? pObj->AsOrdinaryObject() : nullptr;
799 } 799 }
800 inline const CXFA_NodeList* ToNodeList(const CXFA_Object* pObj) { 800 inline const CXFA_NodeList* ToNodeList(const CXFA_Object* pObj) {
801 return pObj ? pObj->AsNodeList() : nullptr; 801 return pObj ? pObj->AsNodeList() : nullptr;
802 } 802 }
803 803
804 #endif // XFA_FXFA_PARSER_XFA_OBJECT_H_ 804 #endif // XFA_FXFA_PARSER_XFA_OBJECT_H_
OLDNEW
« no previous file with comments | « xfa/fxfa/parser/xfa_localevalue.cpp ('k') | xfa/fxfa/parser/xfa_object_imp.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698