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

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: remove DS_Store 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) {
rossberg 2013/05/13 16:39:17 Nit: can we capitalise functions consistently?
rafaelw 2013/05/13 17:52:46 Done.
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++, j++) {
rossberg 2013/05/13 16:39:17 I think you can simplify the logic of this loop by
rafaelw 2013/05/13 17:52:46 Done.
125 if (from[i] === null) {
126 j--;
127 } else if (j < i) {
128 from[j] = from[i];
129 }
130 }
131
132 if (i !== j)
133 from.length = from.length - (i - j);
134 }
135
136 function moveObserversWhichAre(conditionFn, from, to, objectInfo) {
rossberg 2013/05/13 16:39:17 Aren't all observers? :) Can we perhaps call this
rafaelw 2013/05/13 17:52:46 Done.
rafaelw 2013/05/13 17:52:46 Done.
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 if (IS_UNDEFINED(objectInfo.performing[type]))
rossberg 2013/05/13 16:39:17 How about writing this as: objectInfo.performing[
rafaelw 2013/05/13 17:52:46 Done.
153 objectInfo.performing[type] = 1
154 else
155 objectInfo.performing[type]++;
156
157 objectInfo.performingCount++;
158 moveObserversWhichAre(observerIsInactive,
159 objectInfo.changeObservers,
160 objectInfo.inactiveObservers,
161 objectInfo);
162 }
163
164 function EndPerformChange(objectInfo, type) {
165 objectInfo.performing[type]--;
166 objectInfo.performingCount--;
167 moveObserversWhichAre(observerIsActive,
168 objectInfo.inactiveObservers,
169 objectInfo.changeObservers,
170 objectInfo);
171 }
172
173 function ensureObserverRemoved(objectInfo, callback) {
174 function remove(observerList) {
175 for (var i = 0; i < observerList.length; i++) {
176 if (observerList[i].callback === callback) {
177 observerList.splice(i, 1);
178 return true;
179 }
180 }
181 return false;
182 }
183
184 if (!remove(objectInfo.changeObservers))
185 remove(objectInfo.inactiveObservers);
186 }
187
188 function AcceptArgIsValid(arg) {
189 if (IS_UNDEFINED(arg))
190 return true;
191
192 if (!IS_SPEC_OBJECT(arg) ||
193 !IS_NUMBER(arg.length) ||
194 arg.length < 0)
195 return false;
196
197 var length = arg.length;
198 for (var i = 0; i < length; i++) {
199 if (!IS_STRING(arg[i]))
200 return false;
201 }
202 return true;
203 }
204
205 function ObjectObserve(object, callback, accept) {
75 if (!IS_SPEC_OBJECT(object)) 206 if (!IS_SPEC_OBJECT(object))
76 throw MakeTypeError("observe_non_object", ["observe"]); 207 throw MakeTypeError("observe_non_object", ["observe"]);
77 if (!IS_SPEC_FUNCTION(callback)) 208 if (!IS_SPEC_FUNCTION(callback))
78 throw MakeTypeError("observe_non_function", ["observe"]); 209 throw MakeTypeError("observe_non_function", ["observe"]);
79 if (ObjectIsFrozen(callback)) 210 if (ObjectIsFrozen(callback))
80 throw MakeTypeError("observe_callback_frozen"); 211 throw MakeTypeError("observe_callback_frozen");
212 if (!AcceptArgIsValid(accept))
213 throw MakeTypeError("observe_accept_invalid");
81 214
82 if (!observerInfoMap.has(callback)) { 215 if (!observerInfoMap.has(callback)) {
83 observerInfoMap.set(callback, { 216 observerInfoMap.set(callback, {
84 pendingChangeRecords: null, 217 pendingChangeRecords: null,
85 priority: observationState.observerPriority++, 218 priority: observationState.observerPriority++,
86 }); 219 });
87 } 220 }
88 221
89 var objectInfo = objectInfoMap.get(object); 222 var objectInfo = objectInfoMap.get(object);
90 if (IS_UNDEFINED(objectInfo)) objectInfo = CreateObjectInfo(object); 223 if (IS_UNDEFINED(objectInfo)) objectInfo = CreateObjectInfo(object);
91 %SetIsObserved(object, true); 224 %SetIsObserved(object, true);
92 225
93 var changeObservers = objectInfo.changeObservers; 226 ensureObserverRemoved(objectInfo, callback);
94 if (changeObservers.indexOf(callback) < 0) changeObservers.push(callback); 227
228 var observer = createObserver(callback, accept);
229 if (observerIsActive(observer, objectInfo))
230 objectInfo.changeObservers.push(observer);
231 else
232 objectInfo.inactiveObservers.push(observer);
95 233
96 return object; 234 return object;
97 } 235 }
98 236
99 function ObjectUnobserve(object, callback) { 237 function ObjectUnobserve(object, callback) {
100 if (!IS_SPEC_OBJECT(object)) 238 if (!IS_SPEC_OBJECT(object))
101 throw MakeTypeError("observe_non_object", ["unobserve"]); 239 throw MakeTypeError("observe_non_object", ["unobserve"]);
102 if (!IS_SPEC_FUNCTION(callback)) 240 if (!IS_SPEC_FUNCTION(callback))
103 throw MakeTypeError("observe_non_function", ["unobserve"]); 241 throw MakeTypeError("observe_non_function", ["unobserve"]);
104 242
105 var objectInfo = objectInfoMap.get(object); 243 var objectInfo = objectInfoMap.get(object);
106 if (IS_UNDEFINED(objectInfo)) 244 if (IS_UNDEFINED(objectInfo))
107 return object; 245 return object;
108 246
109 var changeObservers = objectInfo.changeObservers; 247 ensureObserverRemoved(objectInfo, callback);
110 var index = changeObservers.indexOf(callback); 248
111 if (index >= 0) { 249 if (objectInfo.changeObservers.length === 0 &&
112 changeObservers.splice(index, 1); 250 objectInfo.inactiveObservers.length === 0) {
113 if (changeObservers.length === 0) %SetIsObserved(object, false); 251 %SetIsObserved(object, false);
114 } 252 }
115 253
116 return object; 254 return object;
117 } 255 }
118 256
119 function EnqueueChangeRecord(changeRecord, observers) { 257 function EnqueueChangeRecord(changeRecord, observers) {
120 // TODO(rossberg): adjust once there is a story for symbols vs proxies. 258 // TODO(rossberg): adjust once there is a story for symbols vs proxies.
121 if (IS_SYMBOL(changeRecord.name)) return; 259 if (IS_SYMBOL(changeRecord.name)) return;
122 260
123 for (var i = 0; i < observers.length; i++) { 261 for (var i = 0; i < observers.length; i++) {
124 var observer = observers[i]; 262 var observer = observers[i];
125 var observerInfo = observerInfoMap.get(observer); 263 if (IS_UNDEFINED(observer.accept[changeRecord.type]))
126 observationState.pendingObservers[observerInfo.priority] = observer; 264 continue;
265
266 var callback = observer.callback;
267 var observerInfo = observerInfoMap.get(callback);
268 observationState.pendingObservers[observerInfo.priority] = callback;
127 %SetObserverDeliveryPending(); 269 %SetObserverDeliveryPending();
128 if (IS_NULL(observerInfo.pendingChangeRecords)) { 270 if (IS_NULL(observerInfo.pendingChangeRecords)) {
129 observerInfo.pendingChangeRecords = new InternalArray(changeRecord); 271 observerInfo.pendingChangeRecords = new InternalArray(changeRecord);
130 } else { 272 } else {
131 observerInfo.pendingChangeRecords.push(changeRecord); 273 observerInfo.pendingChangeRecords.push(changeRecord);
132 } 274 }
133 } 275 }
134 } 276 }
135 277
136 function NotifyChange(type, object, name, oldValue) { 278 function NotifyChange(type, object, name, oldValue) {
137 var objectInfo = objectInfoMap.get(object); 279 var objectInfo = objectInfoMap.get(object);
280 if (objectInfo.changeObservers.length === 0)
281 return;
282
138 var changeRecord = (arguments.length < 4) ? 283 var changeRecord = (arguments.length < 4) ?
139 { type: type, object: object, name: name } : 284 { type: type, object: object, name: name } :
140 { type: type, object: object, name: name, oldValue: oldValue }; 285 { type: type, object: object, name: name, oldValue: oldValue };
141 // TODO(rafaelw): This breaks spec-compliance. Re-enable when freezing isn't 286 // TODO(rafaelw): This breaks spec-compliance. Re-enable when freezing isn't
142 // slow. 287 // slow.
143 // ObjectFreeze(changeRecord); 288 // ObjectFreeze(changeRecord);
144 EnqueueChangeRecord(changeRecord, objectInfo.changeObservers); 289 EnqueueChangeRecord(changeRecord, objectInfo.changeObservers);
145 } 290 }
146 291
147 var notifierPrototype = {}; 292 var notifierPrototype = {};
(...skipping 18 matching lines...) Expand all
166 %DefineOrRedefineDataProperty(newRecord, prop, changeRecord[prop], 311 %DefineOrRedefineDataProperty(newRecord, prop, changeRecord[prop],
167 READ_ONLY + DONT_DELETE); 312 READ_ONLY + DONT_DELETE);
168 } 313 }
169 // TODO(rafaelw): This breaks spec-compliance. Re-enable when freezing isn't 314 // TODO(rafaelw): This breaks spec-compliance. Re-enable when freezing isn't
170 // slow. 315 // slow.
171 // ObjectFreeze(newRecord); 316 // ObjectFreeze(newRecord);
172 317
173 EnqueueChangeRecord(newRecord, objectInfo.changeObservers); 318 EnqueueChangeRecord(newRecord, objectInfo.changeObservers);
174 } 319 }
175 320
321 function ObjectNotifierPerformChange(changeType, changeFn, receiver) {
322 if (!IS_SPEC_OBJECT(this))
323 throw MakeTypeError("called_on_non_object", ["performChange"]);
324
325 var target = notifierTargetMap.get(this);
326 if (IS_UNDEFINED(target))
327 throw MakeTypeError("observe_notify_non_notifier");
328 if (!IS_STRING(changeType))
329 throw MakeTypeError("observe_perform_non_string");
330 if (!IS_SPEC_FUNCTION(changeFn))
331 throw MakeTypeError("observe_perform_non_function");
332
333 if (IS_NULL_OR_UNDEFINED(receiver)) {
334 receiver = %GetDefaultReceiver(changeFn) || receiver;
335 } else if (!IS_SPEC_OBJECT(receiver) && %IsClassicModeFunction(changeFn)) {
336 receiver = ToObject(receiver);
337 }
338
339 var objectInfo = objectInfoMap.get(target);
340 if (IS_UNDEFINED(objectInfo))
341 return;
342
343 BeginPerformChange(objectInfo, changeType);
344 try {
345 %_CallFunction(receiver, changeFn);
346 } finally {
347 EndPerformChange(objectInfo, changeType);
348 }
349 }
350
176 function ObjectGetNotifier(object) { 351 function ObjectGetNotifier(object) {
177 if (!IS_SPEC_OBJECT(object)) 352 if (!IS_SPEC_OBJECT(object))
178 throw MakeTypeError("observe_non_object", ["getNotifier"]); 353 throw MakeTypeError("observe_non_object", ["getNotifier"]);
179 354
180 if (ObjectIsFrozen(object)) return null; 355 if (ObjectIsFrozen(object)) return null;
181 356
182 var objectInfo = objectInfoMap.get(object); 357 var objectInfo = objectInfoMap.get(object);
183 if (IS_UNDEFINED(objectInfo)) objectInfo = CreateObjectInfo(object); 358 if (IS_UNDEFINED(objectInfo)) objectInfo = CreateObjectInfo(object);
184 359
185 if (IS_NULL(objectInfo.notifier)) { 360 if (IS_NULL(objectInfo.notifier)) {
(...skipping 42 matching lines...) Expand 10 before | Expand all | Expand 10 after
228 403
229 function SetupObjectObserve() { 404 function SetupObjectObserve() {
230 %CheckIsBootstrapping(); 405 %CheckIsBootstrapping();
231 InstallFunctions($Object, DONT_ENUM, $Array( 406 InstallFunctions($Object, DONT_ENUM, $Array(
232 "deliverChangeRecords", ObjectDeliverChangeRecords, 407 "deliverChangeRecords", ObjectDeliverChangeRecords,
233 "getNotifier", ObjectGetNotifier, 408 "getNotifier", ObjectGetNotifier,
234 "observe", ObjectObserve, 409 "observe", ObjectObserve,
235 "unobserve", ObjectUnobserve 410 "unobserve", ObjectUnobserve
236 )); 411 ));
237 InstallFunctions(notifierPrototype, DONT_ENUM, $Array( 412 InstallFunctions(notifierPrototype, DONT_ENUM, $Array(
238 "notify", ObjectNotifierNotify 413 "notify", ObjectNotifierNotify,
414 "performChange", ObjectNotifierPerformChange
239 )); 415 ));
240 } 416 }
241 417
242 SetupObjectObserve(); 418 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