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