diff options
| author | Lei Zhang <thestig@chromium.org> | 2015-07-13 12:06:59 -0700 |
|---|---|---|
| committer | Lei Zhang <thestig@chromium.org> | 2015-07-13 12:06:59 -0700 |
| commit | ce95f50e0ed551f6280f163a05b58031a3d011a9 (patch) | |
| tree | bdebf8fb275175e97bd1a5607fe09f59570172a6 /pdfium.gyp | |
| parent | a967306a353cce18b2276e9d8f653e989c6fa6e5 (diff) | |
| download | pdfium-ce95f50e0ed551f6280f163a05b58031a3d011a9.tar.xz | |
Merge to M44: Abort on OOM by default in FX_Alloc().
Add a FX_TryAlloc() for those few cases where we might need to continue
in face of OOM.
Remove FX_AllocNL() (the context of its use would suggest that NL
means "No Limit"). This is used for some big allocations, so replace
it with TryAlloc(). Large allocations may be worth trying to continue
from, since there are few and they have a large chance of failing.
R=thestig@chromium.org
Review URL: https://codereview.chromium.org/1128043009
(cherry picked from commit 9f6f34892fdfff87c49a9df4c1e34790c0fa1272)
BUG=446032
Review URL: https://codereview.chromium.org/1226403008 .
Diffstat (limited to 'pdfium.gyp')
| -rw-r--r-- | pdfium.gyp | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/pdfium.gyp b/pdfium.gyp index d8df460c07..7f1d908b1c 100644 --- a/pdfium.gyp +++ b/pdfium.gyp @@ -840,6 +840,7 @@ 'sources': [ 'core/src/fxcodec/codec/fx_codec_jpx_unittest.cpp', 'core/src/fxcrt/fx_basic_bstring_unittest.cpp', + 'core/src/fxcrt/fx_basic_memmgr_unittest.cpp', 'core/src/fxcrt/fx_basic_wstring_unittest.cpp', 'testing/fx_string_testhelpers.h', 'testing/fx_string_testhelpers.cpp', |