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

src/factory.h

Index: src/factory.h
diff --git a/src/factory.h b/src/factory.h
index a1e8de6b4257ac2c972dd0ac78fafd71eae7d449..0f535e436da0610cf43c8128bf5707ab90ad7fbd 100644
--- a/src/factory.h
+++ b/src/factory.h
@@ -167,11 +167,6 @@ class Factory {
   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,
@@ -197,7 +192,7 @@ class Factory {
 
   Handle<Map> GetSlowElementsMap(Handle<Map> map);
 
-  Handle<Map> GetPixelArrayElementsMap(Handle<Map> map);
+  Handle<Map> NewExternalArrayElementsMap(Handle<Map> map);
 
   Handle<FixedArray> CopyFixedArray(Handle<FixedArray> array);
 
@@ -253,7 +248,8 @@ class Factory {
 
   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);