Index: src/heap.cc |
diff --git a/src/heap.cc b/src/heap.cc |
index 34ab9aafcf64140e9293a316083202e204413a29..1fe1068970d75eb6f4b65572508667cd2a52182e 100644 |
--- a/src/heap.cc |
+++ b/src/heap.cc |
@@ -1707,10 +1707,10 @@ bool Heap::CreateInitialMaps() { |
set_empty_byte_array(ByteArray::cast(obj)); |
{ MaybeObject* maybe_obj = |
- AllocateMap(PIXEL_ARRAY_TYPE, PixelArray::kAlignedSize); |
+ AllocateMap(EXTERNAL_PIXEL_ARRAY_TYPE, ExternalArray::kAlignedSize); |
if (!maybe_obj->ToObject(&obj)) return false; |
} |
- set_pixel_array_map(Map::cast(obj)); |
+ set_external_pixel_array_map(Map::cast(obj)); |
{ MaybeObject* maybe_obj = AllocateMap(EXTERNAL_BYTE_ARRAY_TYPE, |
ExternalArray::kAlignedSize); |
@@ -2257,6 +2257,8 @@ Heap::RootListIndex Heap::RootIndexForExternalArrayType( |
return kExternalUnsignedIntArrayMapRootIndex; |
case kExternalFloatArray: |
return kExternalFloatArrayMapRootIndex; |
+ case kExternalPixelArray: |
+ return kExternalPixelArrayMapRootIndex; |
default: |
UNREACHABLE(); |
return kUndefinedValueRootIndex; |
@@ -2691,19 +2693,21 @@ void Heap::CreateFillerObjectAt(Address addr, int size) { |
} |
-MaybeObject* Heap::AllocatePixelArray(int length, |
- uint8_t* external_pointer, |
- PretenureFlag pretenure) { |
+MaybeObject* Heap::AllocateExternalPixelArray(int length, |
Kevin Millikin (Chromium)
2011/03/07 15:41:45
Likewise, can you remove this function and use Hea
danno
2011/03/08 10:01:56
Done.
|
+ uint8_t* external_pointer, |
+ PretenureFlag pretenure) { |
AllocationSpace space = (pretenure == TENURED) ? OLD_DATA_SPACE : NEW_SPACE; |
Object* result; |
{ MaybeObject* maybe_result = |
- AllocateRaw(PixelArray::kAlignedSize, space, OLD_DATA_SPACE); |
+ AllocateRaw(ExternalPixelArray::kAlignedSize, space, OLD_DATA_SPACE); |
if (!maybe_result->ToObject(&result)) return maybe_result; |
} |
- reinterpret_cast<PixelArray*>(result)->set_map(pixel_array_map()); |
- reinterpret_cast<PixelArray*>(result)->set_length(length); |
- reinterpret_cast<PixelArray*>(result)->set_external_pointer(external_pointer); |
+ reinterpret_cast<ExternalPixelArray*>(result)->set_map( |
+ external_pixel_array_map()); |
+ reinterpret_cast<ExternalPixelArray*>(result)->set_length(length); |
+ reinterpret_cast<ExternalPixelArray*>(result)->set_external_pointer( |
+ external_pointer); |
return result; |
} |