summaryrefslogtreecommitdiff
path: root/core/include/fpdfapi
diff options
context:
space:
mode:
authorLei Zhang <thestig@chromium.org>2015-12-24 19:00:05 -0800
committerLei Zhang <thestig@chromium.org>2015-12-24 19:00:05 -0800
commitd20dfba2ae10e8aeb328328f09da79ff904110a8 (patch)
tree560bc512ddec373595a9f719996e1d13338f72da /core/include/fpdfapi
parentbab9a98b71f351cf9f4eb39138bca55e3be4ef15 (diff)
downloadpdfium-d20dfba2ae10e8aeb328328f09da79ff904110a8.tar.xz
Switch from nonstd::unique_ptr to std::unique_ptr.
R=thakis@chromium.org Review URL: https://codereview.chromium.org/1547833002 .
Diffstat (limited to 'core/include/fpdfapi')
-rw-r--r--core/include/fpdfapi/fpdf_module.h7
-rw-r--r--core/include/fpdfapi/fpdf_parser.h6
-rw-r--r--core/include/fpdfapi/fpdf_render.h4
3 files changed, 9 insertions, 8 deletions
diff --git a/core/include/fpdfapi/fpdf_module.h b/core/include/fpdfapi/fpdf_module.h
index 00aed45d1f..e22b63e544 100644
--- a/core/include/fpdfapi/fpdf_module.h
+++ b/core/include/fpdfapi/fpdf_module.h
@@ -7,9 +7,10 @@
#ifndef CORE_INCLUDE_FPDFAPI_FPDF_MODULE_H_
#define CORE_INCLUDE_FPDFAPI_FPDF_MODULE_H_
+#include <memory>
+
#include "core/include/fxcrt/fx_coordinates.h"
#include "core/include/fxcrt/fx_system.h"
-#include "third_party/base/nonstd_unique_ptr.h"
class CCodec_ModuleMgr;
class CFX_BitmapDevice;
@@ -78,8 +79,8 @@ class CPDF_ModuleMgr {
~CPDF_ModuleMgr();
CCodec_ModuleMgr* m_pCodecModule;
- nonstd::unique_ptr<IPDF_RenderModule> m_pRenderModule;
- nonstd::unique_ptr<IPDF_PageModule> m_pPageModule;
+ std::unique_ptr<IPDF_RenderModule> m_pRenderModule;
+ std::unique_ptr<IPDF_PageModule> m_pPageModule;
FX_BOOL (*m_pDownloadCallback)(const FX_CHAR* module_name);
CFX_PrivateData m_privateData;
};
diff --git a/core/include/fpdfapi/fpdf_parser.h b/core/include/fpdfapi/fpdf_parser.h
index 752df789da..a49fb29d9c 100644
--- a/core/include/fpdfapi/fpdf_parser.h
+++ b/core/include/fpdfapi/fpdf_parser.h
@@ -8,10 +8,10 @@
#define CORE_INCLUDE_FPDFAPI_FPDF_PARSER_H_
#include <map>
+#include <memory>
#include "core/include/fxcrt/fx_system.h"
#include "fpdf_objects.h"
-#include "third_party/base/nonstd_unique_ptr.h"
class CFDF_Document;
class CFDF_Parser;
@@ -347,7 +347,7 @@ class CPDF_SyntaxParser {
FX_FILESIZE m_BufOffset;
- nonstd::unique_ptr<CPDF_CryptoHandler> m_pCryptoHandler;
+ std::unique_ptr<CPDF_CryptoHandler> m_pCryptoHandler;
uint8_t m_WordBuffer[257];
@@ -496,7 +496,7 @@ class CPDF_Parser {
FX_BOOL m_bXRefStream;
- nonstd::unique_ptr<CPDF_SecurityHandler> m_pSecurityHandler;
+ std::unique_ptr<CPDF_SecurityHandler> m_pSecurityHandler;
FX_BOOL m_bForceUseSecurityHandler;
diff --git a/core/include/fpdfapi/fpdf_render.h b/core/include/fpdfapi/fpdf_render.h
index 245a85d502..1c8a99ac7d 100644
--- a/core/include/fpdfapi/fpdf_render.h
+++ b/core/include/fpdfapi/fpdf_render.h
@@ -8,10 +8,10 @@
#define CORE_INCLUDE_FPDFAPI_FPDF_RENDER_H_
#include <map>
+#include <memory>
#include "core/include/fpdfapi/fpdf_page.h"
#include "core/include/fxge/fx_ge.h"
-#include "third_party/base/nonstd_unique_ptr.h"
class CFX_GraphStateData;
class CFX_PathData;
@@ -151,7 +151,7 @@ class CPDF_ProgressiveRenderer {
CPDF_RenderContext* const m_pContext;
CFX_RenderDevice* const m_pDevice;
const CPDF_RenderOptions* const m_pOptions;
- nonstd::unique_ptr<CPDF_RenderStatus> m_pRenderStatus;
+ std::unique_ptr<CPDF_RenderStatus> m_pRenderStatus;
CFX_FloatRect m_ClipRect;
FX_DWORD m_LayerIndex;
FX_DWORD m_ObjectIndex;