Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(528)

Side by Side Diff: third_party/WebKit/Source/platform/heap/HeapTest.cpp

Issue 2611823003: ABANDONED CL: Changes to compile and pass tests after Big Blink Rename (excluding functions). (Closed)
Patch Set: Inducing merge conflicts to force human review and changes after rename. Created 3 years, 11 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
OLDNEW
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 783 matching lines...) Expand 10 before | Expand all | Expand 10 after
794 // Override operator new to allocate IntNode subtype objects onto 794 // Override operator new to allocate IntNode subtype objects onto
795 // the dedicated heap for blink::Node. 795 // the dedicated heap for blink::Node.
796 // 796 //
797 // TODO(haraken): untangling the heap unit tests from Blink would 797 // TODO(haraken): untangling the heap unit tests from Blink would
798 // simplify and avoid running into this problem - http://crbug.com/425381 798 // simplify and avoid running into this problem - http://crbug.com/425381
799 GC_PLUGIN_IGNORE("crbug.com/443854") 799 GC_PLUGIN_IGNORE("crbug.com/443854")
800 void* operator new(size_t size) { 800 void* operator new(size_t size) {
801 ThreadState* state = ThreadState::current(); 801 ThreadState* state = ThreadState::current();
802 const char* typeName = WTF_HEAP_PROFILER_TYPE_NAME(IntNode); 802 const char* typeName = WTF_HEAP_PROFILER_TYPE_NAME(IntNode);
803 return ThreadHeap::allocateOnArenaIndex( 803 return ThreadHeap::allocateOnArenaIndex(
804 state, size, BlinkGC::NodeArenaIndex, GCInfoTrait<IntNode>::index(), 804 state, size, BlinkGC::kNodeArenaIndex, GCInfoTrait<IntNode>::index(),
805 typeName); 805 type_name);
806 } 806 }
807 807
808 static IntNode* create(int i) { return new IntNode(i); } 808 static IntNode* create(int i) { return new IntNode(i); }
809 809
810 DEFINE_INLINE_TRACE() {} 810 DEFINE_INLINE_TRACE() {}
811 811
812 int value() { return m_value; } 812 int value() { return m_value; }
813 813
814 private: 814 private:
815 IntNode(int i) : m_value(i) {} 815 IntNode(int i) : m_value(i) {}
(...skipping 5989 matching lines...) Expand 10 before | Expand all | Expand 10 after
6805 "HeapVector"); 6805 "HeapVector");
6806 static_assert( 6806 static_assert(
6807 WTF::IsGarbageCollectedType<HeapDeque<Member<IntWrapper>>>::value, 6807 WTF::IsGarbageCollectedType<HeapDeque<Member<IntWrapper>>>::value,
6808 "HeapDeque"); 6808 "HeapDeque");
6809 static_assert(WTF::IsGarbageCollectedType< 6809 static_assert(WTF::IsGarbageCollectedType<
6810 HeapTerminatedArray<Member<IntWrapper>>>::value, 6810 HeapTerminatedArray<Member<IntWrapper>>>::value,
6811 "HeapTerminatedArray"); 6811 "HeapTerminatedArray");
6812 } 6812 }
6813 6813
6814 } // namespace blink 6814 } // namespace blink
OLDNEW
« no previous file with comments | « third_party/WebKit/Source/platform/heap/BlinkGC.h ('k') | third_party/WebKit/Source/platform/heap/ThreadState.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698