Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(351)

Unified Diff: src/harmony-object.js

Issue 1149773003: Revert of Revert of Hook up more import/exports in natives. (Closed) Base URL: https://chromium.googlesource.com/v8/v8.git@master
Patch Set: Created 5 years, 7 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « src/harmony-array-includes.js ('k') | src/harmony-reflect.js » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: src/harmony-object.js
diff --git a/src/harmony-object.js b/src/harmony-object.js
index f90de536f8fe09f636f0f5d8bcb07d575c01f055..382f7f4252b27e3761e85a8be1af2c62fb52082f 100644
--- a/src/harmony-object.js
+++ b/src/harmony-object.js
@@ -9,7 +9,18 @@
%CheckIsBootstrapping();
+// -------------------------------------------------------------------
+// Imports
+
var GlobalObject = global.Object;
+
+var OwnPropertyKeys;
+
+utils.Import(function(from) {
+ OwnPropertyKeys = from.OwnPropertyKeys;
+});
+
+// -------------------------------------------------------------------
// ES6, draft 04-03-15, section 19.1.2.1
function ObjectAssign(target, sources) {
@@ -24,7 +35,7 @@
}
var from = TO_OBJECT_INLINE(nextSource);
- var keys = $ownPropertyKeys(from);
+ var keys = OwnPropertyKeys(from);
var len = keys.length;
for (var j = 0; j < len; ++j) {
@@ -39,7 +50,7 @@
}
// Set up non-enumerable functions on the Object object.
-$installFunctions(GlobalObject, DONT_ENUM, [
+utils.InstallFunctions(GlobalObject, DONT_ENUM, [
"assign", ObjectAssign
]);
« no previous file with comments | « src/harmony-array-includes.js ('k') | src/harmony-reflect.js » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698