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

Side by Side Diff: core/fxcrt/include/fx_basic.h

Issue 2015743002: Banish CFX_PrivateData to the XFA side (Closed) Base URL: https://pdfium.googlesource.com/pdfium.git@master
Patch Set: Rebase Created 4 years, 7 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 | « core/fxcrt/fx_basic_util.cpp ('k') | xfa/fxfa/include/xfa_ffwidget.h » ('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 CORE_FXCRT_INCLUDE_FX_BASIC_H_ 7 #ifndef CORE_FXCRT_INCLUDE_FX_BASIC_H_
8 #define CORE_FXCRT_INCLUDE_FX_BASIC_H_ 8 #define CORE_FXCRT_INCLUDE_FX_BASIC_H_
9 9
10 #include <algorithm> 10 #include <algorithm>
(...skipping 600 matching lines...) Expand 10 before | Expand all | Expand 10 after
611 CNode* m_pNodeFree; 611 CNode* m_pNodeFree;
612 struct CFX_Plex* m_pBlocks; 612 struct CFX_Plex* m_pBlocks;
613 int m_nBlockSize; 613 int m_nBlockSize;
614 614
615 CNode* NewNode(CNode* pPrev, CNode* pNext); 615 CNode* NewNode(CNode* pPrev, CNode* pNext);
616 void FreeNode(CNode* pNode); 616 void FreeNode(CNode* pNode);
617 617
618 public: 618 public:
619 ~CFX_PtrList(); 619 ~CFX_PtrList();
620 }; 620 };
621
622 #ifdef PDF_ENABLE_XFA
621 typedef void (*PD_CALLBACK_FREEDATA)(void* pData); 623 typedef void (*PD_CALLBACK_FREEDATA)(void* pData);
622
623 struct FX_PRIVATEDATA { 624 struct FX_PRIVATEDATA {
624 void FreeData(); 625 void FreeData();
625 626
626 void* m_pModuleId; 627 void* m_pModuleId;
627 void* m_pData; 628 void* m_pData;
628 PD_CALLBACK_FREEDATA m_pCallback; 629 PD_CALLBACK_FREEDATA m_pCallback;
629 FX_BOOL m_bSelfDestruct; 630 FX_BOOL m_bSelfDestruct;
630 }; 631 };
631 632
632 class CFX_PrivateData { 633 class CFX_PrivateData {
(...skipping 26 matching lines...) Expand all
659 FX_BOOL RemovePrivateData(void* module_id); 660 FX_BOOL RemovePrivateData(void* module_id);
660 661
661 protected: 662 protected:
662 CFX_ArrayTemplate<FX_PRIVATEDATA> m_DataList; 663 CFX_ArrayTemplate<FX_PRIVATEDATA> m_DataList;
663 664
664 void AddData(void* module_id, 665 void AddData(void* module_id,
665 void* pData, 666 void* pData,
666 PD_CALLBACK_FREEDATA callback, 667 PD_CALLBACK_FREEDATA callback,
667 FX_BOOL bSelfDestruct); 668 FX_BOOL bSelfDestruct);
668 }; 669 };
670 #endif // PDF_ENABLE_XFA
669 671
670 class CFX_BitStream { 672 class CFX_BitStream {
671 public: 673 public:
672 void Init(const uint8_t* pData, uint32_t dwSize); 674 void Init(const uint8_t* pData, uint32_t dwSize);
673 675
674 uint32_t GetBits(uint32_t nBits); 676 uint32_t GetBits(uint32_t nBits);
675 677
676 void ByteAlign(); 678 void ByteAlign();
677 679
678 FX_BOOL IsEOF() { return m_BitPos >= m_BitSize; } 680 FX_BOOL IsEOF() { return m_BitPos >= m_BitSize; }
(...skipping 291 matching lines...) Expand 10 before | Expand all | Expand 10 after
970 FX_FLOAT e; 972 FX_FLOAT e;
971 FX_FLOAT f; 973 FX_FLOAT f;
972 FX_FLOAT g; 974 FX_FLOAT g;
973 FX_FLOAT h; 975 FX_FLOAT h;
974 FX_FLOAT i; 976 FX_FLOAT i;
975 }; 977 };
976 978
977 uint32_t GetBits32(const uint8_t* pData, int bitpos, int nbits); 979 uint32_t GetBits32(const uint8_t* pData, int bitpos, int nbits);
978 980
979 #endif // CORE_FXCRT_INCLUDE_FX_BASIC_H_ 981 #endif // CORE_FXCRT_INCLUDE_FX_BASIC_H_
OLDNEW
« no previous file with comments | « core/fxcrt/fx_basic_util.cpp ('k') | xfa/fxfa/include/xfa_ffwidget.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698