Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(115)

Side by Side Diff: src/object-observe.js

Issue 14779011: Implement Object.getNotifier(obj).performChange() (Closed) Base URL: https://v8.googlecode.com/svn/branches/bleeding_edge
Patch Set: cr changes Created 7 years, 7 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « src/messages.js ('k') | test/mjsunit/harmony/object-observe.js » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright 2012 the V8 project authors. All rights reserved. 1 // Copyright 2012 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 48 matching lines...) Expand 10 before | Expand all | Expand 10 after
59 var observerInfoMap = 59 var observerInfoMap =
60 new ObservationWeakMap(observationState.observerInfoMap); 60 new ObservationWeakMap(observationState.observerInfoMap);
61 var objectInfoMap = new ObservationWeakMap(observationState.objectInfoMap); 61 var objectInfoMap = new ObservationWeakMap(observationState.objectInfoMap);
62 var notifierTargetMap = 62 var notifierTargetMap =
63 new ObservationWeakMap(observationState.notifierTargetMap); 63 new ObservationWeakMap(observationState.notifierTargetMap);
64 64
65 function CreateObjectInfo(object) { 65 function CreateObjectInfo(object) {
66 var info = { 66 var info = {
67 changeObservers: new InternalArray, 67 changeObservers: new InternalArray,
68 notifier: null, 68 notifier: null,
69 inactiveObservers: new InternalArray,
70 performing: { __proto__: null },
71 performingCount: 0,
69 }; 72 };
70 objectInfoMap.set(object, info); 73 objectInfoMap.set(object, info);
71 return info; 74 return info;
72 } 75 }
73 76
74 function ObjectObserve(object, callback) { 77 var defaultAcceptTypes = {
78 __proto__: null,
79 'new': true,
80 'updated': true,
81 'deleted': true,
82 'prototype': true,
83 'reconfigured': true
84 };
85
86 function CreateObserver(callback, accept) {
87 var observer = {
88 __proto__: null,
89 callback: callback,
90 accept: defaultAcceptTypes
91 };
92
93 if (IS_UNDEFINED(accept))
94 return observer;
95
96 var acceptMap = { __proto__: null };
97 for (var i = 0; i < accept.length; i++)
98 acceptMap[accept[i]] = true;
99
100 observer.accept = acceptMap;
101 return observer;
102 }
103
104 function ObserverIsActive(observer, objectInfo) {
105 if (objectInfo.performingCount === 0)
106 return true;
107
108 var performing = objectInfo.performing;
109 for (var type in performing) {
110 if (performing[type] > 0 && observer.accept[type])
111 return false;
112 }
113
114 return true;
115 }
116
117 function ObserverIsInactive(observer, objectInfo) {
118 return !ObserverIsActive(observer, objectInfo);
119 }
120
121 function RemoveNullElements(from) {
122 var i = 0;
123 var j = 0;
124 for (; i < from.length; i++) {
125 if (from[i] === null)
126 continue;
127 if (j < i)
128 from[j] = from[i];
129 j++;
130 }
131
132 if (i !== j)
133 from.length = from.length - (i - j);
134 }
135
136 function RepartitionObservers(conditionFn, from, to, objectInfo) {
137 var anyRemoved = false;
138 for (var i = 0; i < from.length; i++) {
139 var observer = from[i];
140 if (conditionFn(observer, objectInfo)) {
141 anyRemoved = true;
142 from[i] = null;
143 to.push(observer);
144 }
145 }
146
147 if (anyRemoved)
148 RemoveNullElements(from);
149 }
150
151 function BeginPerformChange(objectInfo, type) {
152 objectInfo.performing[type] = (objectInfo.performing[type] || 0) + 1;
153 objectInfo.performingCount++;
154 RepartitionObservers(ObserverIsInactive,
155 objectInfo.changeObservers,
156 objectInfo.inactiveObservers,
157 objectInfo);
158 }
159
160 function EndPerformChange(objectInfo, type) {
161 objectInfo.performing[type]--;
162 objectInfo.performingCount--;
163 RepartitionObservers(ObserverIsActive,
164 objectInfo.inactiveObservers,
165 objectInfo.changeObservers,
166 objectInfo);
167 }
168
169 function ensureObserverRemoved(objectInfo, callback) {
170 function remove(observerList) {
171 for (var i = 0; i < observerList.length; i++) {
172 if (observerList[i].callback === callback) {
173 observerList.splice(i, 1);
174 return true;
175 }
176 }
177 return false;
178 }
179
180 if (!remove(objectInfo.changeObservers))
181 remove(objectInfo.inactiveObservers);
182 }
183
184 function AcceptArgIsValid(arg) {
185 if (IS_UNDEFINED(arg))
186 return true;
187
188 if (!IS_SPEC_OBJECT(arg) ||
189 !IS_NUMBER(arg.length) ||
190 arg.length < 0)
191 return false;
192
193 var length = arg.length;
194 for (var i = 0; i < length; i++) {
195 if (!IS_STRING(arg[i]))
arv (Not doing code reviews) 2013/05/15 13:52:34 Is this what we really want? Generally the platfor
196 return false;
197 }
198 return true;
199 }
200
201 function ObjectObserve(object, callback, accept) {
75 if (!IS_SPEC_OBJECT(object)) 202 if (!IS_SPEC_OBJECT(object))
76 throw MakeTypeError("observe_non_object", ["observe"]); 203 throw MakeTypeError("observe_non_object", ["observe"]);
77 if (!IS_SPEC_FUNCTION(callback)) 204 if (!IS_SPEC_FUNCTION(callback))
78 throw MakeTypeError("observe_non_function", ["observe"]); 205 throw MakeTypeError("observe_non_function", ["observe"]);
79 if (ObjectIsFrozen(callback)) 206 if (ObjectIsFrozen(callback))
80 throw MakeTypeError("observe_callback_frozen"); 207 throw MakeTypeError("observe_callback_frozen");
208 if (!AcceptArgIsValid(accept))
209 throw MakeTypeError("observe_accept_invalid");
81 210
82 if (!observerInfoMap.has(callback)) { 211 if (!observerInfoMap.has(callback)) {
83 observerInfoMap.set(callback, { 212 observerInfoMap.set(callback, {
84 pendingChangeRecords: null, 213 pendingChangeRecords: null,
85 priority: observationState.observerPriority++, 214 priority: observationState.observerPriority++,
86 }); 215 });
87 } 216 }
88 217
89 var objectInfo = objectInfoMap.get(object); 218 var objectInfo = objectInfoMap.get(object);
90 if (IS_UNDEFINED(objectInfo)) objectInfo = CreateObjectInfo(object); 219 if (IS_UNDEFINED(objectInfo)) objectInfo = CreateObjectInfo(object);
91 %SetIsObserved(object, true); 220 %SetIsObserved(object, true);
92 221
93 var changeObservers = objectInfo.changeObservers; 222 ensureObserverRemoved(objectInfo, callback);
94 if (changeObservers.indexOf(callback) < 0) changeObservers.push(callback); 223
224 var observer = CreateObserver(callback, accept);
225 if (ObserverIsActive(observer, objectInfo))
226 objectInfo.changeObservers.push(observer);
227 else
228 objectInfo.inactiveObservers.push(observer);
95 229
96 return object; 230 return object;
97 } 231 }
98 232
99 function ObjectUnobserve(object, callback) { 233 function ObjectUnobserve(object, callback) {
100 if (!IS_SPEC_OBJECT(object)) 234 if (!IS_SPEC_OBJECT(object))
101 throw MakeTypeError("observe_non_object", ["unobserve"]); 235 throw MakeTypeError("observe_non_object", ["unobserve"]);
102 if (!IS_SPEC_FUNCTION(callback)) 236 if (!IS_SPEC_FUNCTION(callback))
103 throw MakeTypeError("observe_non_function", ["unobserve"]); 237 throw MakeTypeError("observe_non_function", ["unobserve"]);
104 238
105 var objectInfo = objectInfoMap.get(object); 239 var objectInfo = objectInfoMap.get(object);
106 if (IS_UNDEFINED(objectInfo)) 240 if (IS_UNDEFINED(objectInfo))
107 return object; 241 return object;
108 242
109 var changeObservers = objectInfo.changeObservers; 243 ensureObserverRemoved(objectInfo, callback);
110 var index = changeObservers.indexOf(callback); 244
111 if (index >= 0) { 245 if (objectInfo.changeObservers.length === 0 &&
112 changeObservers.splice(index, 1); 246 objectInfo.inactiveObservers.length === 0) {
113 if (changeObservers.length === 0) %SetIsObserved(object, false); 247 %SetIsObserved(object, false);
114 } 248 }
115 249
116 return object; 250 return object;
117 } 251 }
118 252
119 function EnqueueChangeRecord(changeRecord, observers) { 253 function EnqueueChangeRecord(changeRecord, observers) {
120 // TODO(rossberg): adjust once there is a story for symbols vs proxies. 254 // TODO(rossberg): adjust once there is a story for symbols vs proxies.
121 if (IS_SYMBOL(changeRecord.name)) return; 255 if (IS_SYMBOL(changeRecord.name)) return;
122 256
123 for (var i = 0; i < observers.length; i++) { 257 for (var i = 0; i < observers.length; i++) {
124 var observer = observers[i]; 258 var observer = observers[i];
125 var observerInfo = observerInfoMap.get(observer); 259 if (IS_UNDEFINED(observer.accept[changeRecord.type]))
126 observationState.pendingObservers[observerInfo.priority] = observer; 260 continue;
261
262 var callback = observer.callback;
263 var observerInfo = observerInfoMap.get(callback);
264 observationState.pendingObservers[observerInfo.priority] = callback;
127 %SetObserverDeliveryPending(); 265 %SetObserverDeliveryPending();
128 if (IS_NULL(observerInfo.pendingChangeRecords)) { 266 if (IS_NULL(observerInfo.pendingChangeRecords)) {
129 observerInfo.pendingChangeRecords = new InternalArray(changeRecord); 267 observerInfo.pendingChangeRecords = new InternalArray(changeRecord);
130 } else { 268 } else {
131 observerInfo.pendingChangeRecords.push(changeRecord); 269 observerInfo.pendingChangeRecords.push(changeRecord);
132 } 270 }
133 } 271 }
134 } 272 }
135 273
136 function NotifyChange(type, object, name, oldValue) { 274 function NotifyChange(type, object, name, oldValue) {
137 var objectInfo = objectInfoMap.get(object); 275 var objectInfo = objectInfoMap.get(object);
276 if (objectInfo.changeObservers.length === 0)
277 return;
278
138 var changeRecord = (arguments.length < 4) ? 279 var changeRecord = (arguments.length < 4) ?
139 { type: type, object: object, name: name } : 280 { type: type, object: object, name: name } :
140 { type: type, object: object, name: name, oldValue: oldValue }; 281 { type: type, object: object, name: name, oldValue: oldValue };
141 // TODO(rafaelw): This breaks spec-compliance. Re-enable when freezing isn't 282 // TODO(rafaelw): This breaks spec-compliance. Re-enable when freezing isn't
142 // slow. 283 // slow.
143 // ObjectFreeze(changeRecord); 284 // ObjectFreeze(changeRecord);
144 EnqueueChangeRecord(changeRecord, objectInfo.changeObservers); 285 EnqueueChangeRecord(changeRecord, objectInfo.changeObservers);
145 } 286 }
146 287
147 var notifierPrototype = {}; 288 var notifierPrototype = {};
(...skipping 18 matching lines...) Expand all
166 %DefineOrRedefineDataProperty(newRecord, prop, changeRecord[prop], 307 %DefineOrRedefineDataProperty(newRecord, prop, changeRecord[prop],
167 READ_ONLY + DONT_DELETE); 308 READ_ONLY + DONT_DELETE);
168 } 309 }
169 // TODO(rafaelw): This breaks spec-compliance. Re-enable when freezing isn't 310 // TODO(rafaelw): This breaks spec-compliance. Re-enable when freezing isn't
170 // slow. 311 // slow.
171 // ObjectFreeze(newRecord); 312 // ObjectFreeze(newRecord);
172 313
173 EnqueueChangeRecord(newRecord, objectInfo.changeObservers); 314 EnqueueChangeRecord(newRecord, objectInfo.changeObservers);
174 } 315 }
175 316
317 function ObjectNotifierPerformChange(changeType, changeFn, receiver) {
318 if (!IS_SPEC_OBJECT(this))
319 throw MakeTypeError("called_on_non_object", ["performChange"]);
320
321 var target = notifierTargetMap.get(this);
322 if (IS_UNDEFINED(target))
323 throw MakeTypeError("observe_notify_non_notifier");
324 if (!IS_STRING(changeType))
arv (Not doing code reviews) 2013/05/15 13:52:34 Same here... maybe just String(changeType) as need
325 throw MakeTypeError("observe_perform_non_string");
326 if (!IS_SPEC_FUNCTION(changeFn))
327 throw MakeTypeError("observe_perform_non_function");
328
329 if (IS_NULL_OR_UNDEFINED(receiver)) {
330 receiver = %GetDefaultReceiver(changeFn) || receiver;
331 } else if (!IS_SPEC_OBJECT(receiver) && %IsClassicModeFunction(changeFn)) {
332 receiver = ToObject(receiver);
333 }
334
335 var objectInfo = objectInfoMap.get(target);
336 if (IS_UNDEFINED(objectInfo))
337 return;
338
339 BeginPerformChange(objectInfo, changeType);
340 try {
341 %_CallFunction(receiver, changeFn);
342 } finally {
343 EndPerformChange(objectInfo, changeType);
344 }
345 }
346
176 function ObjectGetNotifier(object) { 347 function ObjectGetNotifier(object) {
177 if (!IS_SPEC_OBJECT(object)) 348 if (!IS_SPEC_OBJECT(object))
178 throw MakeTypeError("observe_non_object", ["getNotifier"]); 349 throw MakeTypeError("observe_non_object", ["getNotifier"]);
179 350
180 if (ObjectIsFrozen(object)) return null; 351 if (ObjectIsFrozen(object)) return null;
181 352
182 var objectInfo = objectInfoMap.get(object); 353 var objectInfo = objectInfoMap.get(object);
183 if (IS_UNDEFINED(objectInfo)) objectInfo = CreateObjectInfo(object); 354 if (IS_UNDEFINED(objectInfo)) objectInfo = CreateObjectInfo(object);
184 355
185 if (IS_NULL(objectInfo.notifier)) { 356 if (IS_NULL(objectInfo.notifier)) {
(...skipping 42 matching lines...) Expand 10 before | Expand all | Expand 10 after
228 399
229 function SetupObjectObserve() { 400 function SetupObjectObserve() {
230 %CheckIsBootstrapping(); 401 %CheckIsBootstrapping();
231 InstallFunctions($Object, DONT_ENUM, $Array( 402 InstallFunctions($Object, DONT_ENUM, $Array(
232 "deliverChangeRecords", ObjectDeliverChangeRecords, 403 "deliverChangeRecords", ObjectDeliverChangeRecords,
233 "getNotifier", ObjectGetNotifier, 404 "getNotifier", ObjectGetNotifier,
234 "observe", ObjectObserve, 405 "observe", ObjectObserve,
235 "unobserve", ObjectUnobserve 406 "unobserve", ObjectUnobserve
236 )); 407 ));
237 InstallFunctions(notifierPrototype, DONT_ENUM, $Array( 408 InstallFunctions(notifierPrototype, DONT_ENUM, $Array(
238 "notify", ObjectNotifierNotify 409 "notify", ObjectNotifierNotify,
410 "performChange", ObjectNotifierPerformChange
239 )); 411 ));
240 } 412 }
241 413
242 SetupObjectObserve(); 414 SetupObjectObserve();
OLDNEW
« no previous file with comments | « src/messages.js ('k') | test/mjsunit/harmony/object-observe.js » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698