| OLD | NEW |
| 1 /* | 1 /* |
| 2 * Copyright (C) 2013 Google Inc. All rights reserved. | 2 * Copyright (C) 2013 Google Inc. All rights reserved. |
| 3 * | 3 * |
| 4 * Redistribution and use in source and binary forms, with or without | 4 * Redistribution and use in source and binary forms, with or without |
| 5 * modification, are permitted provided that the following conditions are | 5 * modification, are permitted provided that the following conditions are |
| 6 * met: | 6 * met: |
| 7 * | 7 * |
| 8 * * Redistributions of source code must retain the above copyright | 8 * * Redistributions of source code must retain the above copyright |
| 9 * notice, this list of conditions and the following disclaimer. | 9 * notice, this list of conditions and the following disclaimer. |
| 10 * * Redistributions in binary form must reproduce the above | 10 * * Redistributions in binary form must reproduce the above |
| (...skipping 704 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 715 // Override operator new to allocate IntNode subtype objects onto | 715 // Override operator new to allocate IntNode subtype objects onto |
| 716 // the dedicated heap for blink::Node. | 716 // the dedicated heap for blink::Node. |
| 717 // | 717 // |
| 718 // TODO(haraken): untangling the heap unit tests from Blink would | 718 // TODO(haraken): untangling the heap unit tests from Blink would |
| 719 // simplify and avoid running into this problem - http://crbug.com/425381 | 719 // simplify and avoid running into this problem - http://crbug.com/425381 |
| 720 GC_PLUGIN_IGNORE("crbug.com/443854") | 720 GC_PLUGIN_IGNORE("crbug.com/443854") |
| 721 void* operator new(size_t size) { | 721 void* operator new(size_t size) { |
| 722 ThreadState* state = ThreadState::current(); | 722 ThreadState* state = ThreadState::current(); |
| 723 const char* typeName = WTF_HEAP_PROFILER_TYPE_NAME(IntNode); | 723 const char* typeName = WTF_HEAP_PROFILER_TYPE_NAME(IntNode); |
| 724 return ThreadHeap::allocateOnArenaIndex( | 724 return ThreadHeap::allocateOnArenaIndex( |
| 725 state, size, BlinkGC::NodeArenaIndex, GCInfoTrait<IntNode>::index(), | 725 state, size, BlinkGC::kNodeArenaIndex, GCInfoTrait<IntNode>::index(), |
| 726 typeName); | 726 typeName); |
| 727 } | 727 } |
| 728 | 728 |
| 729 static IntNode* create(int i) { return new IntNode(i); } | 729 static IntNode* create(int i) { return new IntNode(i); } |
| 730 | 730 |
| 731 DEFINE_INLINE_TRACE() {} | 731 DEFINE_INLINE_TRACE() {} |
| 732 | 732 |
| 733 int value() { return m_value; } | 733 int value() { return m_value; } |
| 734 | 734 |
| 735 private: | 735 private: |
| (...skipping 5739 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 6475 "HeapVector"); | 6475 "HeapVector"); |
| 6476 static_assert( | 6476 static_assert( |
| 6477 WTF::IsGarbageCollectedType<HeapDeque<Member<IntWrapper>>>::value, | 6477 WTF::IsGarbageCollectedType<HeapDeque<Member<IntWrapper>>>::value, |
| 6478 "HeapDeque"); | 6478 "HeapDeque"); |
| 6479 static_assert(WTF::IsGarbageCollectedType< | 6479 static_assert(WTF::IsGarbageCollectedType< |
| 6480 HeapTerminatedArray<Member<IntWrapper>>>::value, | 6480 HeapTerminatedArray<Member<IntWrapper>>>::value, |
| 6481 "HeapTerminatedArray"); | 6481 "HeapTerminatedArray"); |
| 6482 } | 6482 } |
| 6483 | 6483 |
| 6484 } // namespace blink | 6484 } // namespace blink |
| OLD | NEW |