Experimental: Merge 1395:1441 from bleeding_edge branch to the...

src/log.h

Index: src/log.h
===================================================================
--- src/log.h	(revision 1441)
+++ src/log.h	(working copy)
@@ -215,10 +215,6 @@
 
  private:
 
-  // Calculate the size of the code object to report for log events. This takes
-  // the layout of the code object into account.
-  static int CodeObjectSize(Code* code);
-
   // Emits the source code of a regexp. Used by regexp events.
   static void LogRegExpSource(Handle<JSRegExp> regexp);
 
@@ -268,6 +264,8 @@
   friend class Profiler;
   friend class SlidingStateWindow;
   friend class VMState;
+#else
+  static bool is_enabled() { return false; }
 #endif
 };
 
@@ -279,6 +277,7 @@
       : low_stack_bound_(low_stack_bound) { }
   void Trace(TickSample* sample);
  private:
+
   unsigned int low_stack_bound_;
 };