summaryrefslogtreecommitdiff
path: root/fpdfsdk/src/javascript/Document.cpp
diff options
context:
space:
mode:
authorTom Sepez <tsepez@chromium.org>2015-02-05 10:03:18 -0800
committerTom Sepez <tsepez@chromium.org>2015-02-05 10:03:18 -0800
commit35425896b07b5124651c249d6ce29285cf71ea3b (patch)
tree0cd30ec338fffdebb3aee6a899beeb3835c6f194 /fpdfsdk/src/javascript/Document.cpp
parent53476d6956781ceb252e1ae5e01f83a48bcb4908 (diff)
downloadpdfium-35425896b07b5124651c249d6ce29285cf71ea3b.tar.xz
Merge to XFA: Add namespace and-re-arrange PDFium's local copy of /base.
Original revieww URL: https://codereview.chromium.org/900753002 TBR=jam@chromium.org Review URL: https://codereview.chromium.org/880603004
Diffstat (limited to 'fpdfsdk/src/javascript/Document.cpp')
-rw-r--r--fpdfsdk/src/javascript/Document.cpp6
1 files changed, 3 insertions, 3 deletions
diff --git a/fpdfsdk/src/javascript/Document.cpp b/fpdfsdk/src/javascript/Document.cpp
index 2c12068328..e35c538c22 100644
--- a/fpdfsdk/src/javascript/Document.cpp
+++ b/fpdfsdk/src/javascript/Document.cpp
@@ -18,7 +18,7 @@
#include "../../include/javascript/Icon.h"
#include "../../include/javascript/Field.h"
-#include "../../../third_party/numerics/safe_math.h"
+#include "../../../third_party/base/numerics/safe_math.h"
static v8::Isolate* GetIsolate(IFXJS_Context* cc)
{
@@ -1428,7 +1428,7 @@ FX_BOOL Document::documentFileName(OBJ_PROP_PARAMS)
CFX_WideString Document::ReversalStr(CFX_WideString cbFrom)
{
size_t iLength = cbFrom.GetLength();
- base::CheckedNumeric<size_t> iSize = sizeof(wchar_t);
+ pdfium::base::CheckedNumeric<size_t> iSize = sizeof(wchar_t);
iSize *= (iLength + 1);
wchar_t* pResult = (wchar_t*)malloc(iSize.ValueOrDie());
wchar_t* pFrom = (wchar_t*)cbFrom.GetBuffer(iLength);
@@ -1449,7 +1449,7 @@ CFX_WideString Document::ReversalStr(CFX_WideString cbFrom)
CFX_WideString Document::CutString(CFX_WideString cbFrom)
{
size_t iLength = cbFrom.GetLength();
- base::CheckedNumeric<size_t> iSize = sizeof(wchar_t);
+ pdfium::base::CheckedNumeric<size_t> iSize = sizeof(wchar_t);
iSize *= (iLength + 1);
wchar_t* pResult = (wchar_t*)malloc(iSize.ValueOrDie());
wchar_t* pFrom = (wchar_t*)cbFrom.GetBuffer(iLength);