Combine typed and pixel arrays.

src/api.cc

Index: src/api.cc
diff --git a/src/api.cc b/src/api.cc
index d718c8875b5973e11a6cc6151f96bb773f4baa55..94b55fb70d6a2a8b0a7940e3eb7a8b61b8af8043 100644
--- a/src/api.cc
+++ b/src/api.cc
@@ -2757,7 +2757,7 @@ void v8::Object::SetIndexedPropertiesToPixelData(uint8_t* data, int length) {
   ON_BAILOUT("v8::SetElementsToPixelData()", return);
   ENTER_V8;
   HandleScope scope;
-  if (!ApiCheck(length <= i::PixelArray::kMaxLength,
+  if (!ApiCheck(length <= i::ExternalPixelArray::kMaxLength,
                 "v8::Object::SetIndexedPropertiesToPixelData()",
                 "length exceeds max acceptable value")) {
     return;
@@ -2768,9 +2768,11 @@ void v8::Object::SetIndexedPropertiesToPixelData(uint8_t* data, int length) {
                 "JSArray is not supported")) {
     return;
   }
-  i::Handle<i::PixelArray> pixels = i::Factory::NewPixelArray(length, data);
+  i::Handle<i::ExternalPixelArray> pixels =
+      i::Factory::NewExternalPixelArray(length, data);
   i::Handle<i::Map> pixel_array_map =
-      i::Factory::GetPixelArrayElementsMap(i::Handle<i::Map>(self->map()));
+      i::Factory::GetExternalPixelArrayElementsMap(

[danno, 2011/02/21 13:03:09]

TODO: This needs to be unified with the elements array map generation. Also, a
copy of the map needs to be made if the element type changes (rather than
reusing the slow map), because it invalidates assumptions about the generated
code keyed on the receiver's map.

+          i::Handle<i::Map>(self->map()));
   self->set_map(*pixel_array_map);
   self->set_elements(*pixels);
 }
@@ -2779,15 +2781,16 @@ void v8::Object::SetIndexedPropertiesToPixelData(uint8_t* data, int length) {
 bool v8::Object::HasIndexedPropertiesInPixelData() {
   ON_BAILOUT("v8::HasIndexedPropertiesInPixelData()", return false);
   i::Handle<i::JSObject> self = Utils::OpenHandle(this);
-  return self->HasPixelElements();
+  return self->HasExternalPixelElements();
 }
 
 
 uint8_t* v8::Object::GetIndexedPropertiesPixelData() {
   ON_BAILOUT("v8::GetIndexedPropertiesPixelData()", return NULL);
   i::Handle<i::JSObject> self = Utils::OpenHandle(this);
-  if (self->HasPixelElements()) {
-    return i::PixelArray::cast(self->elements())->external_pointer();
+  if (self->HasExternalPixelElements()) {
+    return i::ExternalPixelArray::cast(self->elements())->
+        external_pixel_pointer();
   } else {
     return NULL;
   }
@@ -2797,8 +2800,8 @@ uint8_t* v8::Object::GetIndexedPropertiesPixelData() {
 int v8::Object::GetIndexedPropertiesPixelDataLength() {
   ON_BAILOUT("v8::GetIndexedPropertiesPixelDataLength()", return -1);
   i::Handle<i::JSObject> self = Utils::OpenHandle(this);
-  if (self->HasPixelElements()) {
-    return i::PixelArray::cast(self->elements())->length();
+  if (self->HasExternalPixelElements()) {
+    return i::ExternalPixelArray::cast(self->elements())->length();
   } else {
     return -1;
   }
@@ -2869,6 +2872,8 @@ ExternalArrayType v8::Object::GetIndexedPropertiesExternalArrayDataType() {
       return kExternalUnsignedIntArray;
     case i::EXTERNAL_FLOAT_ARRAY_TYPE:
       return kExternalFloatArray;
+    case i::EXTERNAL_PIXEL_ARRAY_TYPE:
+      return kExternalPixelArray;
     default:
       return static_cast<ExternalArrayType>(-1);
   }