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

src/factory.cc

Index: src/factory.cc
diff --git a/src/factory.cc b/src/factory.cc
index 8ca4046ad60c65966390fb4dcf3118d2debfd1a5..f7d12afaee429ac84eee22be896fd63decef4959 100644
--- a/src/factory.cc
+++ b/src/factory.cc
@@ -307,19 +307,6 @@ Handle<ByteArray> Factory::NewByteArray(int length, PretenureFlag pretenure) {
 }
 
 
-Handle<PixelArray> Factory::NewPixelArray(int length,
-                                          uint8_t* external_pointer,
-                                          PretenureFlag pretenure) {
-  ASSERT(0 <= length);
-  CALL_HEAP_FUNCTION(
-      isolate(),
-      isolate()->heap()->AllocatePixelArray(length,
-                                            external_pointer,
-                                            pretenure),
-      PixelArray);
-}
-
-
 Handle<ExternalArray> Factory::NewExternalArray(int length,
                                                 ExternalArrayType array_type,
                                                 void* external_pointer,
@@ -405,8 +392,8 @@ Handle<Map> Factory::GetSlowElementsMap(Handle<Map> src) {
 }
 
 
-Handle<Map> Factory::GetPixelArrayElementsMap(Handle<Map> src) {
-  CALL_HEAP_FUNCTION(isolate(), src->GetPixelArrayElementsMap(), Map);
+Handle<Map> Factory::NewExternalArrayElementsMap(Handle<Map> src) {
+  CALL_HEAP_FUNCTION(isolate(), src->NewExternalArrayElementsMap(), Map);
 }
 
 
@@ -678,9 +665,11 @@ Handle<JSFunction> Factory::NewFunctionWithoutPrototype(Handle<String> name,
 
 Handle<Code> Factory::NewCode(const CodeDesc& desc,
                               Code::Flags flags,
-                              Handle<Object> self_ref) {
+                              Handle<Object> self_ref,
+                              bool immovable) {
   CALL_HEAP_FUNCTION(isolate(),
-                     isolate()->heap()->CreateCode(desc, flags, self_ref),
+                     isolate()->heap()->CreateCode(
+                         desc, flags, self_ref, immovable),
                      Code);
 }