[Isolates] Merge (7083,7111] from bleeding_edge.

src/factory.h

 // Copyright 2010 the V8 project authors. All rights reserved.
 // Redistribution and use in source and binary forms, with or without
 // modification, are permitted provided that the following conditions are
 // met:
 //
 //     * Redistributions of source code must retain the above copyright
 //       notice, this list of conditions and the following disclaimer.
 //     * Redistributions in binary form must reproduce the above
 //       copyright notice, this list of conditions and the following
 //       disclaimer in the documentation and/or other materials provided
@@ skipping 149 matching lines @@
   Handle<Proxy> NewProxy(Address addr,
                          PretenureFlag pretenure = NOT_TENURED);
 
   // Allocate a new proxy.  The proxy is pretenured (allocated directly in
   // the old generation).
   Handle<Proxy> NewProxy(const AccessorDescriptor* proxy);
 
   Handle<ByteArray> NewByteArray(int length,
                                  PretenureFlag pretenure = NOT_TENURED);
 
-  Handle<PixelArray> NewPixelArray(
-      int length,
-      uint8_t* external_pointer,
-      PretenureFlag pretenure = NOT_TENURED);
-
   Handle<ExternalArray> NewExternalArray(
       int length,
       ExternalArrayType array_type,
       void* external_pointer,
       PretenureFlag pretenure = NOT_TENURED);
 
   Handle<JSGlobalPropertyCell> NewJSGlobalPropertyCell(
       Handle<Object> value);
 
   Handle<Map> NewMap(InstanceType type, int instance_size);
 
   Handle<JSObject> NewFunctionPrototype(Handle<JSFunction> function);
 
   Handle<Map> CopyMapDropDescriptors(Handle<Map> map);
 
   // Copy the map adding more inobject properties if possible without
   // overflowing the instance size.
   Handle<Map> CopyMap(Handle<Map> map, int extra_inobject_props);
 
   Handle<Map> CopyMapDropTransitions(Handle<Map> map);
 
   Handle<Map> GetFastElementsMap(Handle<Map> map);
 
   Handle<Map> GetSlowElementsMap(Handle<Map> map);
 
-  Handle<Map> GetPixelArrayElementsMap(Handle<Map> map);
+  Handle<Map> NewExternalArrayElementsMap(Handle<Map> map);
 
   Handle<FixedArray> CopyFixedArray(Handle<FixedArray> array);
 
   // Numbers (eg, literals) are pretenured by the parser.
   Handle<Object> NewNumber(double value,
                            PretenureFlag pretenure = NOT_TENURED);
 
   Handle<Object> NewNumberFromInt(int value);
   Handle<Object> NewNumberFromUint(uint32_t value);
 
@@ skipping 35 matching lines @@
       Handle<Map> function_map,
       PretenureFlag pretenure);
 
   Handle<JSFunction> NewFunctionFromSharedFunctionInfo(
       Handle<SharedFunctionInfo> function_info,
       Handle<Context> context,
       PretenureFlag pretenure = TENURED);
 
   Handle<Code> NewCode(const CodeDesc& desc,
                        Code::Flags flags,
-                       Handle<Object> self_reference);
+                       Handle<Object> self_reference,
+                       bool immovable = false);
 
   Handle<Code> CopyCode(Handle<Code> code);
 
   Handle<Code> CopyCode(Handle<Code> code, Vector<byte> reloc_info);
 
   Handle<Object> ToObject(Handle<Object> object);
   Handle<Object> ToObject(Handle<Object> object,
                           Handle<Context> global_context);
 
   // Interface for creating error objects.
@@ skipping 159 matching lines @@
   // Update the map cache in the global context with (keys, map)
   Handle<MapCache> AddToMapCache(Handle<Context> context,
                                  Handle<FixedArray> keys,
                                  Handle<Map> map);
 };
 
 
 } }  // namespace v8::internal
 
 #endif  // V8_FACTORY_H_