diff options
| author | Tom Sepez <tsepez@chromium.org> | 2015-02-05 09:46:23 -0800 |
|---|---|---|
| committer | Tom Sepez <tsepez@chromium.org> | 2015-02-05 09:46:23 -0800 |
| commit | dabc5d57bf473708295800a7991bc1fafdf76288 (patch) | |
| tree | 9dfb8313596dd61e2c600cf02548b191f9753daf /fpdfsdk/src/javascript | |
| parent | 7061d1af45752617fafa85e2242dc5b2844650b5 (diff) | |
| download | pdfium-dabc5d57bf473708295800a7991bc1fafdf76288.tar.xz | |
Add namespace and-re-arrange PDFium's local copy of chromium /base.
Any projects DEPS'd into chromium and requiring a /base
subset should have a local copy of that subset in a
separate namespace. This will avoid future naming conflicts.
Re-arrange the directory structure to better identify what
came from chromium's base, and to make drop-in replacement
easier for files that contain hard-coded "base/" in their
#include directives.
R=jam@chromium.org
Review URL: https://codereview.chromium.org/900753002
Diffstat (limited to 'fpdfsdk/src/javascript')
| -rw-r--r-- | fpdfsdk/src/javascript/Document.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/fpdfsdk/src/javascript/Document.cpp b/fpdfsdk/src/javascript/Document.cpp index 96cec474c2..8f7a8f29e3 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); |