Reviewers: rossberg, rafaelw,
Description:
Object.observe: notify of __proto__ changes
BUG=v8:2409
Please review this at https://codereview.chromium.org/11299260/
SVN Base: http://v8.googlecode.com/svn/branches/bleeding_edge
Affected files:
M src/accessors.cc
M test/mjsunit/harmony/object-observe.js
Index: src/accessors.cc
diff --git a/src/accessors.cc b/src/accessors.cc
index
a30bfd5e3c408e8afceb64e3c08ffae338ba21e6..652cf429c8c7e7040deea43248df3a9e99ab186d
100644
--- a/src/accessors.cc
+++ b/src/accessors.cc
@@ -758,7 +758,7 @@ const AccessorDescriptor Accessors::FunctionCaller = {
//
-MaybeObject* Accessors::ObjectGetPrototype(Object* receiver, void*) {
+static inline Object* GetPrototypeSkipHiddenPrototypes(Object* receiver) {
Object* current = receiver->GetPrototype();
while (current->IsJSObject() &&
JSObject::cast(current)->map()->is_hidden_prototype()) {
@@ -768,12 +768,36 @@ MaybeObject* Accessors::ObjectGetPrototype(Object*
receiver, void*) {
}
-MaybeObject* Accessors::ObjectSetPrototype(JSObject* receiver,
- Object* value,
+MaybeObject* Accessors::ObjectGetPrototype(Object* receiver, void*) {
+ return GetPrototypeSkipHiddenPrototypes(receiver);
+}
+
+
+MaybeObject* Accessors::ObjectSetPrototype(JSObject* receiver_raw,
+ Object* value_raw,
void*) {
- const bool skip_hidden_prototypes = true;
+ const bool kSkipHiddenPrototypes = true;
// To be consistent with other Set functions, return the value.
- return receiver->SetPrototype(value, skip_hidden_prototypes);
+ if (!(FLAG_harmony_observation && receiver_raw->map()->is_observed()))
+ return receiver_raw->SetPrototype(value_raw, kSkipHiddenPrototypes);
+
+ Isolate* isolate = receiver_raw->GetIsolate();
+ HandleScope scope(isolate);
+ Handle<JSObject> receiver(receiver_raw);
+ Handle<Object> value(value_raw);
+ Handle<Object> old_value(GetPrototypeSkipHiddenPrototypes(*receiver));
+
+ MaybeObject* result = receiver->SetPrototype(*value,
kSkipHiddenPrototypes);
+ Handle<Object> hresult;
+ if (!result->ToHandle(&hresult, isolate)) return result;
+
+ Handle<Object> new_proto(GetPrototypeSkipHiddenPrototypes(*receiver));
+ if (!new_proto->SameValue(*old_value)) {
+ JSObject::EnqueueChangeRecord(receiver, "prototype",
+ isolate->factory()->Proto_symbol(),
+ old_value);
+ }
+ return *hresult;
}
Index: test/mjsunit/harmony/object-observe.js
diff --git a/test/mjsunit/harmony/object-observe.js
b/test/mjsunit/harmony/object-observe.js
index
474bfcd3bc49bb7aeb8f7a8d92e97f725161ca5d..73edce263a8fc35fd324a0c256416dfbcf99a42a
100644
--- a/test/mjsunit/harmony/object-observe.js
+++ b/test/mjsunit/harmony/object-observe.js
@@ -811,3 +811,22 @@ observer.assertCallbackRecords([
{ object: array, name: '0', type: 'deleted', oldValue: 0 },
{ object: array, name: 'length', type: 'updated', oldValue: 1},
]);
+
+// __proto__
+reset();
+var obj = {};
+Object.observe(obj, observer.callback);
+var p = {foo: 'yes'};
+var q = {bar: 'no'};
+obj.__proto__ = p;
+obj.__proto__ = p; // ignored
+obj.__proto__ = null;
+obj.__proto__ = q;
+// TODO(adamk): Add tests for objects with hidden prototypes
+// once we support observing the global object.
+Object.deliverChangeRecords(observer.callback);
+observer.assertCallbackRecords([
+ { object: obj, name: '__proto__', type: 'prototype', oldValue:
Object.prototype },
+ { object: obj, name: '__proto__', type: 'prototype', oldValue: p },
+ { object: obj, name: '__proto__', type: 'prototype', oldValue: null },
+]);
--
v8-dev mailing list
[email protected]
http://groups.google.com/group/v8-dev
