Index: third_party/WebKit/Source/platform/heap/HeapAllocator.h |
diff --git a/third_party/WebKit/Source/platform/heap/HeapAllocator.h b/third_party/WebKit/Source/platform/heap/HeapAllocator.h |
index f52965b22cff122a5d648bfe3bbb2e57b75313e6..7a5acb310b32220e78e89fccdbee5ac4c57c2fb9 100644 |
--- a/third_party/WebKit/Source/platform/heap/HeapAllocator.h |
+++ b/third_party/WebKit/Source/platform/heap/HeapAllocator.h |
@@ -148,7 +148,8 @@ class PLATFORM_EXPORT HeapAllocator { |
static void DeleteArray(void* ptr) { ASSERT_NOT_REACHED(); } |
static bool IsAllocationAllowed() { |
- return ThreadState::Current()->IsAllocationAllowed(); |
+ return ThreadState::Current()->IsAllocationAllowed() && |
+ !ThreadState::Current()->IsObjectRessurectionForbidden(); |
haraken
2017/04/12 11:03:37
Hmm, it looks confusing to change the meaning of I
keishi
2017/04/13 05:22:42
I added a separate method on Allocator.
Looks lik
|
} |
template <typename T> |