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

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

Issue 11266011: Delivery logic for Object.observe (Closed) Base URL: http://v8.googlecode.com/svn/branches/bleeding_edge
Patch Set: Rebased against newest per-isolate patch Created 8 years, 1 month 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
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 16 matching lines...) Expand all
27 27
28 "use strict"; 28 "use strict";
29 29
30 var InternalObjectIsFrozen = $Object.isFrozen; 30 var InternalObjectIsFrozen = $Object.isFrozen;
31 var InternalObjectFreeze = $Object.freeze; 31 var InternalObjectFreeze = $Object.freeze;
32 32
33 var observationState = %GetObservationState(); 33 var observationState = %GetObservationState();
34 if (IS_UNDEFINED(observationState.observerInfoMap)) { 34 if (IS_UNDEFINED(observationState.observerInfoMap)) {
35 observationState.observerInfoMap = %CreateObjectHashTable(); 35 observationState.observerInfoMap = %CreateObjectHashTable();
36 observationState.objectInfoMap = %CreateObjectHashTable(); 36 observationState.objectInfoMap = %CreateObjectHashTable();
37 observationState.activeObservers = new InternalArray;
38 observationState.observerPriority = 0;
37 } 39 }
38 40
39 function InternalObjectHashTable(table) { 41 function InternalObjectHashTable(table) {
40 this.table = table; 42 this.table = table;
41 } 43 }
42 44
43 InternalObjectHashTable.prototype = { 45 InternalObjectHashTable.prototype = {
44 get: function(key) { 46 get: function(key) {
45 return %ObjectHashTableGet(this.table, key); 47 return %ObjectHashTableGet(this.table, key);
46 }, 48 },
(...skipping 11 matching lines...) Expand all
58 60
59 function ObjectObserve(object, callback) { 61 function ObjectObserve(object, callback) {
60 if (!IS_SPEC_OBJECT(object)) 62 if (!IS_SPEC_OBJECT(object))
61 throw MakeTypeError("observe_non_object", ["observe"]); 63 throw MakeTypeError("observe_non_object", ["observe"]);
62 if (!IS_SPEC_FUNCTION(callback)) 64 if (!IS_SPEC_FUNCTION(callback))
63 throw MakeTypeError("observe_non_function", ["observe"]); 65 throw MakeTypeError("observe_non_function", ["observe"]);
64 if (InternalObjectIsFrozen(callback)) 66 if (InternalObjectIsFrozen(callback))
65 throw MakeTypeError("observe_callback_frozen"); 67 throw MakeTypeError("observe_callback_frozen");
66 68
67 if (!observerInfoMap.has(callback)) { 69 if (!observerInfoMap.has(callback)) {
68 // TODO: setup observerInfo.priority.
69 observerInfoMap.set(callback, { 70 observerInfoMap.set(callback, {
70 pendingChangeRecords: null 71 pendingChangeRecords: null,
72 priority: observationState.observerPriority++,
71 }); 73 });
72 } 74 }
73 75
74 var objectInfo = objectInfoMap.get(object); 76 var objectInfo = objectInfoMap.get(object);
75 if (IS_UNDEFINED(objectInfo)) { 77 if (IS_UNDEFINED(objectInfo)) {
76 // TODO: setup objectInfo.notifier 78 // TODO: setup objectInfo.notifier
77 objectInfo = { 79 objectInfo = {
78 changeObservers: new InternalArray(callback) 80 changeObservers: new InternalArray(callback)
79 }; 81 };
80 objectInfoMap.set(object, objectInfo); 82 objectInfoMap.set(object, objectInfo);
(...skipping 21 matching lines...) Expand all
102 if (index < 0) 104 if (index < 0)
103 return; 105 return;
104 106
105 changeObservers.splice(index, 1); 107 changeObservers.splice(index, 1);
106 } 108 }
107 109
108 function EnqueueChangeRecord(changeRecord, observers) { 110 function EnqueueChangeRecord(changeRecord, observers) {
109 for (var i = 0; i < observers.length; i++) { 111 for (var i = 0; i < observers.length; i++) {
110 var observer = observers[i]; 112 var observer = observers[i];
111 var observerInfo = observerInfoMap.get(observer); 113 var observerInfo = observerInfoMap.get(observer);
112 114 observationState.activeObservers[observerInfo.priority] = observer;
113 // TODO: "activate" the observer 115 %SetHasActiveObjectObservers();
114 116 var pendingChangeRecords = observerInfo.pendingChangeRecords;
rossberg 2012/11/06 16:45:57 What is this variable used for?
adamk 2012/11/06 17:00:09 Good question...removed.
115 if (IS_NULL(observerInfo.pendingChangeRecords)) { 117 if (IS_NULL(pendingChangeRecords)) {
116 observerInfo.pendingChangeRecords = new InternalArray(changeRecord); 118 pendingChangeRecords = observerInfo.pendingChangeRecords = new InternalArr ay(changeRecord);
rossberg 2012/11/06 16:45:57 Line length
adamk 2012/11/06 17:00:09 Done.
117 } else { 119 } else {
118 observerInfo.pendingChangeRecords.push(changeRecord); 120 observerInfo.pendingChangeRecords.push(changeRecord);
119 } 121 }
120 } 122 }
121 } 123 }
122 124
123 function NotifyChange(type, object, name, oldValue) { 125 function NotifyChange(type, object, name, oldValue) {
124 var objectInfo = objectInfoMap.get(object); 126 var objectInfo = objectInfoMap.get(object);
125 var changeRecord = (arguments.length < 4) ? 127 var changeRecord = (arguments.length < 4) ?
126 { type: type, object: object, name: name } : 128 { type: type, object: object, name: name } :
(...skipping 17 matching lines...) Expand all
144 for (var prop in changeRecord) { 146 for (var prop in changeRecord) {
145 if (prop === 'object') 147 if (prop === 'object')
146 continue; 148 continue;
147 newRecord[prop] = changeRecord[prop]; 149 newRecord[prop] = changeRecord[prop];
148 } 150 }
149 InternalObjectFreeze(newRecord); 151 InternalObjectFreeze(newRecord);
150 152
151 EnqueueChangeRecord(newRecord, objectInfo.changeObservers); 153 EnqueueChangeRecord(newRecord, objectInfo.changeObservers);
152 } 154 }
153 155
154 function ObjectDeliverChangeRecords(callback) { 156 function DeliverChangeRecordsForObserver(observer) {
155 if (!IS_SPEC_FUNCTION(callback)) 157 var observerInfo = observerInfoMap.get(observer);
156 throw MakeTypeError("observe_non_function", ["deliverChangeRecords"]);
157
158 var observerInfo = observerInfoMap.get(callback);
159 if (IS_UNDEFINED(observerInfo)) 158 if (IS_UNDEFINED(observerInfo))
160 return; 159 return;
161 160
162 var pendingChangeRecords = observerInfo.pendingChangeRecords; 161 var pendingChangeRecords = observerInfo.pendingChangeRecords;
163 if (IS_NULL(pendingChangeRecords)) 162 if (IS_NULL(pendingChangeRecords))
164 return; 163 return;
165 164
166 observerInfo.pendingChangeRecords = null; 165 observerInfo.pendingChangeRecords = null;
167 var delivered = []; 166 var delivered = [];
168 %MoveArrayContents(pendingChangeRecords, delivered); 167 %MoveArrayContents(pendingChangeRecords, delivered);
169 try { 168 try {
170 %Call(void 0, delivered, callback); 169 %Call(void 0, delivered, observer);
171 } catch (ex) {} 170 } catch (ex) {}
172 } 171 }
173 172
173 function ObjectDeliverChangeRecords(callback) {
174 if (!IS_SPEC_FUNCTION(callback))
175 throw MakeTypeError("observe_non_function", ["deliverChangeRecords"]);
176
177 DeliverChangeRecordsForObserver(callback);
178 }
179
180 function DeliverChangeRecords() {
181 while (observationState.activeObservers.length) {
182 var activeObservers = observationState.activeObservers;
183 observationState.activeObservers = new InternalArray;
184 for (var i in activeObservers) {
185 DeliverChangeRecordsForObserver(activeObservers[i]);
186 }
187 }
188 }
189
174 function SetupObjectObserve() { 190 function SetupObjectObserve() {
175 %CheckIsBootstrapping(); 191 %CheckIsBootstrapping();
176 InstallFunctions($Object, DONT_ENUM, $Array( 192 InstallFunctions($Object, DONT_ENUM, $Array(
177 "deliverChangeRecords", ObjectDeliverChangeRecords, 193 "deliverChangeRecords", ObjectDeliverChangeRecords,
178 "notify", ObjectNotify, // TODO: Remove when getNotifier is implemented. 194 "notify", ObjectNotify, // TODO: Remove when getNotifier is implemented.
179 "observe", ObjectObserve, 195 "observe", ObjectObserve,
180 "unobserve", ObjectUnobserve 196 "unobserve", ObjectUnobserve
181 )); 197 ));
182 } 198 }
183 199
184 SetupObjectObserve(); 200 SetupObjectObserve();
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698