OLD | NEW |
1 // Copyright 2013 the V8 project authors. All rights reserved. | 1 // Copyright 2013 the V8 project authors. All rights reserved. |
2 // Redistribution and use in source and binary forms, with or without | 2 // Redistribution and use in source and binary forms, with or without |
3 // modification, are permitted provided that the following conditions are | 3 // modification, are permitted provided that the following conditions are |
4 // met: | 4 // met: |
5 // | 5 // |
6 // * Redistributions of source code must retain the above copyright | 6 // * Redistributions of source code must retain the above copyright |
7 // notice, this list of conditions and the following disclaimer. | 7 // notice, this list of conditions and the following disclaimer. |
8 // * Redistributions in binary form must reproduce the above | 8 // * Redistributions in binary form must reproduce the above |
9 // copyright notice, this list of conditions and the following | 9 // copyright notice, this list of conditions and the following |
10 // disclaimer in the documentation and/or other materials provided | 10 // disclaimer in the documentation and/or other materials provided |
(...skipping 83 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
94 const char* class_name, | 94 const char* class_name, |
95 int internal_field, | 95 int internal_field, |
96 const char* descriptor_name = NULL, | 96 const char* descriptor_name = NULL, |
97 v8::Handle<v8::DeclaredAccessorDescriptor> descriptor = | 97 v8::Handle<v8::DeclaredAccessorDescriptor> descriptor = |
98 v8::Handle<v8::DeclaredAccessorDescriptor>()) { | 98 v8::Handle<v8::DeclaredAccessorDescriptor>()) { |
99 v8::Local<v8::FunctionTemplate> constructor = v8::FunctionTemplate::New(); | 99 v8::Local<v8::FunctionTemplate> constructor = v8::FunctionTemplate::New(); |
100 v8::Local<v8::ObjectTemplate> obj_template = constructor->InstanceTemplate(); | 100 v8::Local<v8::ObjectTemplate> obj_template = constructor->InstanceTemplate(); |
101 // Setup object template. | 101 // Setup object template. |
102 if (descriptor_name != NULL && !descriptor.IsEmpty()) { | 102 if (descriptor_name != NULL && !descriptor.IsEmpty()) { |
103 bool added_accessor = | 103 bool added_accessor = |
104 obj_template->SetAccessor(v8_str(descriptor_name), descriptor); | 104 obj_template->SetDeclaredAccessor(v8_str(descriptor_name), descriptor); |
105 CHECK(added_accessor); | 105 CHECK(added_accessor); |
106 } | 106 } |
107 obj_template->SetInternalFieldCount((internal_field+1)*2 + 7); | 107 obj_template->SetInternalFieldCount((internal_field+1)*2 + 7); |
108 context->Global()->Set(v8_str(class_name), constructor->GetFunction()); | 108 context->Global()->Set(v8_str(class_name), constructor->GetFunction()); |
109 return obj_template; | 109 return obj_template; |
110 } | 110 } |
111 | 111 |
112 | 112 |
113 static void VerifyRead(v8::Handle<v8::DeclaredAccessorDescriptor> descriptor, | 113 static void VerifyRead(v8::Handle<v8::DeclaredAccessorDescriptor> descriptor, |
114 int internal_field, | 114 int internal_field, |
115 void* internal_object, | 115 void* internal_object, |
116 v8::Handle<v8::Value> expected_value) { | 116 v8::Handle<v8::Value> expected_value) { |
117 LocalContext local_context; | 117 LocalContext local_context; |
118 v8::HandleScope scope(local_context->GetIsolate()); | 118 v8::HandleScope scope(local_context->GetIsolate()); |
119 v8::Handle<v8::Context> context = local_context.local(); | 119 v8::Handle<v8::Context> context = local_context.local(); |
120 CreateConstructor(context, "Accessible", internal_field, "x", descriptor); | 120 CreateConstructor(context, "Accessible", internal_field, "x", descriptor); |
121 // Setup object. | 121 // Setup object. |
122 CompileRun("var accessible = new Accessible();"); | 122 CompileRun("var accessible = new Accessible();"); |
123 v8::Local<v8::Object> obj = v8::Local<v8::Object>::Cast( | 123 v8::Local<v8::Object> obj = v8::Local<v8::Object>::Cast( |
124 context->Global()->Get(v8_str("accessible"))); | 124 context->Global()->Get(v8_str("accessible"))); |
125 obj->SetAlignedPointerInInternalField(internal_field, internal_object); | 125 obj->SetAlignedPointerInInternalField(internal_field, internal_object); |
126 bool added_accessor; | 126 bool added_accessor; |
127 added_accessor = obj->SetAccessor(v8_str("y"), descriptor); | 127 added_accessor = obj->SetDeclaredAccessor(v8_str("y"), descriptor); |
128 CHECK(added_accessor); | 128 CHECK(added_accessor); |
129 added_accessor = obj->SetAccessor(v8_str("13"), descriptor); | 129 added_accessor = obj->SetDeclaredAccessor(v8_str("13"), descriptor); |
130 CHECK(added_accessor); | 130 CHECK(added_accessor); |
131 // Test access from template getter. | 131 // Test access from template getter. |
132 v8::Local<v8::Value> value; | 132 v8::Local<v8::Value> value; |
133 value = CompileRun("accessible.x;"); | 133 value = CompileRun("accessible.x;"); |
134 CHECK_EQ(expected_value, value); | 134 CHECK_EQ(expected_value, value); |
135 value = CompileRun("accessible['x'];"); | 135 value = CompileRun("accessible['x'];"); |
136 CHECK_EQ(expected_value, value); | 136 CHECK_EQ(expected_value, value); |
137 // Test access from object getter. | 137 // Test access from object getter. |
138 value = CompileRun("accessible.y;"); | 138 value = CompileRun("accessible.y;"); |
139 CHECK_EQ(expected_value, value); | 139 CHECK_EQ(expected_value, value); |
(...skipping 151 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
291 int internal_field = 0; | 291 int internal_field = 0; |
292 v8::Handle<v8::DeclaredAccessorDescriptor> descriptor = | 292 v8::Handle<v8::DeclaredAccessorDescriptor> descriptor = |
293 OOD::NewInternalFieldDereference(helper.isolate_, internal_field) | 293 OOD::NewInternalFieldDereference(helper.isolate_, internal_field) |
294 ->NewRawShift(helper.isolate_, index*kPointerSize) | 294 ->NewRawShift(helper.isolate_, index*kPointerSize) |
295 ->NewHandleDereference(helper.isolate_); | 295 ->NewHandleDereference(helper.isolate_); |
296 HandleArray* array = *helper.handle_array_; | 296 HandleArray* array = *helper.handle_array_; |
297 v8::Handle<v8::String> expected = v8_str("whatever"); | 297 v8::Handle<v8::String> expected = v8_str("whatever"); |
298 array->handles_[index].Reset(helper.isolate_, expected); | 298 array->handles_[index].Reset(helper.isolate_, expected); |
299 VerifyRead(descriptor, internal_field, array, expected); | 299 VerifyRead(descriptor, internal_field, array, expected); |
300 } | 300 } |
OLD | NEW |