| 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 723 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 734 // Override operator new to allocate IntNode subtype objects onto | 734 // Override operator new to allocate IntNode subtype objects onto |
| 735 // the dedicated heap for blink::Node. | 735 // the dedicated heap for blink::Node. |
| 736 // | 736 // |
| 737 // TODO(haraken): untangling the heap unit tests from Blink would | 737 // TODO(haraken): untangling the heap unit tests from Blink would |
| 738 // simplify and avoid running into this problem - http://crbug.com/425381 | 738 // simplify and avoid running into this problem - http://crbug.com/425381 |
| 739 GC_PLUGIN_IGNORE("crbug.com/443854") | 739 GC_PLUGIN_IGNORE("crbug.com/443854") |
| 740 void* operator new(size_t size) { | 740 void* operator new(size_t size) { |
| 741 ThreadState* state = ThreadState::current(); | 741 ThreadState* state = ThreadState::current(); |
| 742 const char* typeName = WTF_HEAP_PROFILER_TYPE_NAME(IntNode); | 742 const char* typeName = WTF_HEAP_PROFILER_TYPE_NAME(IntNode); |
| 743 return ThreadHeap::allocateOnArenaIndex( | 743 return ThreadHeap::allocateOnArenaIndex( |
| 744 state, size, BlinkGC::NodeArenaIndex, GCInfoTrait<IntNode>::index(), | 744 state, size, BlinkGC::kNodeArenaIndex, GCInfoTrait<IntNode>::index(), |
| 745 typeName); | 745 type_name); |
| 746 } | 746 } |
| 747 | 747 |
| 748 static IntNode* create(int i) { return new IntNode(i); } | 748 static IntNode* create(int i) { return new IntNode(i); } |
| 749 | 749 |
| 750 DEFINE_INLINE_TRACE() {} | 750 DEFINE_INLINE_TRACE() {} |
| 751 | 751 |
| 752 int value() { return m_value; } | 752 int value() { return m_value; } |
| 753 | 753 |
| 754 private: | 754 private: |
| 755 IntNode(int i) : m_value(i) {} | 755 IntNode(int i) : m_value(i) {} |
| (...skipping 5621 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 6377 "HeapVector"); | 6377 "HeapVector"); |
| 6378 static_assert( | 6378 static_assert( |
| 6379 WTF::IsGarbageCollectedType<HeapDeque<Member<IntWrapper>>>::value, | 6379 WTF::IsGarbageCollectedType<HeapDeque<Member<IntWrapper>>>::value, |
| 6380 "HeapDeque"); | 6380 "HeapDeque"); |
| 6381 static_assert(WTF::IsGarbageCollectedType< | 6381 static_assert(WTF::IsGarbageCollectedType< |
| 6382 HeapTerminatedArray<Member<IntWrapper>>>::value, | 6382 HeapTerminatedArray<Member<IntWrapper>>>::value, |
| 6383 "HeapTerminatedArray"); | 6383 "HeapTerminatedArray"); |
| 6384 } | 6384 } |
| 6385 | 6385 |
| 6386 } // namespace blink | 6386 } // namespace blink |
| OLD | NEW |