diff options
| author | Lei Zhang <thestig@chromium.org> | 2015-12-24 19:13:32 -0800 |
|---|---|---|
| committer | Lei Zhang <thestig@chromium.org> | 2015-12-24 19:13:32 -0800 |
| commit | aa8bf7e42b8c73a9bc07ed6781364ba05f5a9776 (patch) | |
| tree | a5a435608eb527db39e2c9324737bd230e762030 /xfa/src/fxgraphics | |
| parent | 25ae22692cdd5b4ae4783ecb27eba79b3c794b2c (diff) | |
| download | pdfium-aa8bf7e42b8c73a9bc07ed6781364ba05f5a9776.tar.xz | |
Merge to XFA: Switch from nonstd::unique_ptr to std::unique_ptr.
TBR=thakis@chromium.org
Review URL: https://codereview.chromium.org/1547833002 .
(cherry picked from commit d20dfba2ae10e8aeb328328f09da79ff904110a8)
Review URL: https://codereview.chromium.org/1545183002 .
Diffstat (limited to 'xfa/src/fxgraphics')
| -rw-r--r-- | xfa/src/fxgraphics/src/fx_graphics.cpp | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/xfa/src/fxgraphics/src/fx_graphics.cpp b/xfa/src/fxgraphics/src/fx_graphics.cpp index d983b5d6f8..69069817aa 100644 --- a/xfa/src/fxgraphics/src/fx_graphics.cpp +++ b/xfa/src/fxgraphics/src/fx_graphics.cpp @@ -4,9 +4,10 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
+#include <memory>
+
#include "fx_path_generator.h"
#include "pre.h"
-#include "third_party/base/nonstd_unique_ptr.h"
class CAGG_Graphics {
public:
@@ -1099,7 +1100,7 @@ FX_ERR CFX_Graphics::CalcTextInfo(const CFX_WideString& text, FX_DWORD* charCodes,
FXTEXT_CHARPOS* charPos,
CFX_RectF& rect) {
- nonstd::unique_ptr<CFX_UnicodeEncoding> encoding(
+ std::unique_ptr<CFX_UnicodeEncoding> encoding(
new CFX_UnicodeEncoding(_info._font));
int32_t length = text.GetLength();
FX_FLOAT penX = (FX_FLOAT)rect.left;
|