Merged r11308, r11311, r11313 into trunk branch.

include/v8.h

 // Copyright 2012 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 1951 matching lines @@
 class Arguments {
  public:
   inline int Length() const;
   inline Local<Value> operator[](int i) const;
   inline Local<Function> Callee() const;
   inline Local<Object> This() const;
   inline Local<Object> Holder() const;
   inline bool IsConstructCall() const;
   inline Local<Value> Data() const;
   inline Isolate* GetIsolate() const;
+
  private:
   static const int kIsolateIndex = 0;
   static const int kDataIndex = -1;
   static const int kCalleeIndex = -2;
   static const int kHolderIndex = -3;
 
   friend class ImplementationUtilities;
   inline Arguments(internal::Object** implicit_args,
                    internal::Object** values,
                    int length,
@@ skipping 10 matching lines @@
  * of the property access.
  */
 class V8EXPORT AccessorInfo {
  public:
   inline AccessorInfo(internal::Object** args)
       : args_(args) { }
   inline Isolate* GetIsolate() const;
   inline Local<Value> Data() const;
   inline Local<Object> This() const;
   inline Local<Object> Holder() const;
+
  private:
   internal::Object** args_;
 };
 
 
 typedef Handle<Value> (*InvocationCallback)(const Arguments& args);
 
 /**
  * NamedProperty[Getter|Setter] are used as interceptors on object.
  * See ObjectTemplate::SetNamedPropertyHandler.
@@ skipping 1751 matching lines @@
    * Writes the next chunk of snapshot data into the stream. Writing
    * can be stopped by returning kAbort as function result. EndOfStream
    * will not be called in case writing was aborted.
    */
   virtual WriteResult WriteAsciiChunk(char* data, int size) = 0;
   /**
    * Writes the next chunk of heap stats data into the stream. Writing
    * can be stopped by returning kAbort as function result. EndOfStream
    * will not be called in case writing was aborted.
    */
-  virtual WriteResult WriteUint32Chunk(uint32_t* data, int count) = 0;
+  // TODO(loislo): Make this pure virtual when WebKit's V8 bindings
+  // have been updated.
+  virtual WriteResult WriteUint32Chunk(uint32_t* data, int count) {
+    return kAbort;
+  };
 };
 
 
 /**
  * An interface for reporting progress and controlling long-running
  * activities.
  */
 class V8EXPORT ActivityControl {  // NOLINT
  public:
   enum ControlOption {
@@ skipping 548 matching lines @@
 
 
 }  // namespace v8
 
 
 #undef V8EXPORT
 #undef TYPE_CHECK
 
 
 #endif  // V8_H_