Upstream version 7.36.149.0

[platform/framework/web/crosswalk.git] / src / base / process / memory.h

diff --git a/src/base/process/memory.h b/src/base/process/memory.h
index a930be7..100d9c7 100644 (file)
--- a/src/base/process/memory.h
+++ b/src/base/process/memory.h
@@ -67,6 +67,8 @@ BASE_EXPORT bool AdjustOOMScore(ProcessId process, int score);
 // This can be useful for huge and/or unpredictable size memory allocations.
 // Please only use this if you really handle the case when the allocation
 // fails. Doing otherwise would risk security.
+// These functions may still crash on OOM when running under memory tools,
+// specifically ASan and other sanitizers.
 // Return value tells whether the allocation succeeded. If it fails |result| is
 // set to NULL, otherwise it holds the memory address.
 BASE_EXPORT WARN_UNUSED_RESULT bool UncheckedMalloc(size_t size,
@@ -75,12 +77,6 @@ BASE_EXPORT WARN_UNUSED_RESULT bool UncheckedCalloc(size_t num_items,
                                                     size_t size,
                                                     void** result);
 
-// TODO(b.kelemen): make Skia use the new interface and remove these.
-#if defined(OS_MACOSX)
-BASE_EXPORT void* UncheckedMalloc(size_t size);
-BASE_EXPORT void* UncheckedCalloc(size_t num_items, size_t size);
-#endif
-
 }  // namespace base
 
 #endif  // BASE_PROCESS_MEMORY_H_