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

src/v8globals.h

 // Copyright 2010 the V8 project authors. All rights reserved.
 // Redistribution and use in source and binary forms, with or without
 // modification, are permitted provided that the following conditions are
 // met:
 //
 //     * Redistributions of source code must retain the above copyright
 //       notice, this list of conditions and the following disclaimer.
 //     * Redistributions in binary form must reproduce the above
 //       copyright notice, this list of conditions and the following
 //       disclaimer in the documentation and/or other materials provided
@@ skipping 306 matching lines @@
 
 
 // The Store Buffer (GC).
 typedef enum {
   kStoreBufferFullEvent,
   kStoreBufferStartScanningPagesEvent,
   kStoreBufferScanningPageEvent
 } StoreBufferEvent;
 
 
-typedef void (*StoreBufferCallback)(MemoryChunk* page, StoreBufferEvent event);
+typedef void (*StoreBufferCallback)(Heap* heap,
+                                    MemoryChunk* page,
+                                    StoreBufferEvent event);
 
 
 // Type of properties.
 // Order of properties is significant.
 // Must fit in the BitField PropertyDetails::TypeField.
 // A copy of this is in mirror-debugger.js.
 enum PropertyType {
   NORMAL              = 0,  // only in slow mode
   FIELD               = 1,  // only in fast mode
   CONSTANT_FUNCTION   = 2,  // only in fast mode
@@ skipping 112 matching lines @@
 
 // Support for tracking C++ memory allocation.  Insert TRACK_MEMORY("Fisk")
 // inside a C++ class and new and delete will be overloaded so logging is
 // performed.
 // This file (globals.h) is included before log.h, so we use direct calls to
 // the Logger rather than the LOG macro.
 #ifdef DEBUG
 #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
 #define TRACK_MEMORY(name)
 #endif
 
 
 // Feature flags bit positions. They are mostly based on the CPUID spec.
 // (We assign CPUID itself to one of the currently reserved bits --
 // feel free to change this if needed.)
@@ skipping 14 matching lines @@
   kStrictMode,
   // This value is never used, but is needed to prevent GCC 4.5 from failing
   // to compile when we assert that a flag is either kNonStrictMode or
   // kStrictMode.
   kInvalidStrictFlag
 };
 
 } }  // namespace v8::internal
 
 #endif  // V8_V8GLOBALS_H_