Revision: 14989
Author: [email protected]
Date: Thu Jun 6 12:15:40 2013
Log: Remove redudant deleted_count argument from EnqueueSpliceRecord
[email protected]
BUG=
Review URL: https://codereview.chromium.org/16438010
Patch from Rafael Weinstein <[email protected]>.
http://code.google.com/p/v8/source/detail?r=14989
Modified:
/branches/bleeding_edge/src/array.js
/branches/bleeding_edge/src/object-observe.js
/branches/bleeding_edge/src/objects.cc
/branches/bleeding_edge/src/v8natives.js
=======================================
--- /branches/bleeding_edge/src/array.js Wed May 29 10:26:05 2013
+++ /branches/bleeding_edge/src/array.js Thu Jun 6 12:15:40 2013
@@ -399,7 +399,7 @@
n--;
var value = this[n];
- EnqueueSpliceRecord(this, n, [value], 1, 0);
+ EnqueueSpliceRecord(this, n, [value], 0);
try {
BeginPerformSplice(this);
@@ -441,7 +441,7 @@
var n = TO_UINT32(this.length);
var m = %_ArgumentsLength();
- EnqueueSpliceRecord(this, n, [], 0, m);
+ EnqueueSpliceRecord(this, n, [], m);
try {
BeginPerformSplice(this);
@@ -581,7 +581,7 @@
function ObservedArrayShift(len) {
var first = this[0];
- EnqueueSpliceRecord(this, 0, [first], 1, 0);
+ EnqueueSpliceRecord(this, 0, [first], 0);
try {
BeginPerformSplice(this);
@@ -627,7 +627,7 @@
var len = TO_UINT32(this.length);
var num_arguments = %_ArgumentsLength();
- EnqueueSpliceRecord(this, 0, [], 0, num_arguments);
+ EnqueueSpliceRecord(this, 0, [], num_arguments);
try {
BeginPerformSplice(this);
@@ -779,7 +779,6 @@
EnqueueSpliceRecord(this,
start_i,
deleted_elements.slice(),
- deleted_elements.length,
num_elements_to_add);
}
}
=======================================
--- /branches/bleeding_edge/src/object-observe.js Tue May 28 04:34:31 2013
+++ /branches/bleeding_edge/src/object-observe.js Thu Jun 6 12:15:40 2013
@@ -294,7 +294,7 @@
EndPerformChange(objectInfo, 'splice');
}
-function EnqueueSpliceRecord(array, index, removed, deleteCount,
addedCount) {
+function EnqueueSpliceRecord(array, index, removed, addedCount) {
var objectInfo = objectInfoMap.get(array);
if (IS_UNDEFINED(objectInfo) || objectInfo.changeObservers.length === 0)
return;
@@ -307,7 +307,6 @@
addedCount: addedCount
};
- changeRecord.removed.length = deleteCount;
ObjectFreeze(changeRecord);
ObjectFreeze(changeRecord.removed);
EnqueueChangeRecord(changeRecord, objectInfo.changeObservers);
=======================================
--- /branches/bleeding_edge/src/objects.cc Thu Jun 6 07:21:35 2013
+++ /branches/bleeding_edge/src/objects.cc Thu Jun 6 12:15:40 2013
@@ -10875,24 +10875,18 @@
return true;
}
-
-// TODO(rafaelw): Remove |delete_count| argument and rely on the length of
-// of |deleted|.
static void EnqueueSpliceRecord(Handle<JSArray> object,
uint32_t index,
Handle<JSArray> deleted,
- uint32_t delete_count,
uint32_t add_count) {
Isolate* isolate = object->GetIsolate();
HandleScope scope(isolate);
Handle<Object> index_object =
isolate->factory()->NewNumberFromUint(index);
- Handle<Object> delete_count_object =
- isolate->factory()->NewNumberFromUint(delete_count);
Handle<Object> add_count_object =
isolate->factory()->NewNumberFromUint(add_count);
Handle<Object> args[] =
- { object, index_object, deleted, delete_count_object,
add_count_object };
+ { object, index_object, deleted, add_count_object };
bool threw;
Execution::Call(Handle<JSFunction>(isolate->observers_enqueue_splice()),
@@ -10996,14 +10990,18 @@
uint32_t add_count = new_length > old_length ? new_length - old_length :
0;
uint32_t delete_count = new_length < old_length ? old_length -
new_length : 0;
Handle<JSArray> deleted = isolate->factory()->NewJSArray(0);
- if (delete_count) {
+ if (delete_count > 0) {
for (int i = indices.length() - 1; i >= 0; i--) {
JSObject::SetElement(deleted, indices[i] - index, old_values[i],
NONE,
kNonStrictMode);
}
+
+ SetProperty(deleted, isolate->factory()->length_string(),
+ isolate->factory()->NewNumberFromUint(delete_count),
+ NONE, kNonStrictMode);
}
- EnqueueSpliceRecord(self, index, deleted, delete_count, add_count);
+ EnqueueSpliceRecord(self, index, deleted, add_count);
return *hresult;
}
@@ -12069,7 +12067,7 @@
old_length_handle);
EndPerformSplice(Handle<JSArray>::cast(self));
Handle<JSArray> deleted = isolate->factory()->NewJSArray(0);
- EnqueueSpliceRecord(Handle<JSArray>::cast(self), old_length,
deleted, 0,
+ EnqueueSpliceRecord(Handle<JSArray>::cast(self), old_length, deleted,
new_length - old_length);
} else {
EnqueueChangeRecord(self, "new", name, old_value);
=======================================
--- /branches/bleeding_edge/src/v8natives.js Tue Jun 4 16:58:49 2013
+++ /branches/bleeding_edge/src/v8natives.js Thu Jun 6 12:15:40 2013
@@ -928,7 +928,6 @@
EnqueueSpliceRecord(obj,
new_length < old_length ? new_length : old_length,
removed,
- removed.length,
new_length > old_length ? new_length - old_length : 0);
}
if (threw) {
@@ -967,7 +966,7 @@
}
if (emit_splice) {
EndPerformSplice(obj);
- EnqueueSpliceRecord(obj, length, [], 0, index + 1 - length);
+ EnqueueSpliceRecord(obj, length, [], index + 1 - length);
}
return true;
}
--
--
v8-dev mailing list
[email protected]
http://groups.google.com/group/v8-dev
---
You received this message because you are subscribed to the Google Groups "v8-dev" group.
To unsubscribe from this group and stop receiving emails from it, send an email
to [email protected].
For more options, visit https://groups.google.com/groups/opt_out.
