Revert PropertyCallbackInfo::This() signature change from r21022.

src/accessors.cc

 // Copyright 2012 the V8 project authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "v8.h"
 #include "accessors.h"
 
 #include "compiler.h"
 #include "contexts.h"
 #include "deoptimizer.h"
 #include "execution.h"
 #include "factory.h"
 #include "frames-inl.h"
 #include "isolate.h"
 #include "list-inl.h"
 #include "property-details.h"
 #include "api.h"
 
 namespace v8 {
 namespace internal {
 
 
+// We have a slight impedance mismatch between the external API and the way we
+// use callbacks internally: Externally, callbacks can only be used with
+// v8::Object, but internally we even have callbacks on entities which are
+// higher in the hierarchy, so we can only return i::Object here, not
+// i::JSObject.
+Handle<Object> GetThisFrom(const v8::PropertyCallbackInfo<v8::Value>& info) {
+  return Utils::OpenHandle(*v8::Local<v8::Value>(info.This()));
+}
+
+
 Handle<AccessorInfo> Accessors::MakeAccessor(
     Isolate* isolate,
     Handle<String> name,
     AccessorGetterCallback getter,
     AccessorSetterCallback setter,
     PropertyAttributes attributes) {
   Factory* factory = isolate->factory();
   Handle<ExecutableAccessorInfo> info = factory->NewExecutableAccessorInfo();
   info->set_property_attributes(attributes);
   info->set_all_can_read(false);
@@ skipping 106 matching lines @@
   return value;
 }
 
 
 void Accessors::ArrayLengthGetter(
     v8::Local<v8::String> name,
     const v8::PropertyCallbackInfo<v8::Value>& info) {
   i::Isolate* isolate = reinterpret_cast<i::Isolate*>(info.GetIsolate());
   DisallowHeapAllocation no_allocation;
   HandleScope scope(isolate);
-  Object* object = *Utils::OpenHandle(*info.This());
+  Object* object = *GetThisFrom(info);
   // Traverse the prototype chain until we reach an array.
   JSArray* holder = FindInstanceOf<JSArray>(isolate, object);
   Object* result;
   if (holder != NULL) {
     result = holder->length();
   } else {
     result = Smi::FromInt(0);
   }
   info.GetReturnValue().Set(Utils::ToLocal(Handle<Object>(result, isolate)));
 }
@@ skipping 62 matching lines @@
 //
 // Accessors::StringLength
 //
 
 void Accessors::StringLengthGetter(
     v8::Local<v8::String> name,
     const v8::PropertyCallbackInfo<v8::Value>& info) {
   i::Isolate* isolate = reinterpret_cast<i::Isolate*>(info.GetIsolate());
   DisallowHeapAllocation no_allocation;
   HandleScope scope(isolate);
-  Object* value = *Utils::OpenHandle(*info.This());
+  Object* value = *GetThisFrom(info);
   Object* result;
   if (value->IsJSValue()) value = JSValue::cast(value)->value();
   if (value->IsString()) {
     result = Smi::FromInt(String::cast(value)->length());
   } else {
     // If object is not a string we return 0 to be compatible with WebKit.
     // Note: Firefox returns the length of ToString(object).
     result = Smi::FromInt(0);
   }
   info.GetReturnValue().Set(Utils::ToLocal(Handle<Object>(result, isolate)));
@@ skipping 574 matching lines @@
   Isolate* isolate = function->GetIsolate();
   return SetFunctionPrototype(isolate, function, prototype);
 }
 
 
 void Accessors::FunctionPrototypeGetter(
     v8::Local<v8::String> name,
     const v8::PropertyCallbackInfo<v8::Value>& info) {
   i::Isolate* isolate = reinterpret_cast<i::Isolate*>(info.GetIsolate());
   HandleScope scope(isolate);
-  Handle<Object> object = Utils::OpenHandle(*info.This());
+  Handle<Object> object = GetThisFrom(info);
   Handle<Object> result = GetFunctionPrototype(isolate, object);
   info.GetReturnValue().Set(Utils::ToLocal(result));
 }
 
 
 void Accessors::FunctionPrototypeSetter(
     v8::Local<v8::String> name,
     v8::Local<v8::Value> val,
     const v8::PropertyCallbackInfo<void>& info) {
   i::Isolate* isolate = reinterpret_cast<i::Isolate*>(info.GetIsolate());
@@ skipping 19 matching lines @@
 //
 // Accessors::FunctionLength
 //
 
 
 void Accessors::FunctionLengthGetter(
     v8::Local<v8::String> name,
     const v8::PropertyCallbackInfo<v8::Value>& info) {
   i::Isolate* isolate = reinterpret_cast<i::Isolate*>(info.GetIsolate());
   HandleScope scope(isolate);
-  Handle<Object> object = Utils::OpenHandle(*info.This());
+  Handle<Object> object = GetThisFrom(info);
   MaybeHandle<JSFunction> maybe_function;
 
   {
     DisallowHeapAllocation no_allocation;
     JSFunction* function = FindInstanceOf<JSFunction>(isolate, *object);
     if (function != NULL) maybe_function = Handle<JSFunction>(function);
   }
 
   int length = 0;
   Handle<JSFunction> function;
@@ skipping 37 matching lines @@
 //
 // Accessors::FunctionName
 //
 
 
 void Accessors::FunctionNameGetter(
     v8::Local<v8::String> name,
     const v8::PropertyCallbackInfo<v8::Value>& info) {
   i::Isolate* isolate = reinterpret_cast<i::Isolate*>(info.GetIsolate());
   HandleScope scope(isolate);
-  Handle<Object> object = Utils::OpenHandle(*info.This());
+  Handle<Object> object = GetThisFrom(info);
   MaybeHandle<JSFunction> maybe_function;
 
   {
     DisallowHeapAllocation no_allocation;
     JSFunction* function = FindInstanceOf<JSFunction>(isolate, *object);
     if (function != NULL) maybe_function = Handle<JSFunction>(function);
   }
 
   Handle<JSFunction> function;
   Handle<Object> result;
@@ skipping 128 matching lines @@
 Handle<Object> Accessors::FunctionGetArguments(Handle<JSFunction> function) {
   return GetFunctionArguments(function->GetIsolate(), function);
 }
 
 
 void Accessors::FunctionArgumentsGetter(
     v8::Local<v8::String> name,
     const v8::PropertyCallbackInfo<v8::Value>& info) {
   i::Isolate* isolate = reinterpret_cast<i::Isolate*>(info.GetIsolate());
   HandleScope scope(isolate);
-  Handle<Object> object = Utils::OpenHandle(*info.This());
+  Handle<Object> object = GetThisFrom(info);
   MaybeHandle<JSFunction> maybe_function;
 
   {
     DisallowHeapAllocation no_allocation;
     JSFunction* function = FindInstanceOf<JSFunction>(isolate, *object);
     if (function != NULL) maybe_function = Handle<JSFunction>(function);
   }
 
   Handle<JSFunction> function;
   Handle<Object> result;
@@ skipping 118 matching lines @@
   }
   return Handle<JSFunction>(caller);
 }
 
 
 void Accessors::FunctionCallerGetter(
     v8::Local<v8::String> name,
     const v8::PropertyCallbackInfo<v8::Value>& info) {
   i::Isolate* isolate = reinterpret_cast<i::Isolate*>(info.GetIsolate());
   HandleScope scope(isolate);
-  Handle<Object> object = Utils::OpenHandle(*info.This());
+  Handle<Object> object = GetThisFrom(info);
   MaybeHandle<JSFunction> maybe_function;
   {
     DisallowHeapAllocation no_allocation;
     JSFunction* function = FindInstanceOf<JSFunction>(isolate, *object);
     if (function != NULL) maybe_function = Handle<JSFunction>(function);
   }
   Handle<JSFunction> function;
   Handle<Object> result;
   if (maybe_function.ToHandle(&function)) {
     MaybeHandle<JSFunction> maybe_caller;
@@ skipping 88 matching lines @@
   info->set_data(Smi::FromInt(index));
   Handle<Object> getter = v8::FromCData(isolate, &ModuleGetExport);
   Handle<Object> setter = v8::FromCData(isolate, &ModuleSetExport);
   info->set_getter(*getter);
   if (!(attributes & ReadOnly)) info->set_setter(*setter);
   return info;
 }
 
 
 } }  // namespace v8::internal