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

Side by Side Diff: core/include/fpdfapi/fpdf_parser.h

Issue 1545183002: Merge to XFA: Switch from nonstd::unique_ptr to std::unique_ptr. (Closed) Base URL: https://pdfium.googlesource.com/pdfium.git@xfa
Patch Set: xfa Created 4 years, 12 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
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_INCLUDE_FPDFAPI_FPDF_PARSER_H_ 7 #ifndef CORE_INCLUDE_FPDFAPI_FPDF_PARSER_H_
8 #define CORE_INCLUDE_FPDFAPI_FPDF_PARSER_H_ 8 #define CORE_INCLUDE_FPDFAPI_FPDF_PARSER_H_
9 9
10 #include <map> 10 #include <map>
11 #include <memory>
11 12
12 #include "core/include/fxcrt/fx_system.h" 13 #include "core/include/fxcrt/fx_system.h"
13 #include "fpdf_objects.h" 14 #include "fpdf_objects.h"
14 #include "third_party/base/nonstd_unique_ptr.h"
15 15
16 class CFDF_Document; 16 class CFDF_Document;
17 class CFDF_Parser; 17 class CFDF_Parser;
18 class CFX_DIBSource; 18 class CFX_DIBSource;
19 class CFX_FloatRect; 19 class CFX_FloatRect;
20 class CFX_Font; 20 class CFX_Font;
21 class CFX_Matrix; 21 class CFX_Matrix;
22 class CFX_PrivateData; 22 class CFX_PrivateData;
23 class CPDF_ColorSpace; 23 class CPDF_ColorSpace;
24 class CPDF_CryptoHandler; 24 class CPDF_CryptoHandler;
(...skipping 315 matching lines...) Expand 10 before | Expand all | Expand 10 after
340 FX_DWORD m_HeaderOffset; 340 FX_DWORD m_HeaderOffset;
341 341
342 FX_FILESIZE m_FileLen; 342 FX_FILESIZE m_FileLen;
343 343
344 uint8_t* m_pFileBuf; 344 uint8_t* m_pFileBuf;
345 345
346 FX_DWORD m_BufSize; 346 FX_DWORD m_BufSize;
347 347
348 FX_FILESIZE m_BufOffset; 348 FX_FILESIZE m_BufOffset;
349 349
350 nonstd::unique_ptr<CPDF_CryptoHandler> m_pCryptoHandler; 350 std::unique_ptr<CPDF_CryptoHandler> m_pCryptoHandler;
351 351
352 uint8_t m_WordBuffer[257]; 352 uint8_t m_WordBuffer[257];
353 353
354 FX_DWORD m_WordSize; 354 FX_DWORD m_WordSize;
355 355
356 FX_BOOL m_bIsNumber; 356 FX_BOOL m_bIsNumber;
357 357
358 FX_FILESIZE m_dwWordPos; 358 FX_FILESIZE m_dwWordPos;
359 }; 359 };
360 360
(...skipping 128 matching lines...) Expand 10 before | Expand all | Expand 10 after
489 489
490 CPDF_Dictionary* m_pTrailer; 490 CPDF_Dictionary* m_pTrailer;
491 491
492 CPDF_Dictionary* m_pEncryptDict; 492 CPDF_Dictionary* m_pEncryptDict;
493 void SetEncryptDictionary(CPDF_Dictionary* pDict); 493 void SetEncryptDictionary(CPDF_Dictionary* pDict);
494 494
495 FX_FILESIZE m_LastXRefOffset; 495 FX_FILESIZE m_LastXRefOffset;
496 496
497 FX_BOOL m_bXRefStream; 497 FX_BOOL m_bXRefStream;
498 498
499 nonstd::unique_ptr<CPDF_SecurityHandler> m_pSecurityHandler; 499 std::unique_ptr<CPDF_SecurityHandler> m_pSecurityHandler;
500 500
501 FX_BOOL m_bForceUseSecurityHandler; 501 FX_BOOL m_bForceUseSecurityHandler;
502 502
503 CFX_ByteString m_bsRecipient; 503 CFX_ByteString m_bsRecipient;
504 504
505 CFX_ByteString m_FilePath; 505 CFX_ByteString m_FilePath;
506 506
507 CFX_ByteString m_Password; 507 CFX_ByteString m_Password;
508 508
509 struct ObjectInfo { 509 struct ObjectInfo {
(...skipping 486 matching lines...) Expand 10 before | Expand all | Expand 10 after
996 FX_DWORD src_size, 996 FX_DWORD src_size,
997 const CPDF_Dictionary* pDict, 997 const CPDF_Dictionary* pDict,
998 uint8_t*& dest_buf, 998 uint8_t*& dest_buf,
999 FX_DWORD& dest_size, 999 FX_DWORD& dest_size,
1000 CFX_ByteString& ImageEncoding, 1000 CFX_ByteString& ImageEncoding,
1001 CPDF_Dictionary*& pImageParms, 1001 CPDF_Dictionary*& pImageParms,
1002 FX_DWORD estimated_size, 1002 FX_DWORD estimated_size,
1003 FX_BOOL bImageAcc); 1003 FX_BOOL bImageAcc);
1004 1004
1005 #endif // CORE_INCLUDE_FPDFAPI_FPDF_PARSER_H_ 1005 #endif // CORE_INCLUDE_FPDFAPI_FPDF_PARSER_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698