 Chromium Code Reviews
 Chromium Code Reviews Issue 6546036:
  Combine typed and pixel arrays.  (Closed) 
  Base URL: https://v8.googlecode.com/svn/branches/bleeding_edge
    
  
    Issue 6546036:
  Combine typed and pixel arrays.  (Closed) 
  Base URL: https://v8.googlecode.com/svn/branches/bleeding_edge| Index: src/handles.cc | 
| diff --git a/src/handles.cc b/src/handles.cc | 
| index efef095a2d4d04d1044f90003b7259bf9bc1161b..3f1edc59f1f23f98174d0057f4ae4dfe6000beb0 100644 | 
| --- a/src/handles.cc | 
| +++ b/src/handles.cc | 
| @@ -430,7 +430,7 @@ Handle<Object> SetElement(Handle<JSObject> object, | 
| uint32_t index, | 
| Handle<Object> value, | 
| StrictModeFlag strict_mode) { | 
| - if (object->HasPixelElements() || object->HasExternalArrayElements()) { | 
| + if (object->HasExternalArrayElements()) { | 
| if (!value->IsSmi() && !value->IsHeapNumber() && !value->IsUndefined()) { | 
| bool has_exception; | 
| Handle<Object> number = Execution::ToNumber(value, &has_exception); | 
| @@ -446,7 +446,7 @@ Handle<Object> SetOwnElement(Handle<JSObject> object, | 
| uint32_t index, | 
| Handle<Object> value, | 
| StrictModeFlag strict_mode) { | 
| - ASSERT(!object->HasPixelElements()); | 
| + ASSERT(!object->HasExternalPixelElements()); | 
| 
Kevin Millikin (Chromium)
2011/03/07 15:41:45
Doesn't the next assert cover this case?
 
danno
2011/03/08 10:01:56
Done.
 | 
| ASSERT(!object->HasExternalArrayElements()); | 
| CALL_HEAP_FUNCTION(object->SetElement(index, *value, strict_mode, false), | 
| Object); |