Merge (7265, 7271] from bleeding_edge to experimental/gc branch....

src/v8globals.h

Index: src/v8globals.h
===================================================================
--- src/v8globals.h	(revision 7563)
+++ src/v8globals.h	(working copy)
@@ -324,7 +324,9 @@
 } StoreBufferEvent;
 
 
-typedef void (*StoreBufferCallback)(MemoryChunk* page, StoreBufferEvent event);
+typedef void (*StoreBufferCallback)(Heap* heap,
+                                    MemoryChunk* page,
+                                    StoreBufferEvent event);
 
 
 // Type of properties.
@@ -457,11 +459,11 @@
 #define TRACK_MEMORY(name) \
   void* operator new(size_t size) { \
     void* result = ::operator new(size); \
-    Logger::NewEvent(name, result, size); \
+    Logger::NewEventStatic(name, result, size); \
     return result; \
   } \
   void operator delete(void* object) { \
-    Logger::DeleteEvent(name, object); \
+    Logger::DeleteEventStatic(name, object); \
     ::operator delete(object); \
   }
 #else