Remove internal uses of deprecated MakeWeak.

src/d8.cc

 // 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 30 matching lines @@
 #include <sys/stat.h>
 
 #ifdef V8_SHARED
 #include <assert.h>
 #endif  // V8_SHARED
 
 #ifndef V8_SHARED
 #include <algorithm>
 #endif  // !V8_SHARED
 
+#include <utility>

[Michael Starzinger, 2013/12/02 15:34:10]

nit: Can we move this up to the other system includes (i.e. line 42) and
alpha-sort that block?

[Sven Panne, 2013/12/02 17:30:53]

Nope, the presubmit check insists on this order: C headers, then C++ header,
then own headers. :-P

+
 #ifdef V8_SHARED
 #include "../include/v8-testing.h"
 #endif  // V8_SHARED
 
 #ifdef ENABLE_VTUNE_JIT_INTERFACE
 #include "third_party/vtune/v8-vtune.h"
 #endif
 
 #include "d8.h"
 
@@ skipping 1029 matching lines @@
   chars[size] = '\0';
   for (int i = 0; i < size;) {
     int read = static_cast<int>(fread(&chars[i], 1, size - i, file));
     i += read;
   }
   fclose(file);
   *size_out = size;
   return chars;
 }
 
-static void ReadBufferWeakCallback(v8::Isolate* isolate,
-                                   Persistent<ArrayBuffer>* array_buffer,
-                                   uint8_t* data) {
-  size_t byte_length =
-      Local<ArrayBuffer>::New(isolate, *array_buffer)->ByteLength();
-  isolate->AdjustAmountOfExternalAllocatedMemory(
-      -static_cast<intptr_t>(byte_length));
-
-  delete[] data;
-  array_buffer->Reset();
+static void ReadBufferWeakCallback(
+    const WeakCallbackData<v8::ArrayBuffer,
+                           std::pair<v8::Persistent<v8::ArrayBuffer>*,
+                                     uint8_t*> >& data) {
+  data.GetIsolate()->AdjustAmountOfExternalAllocatedMemory(
+      -data.GetValue()->ByteLength());

[Michael Starzinger, 2013/12/02 15:34:10]

I guess there will be some casting problem between size_t and intptr_t here on
some compiler. But we will see.

[Sven Panne, 2013/12/02 17:30:53]

To be honest, I would prefer to see a compiler warning (if any) compared to a
silent wrong conversion. In general, our use of integral types makes me cry,
almost every API is broken, so it's hard to get the call sites right if you have
2 wrong types for impedance matching. :-P

+  delete[] data.GetParameter()->second;
+  data.GetParameter()->first->Reset();
 }
 
 
 void Shell::ReadBuffer(const v8::FunctionCallbackInfo<v8::Value>& args) {
   ASSERT(sizeof(char) == sizeof(uint8_t));  // NOLINT
   String::Utf8Value filename(args[0]);
   int length;
   if (*filename == NULL) {
     Throw(args.GetIsolate(), "Error loading file");
     return;
   }
 
   Isolate* isolate = args.GetIsolate();
   uint8_t* data = reinterpret_cast<uint8_t*>(
       ReadChars(args.GetIsolate(), *filename, &length));
   if (data == NULL) {
     Throw(args.GetIsolate(), "Error reading file");
     return;
   }
   Handle<v8::ArrayBuffer> buffer = ArrayBuffer::New(isolate, data, length);
   v8::Persistent<v8::ArrayBuffer> weak_handle(isolate, buffer);
-  weak_handle.MakeWeak(data, ReadBufferWeakCallback);
+  std::pair<v8::Persistent<v8::ArrayBuffer>*, uint8_t*> pair(&weak_handle,
+                                                             data);
+  weak_handle.SetWeak(&pair, ReadBufferWeakCallback);
   weak_handle.MarkIndependent();
   isolate->AdjustAmountOfExternalAllocatedMemory(length);
 
   args.GetReturnValue().Set(buffer);
 }
 
 
 #ifndef V8_SHARED
 static char* ReadToken(char* data, char token) {
   char* next = i::OS::StrChr(data, token);
@@ skipping 613 matching lines @@
 }
 
 }  // namespace v8
 
 
 #ifndef GOOGLE3
 int main(int argc, char* argv[]) {
   return v8::Shell::Main(argc, argv);
 }
 #endif