diff options
author | Ali Ijaz Sheikh <ofrobots@google.com> | 2016-03-01 08:58:05 -0800 |
---|---|---|
committer | Ali Sheikh <ofrobots@lemonhope.roam.corp.google.com> | 2016-03-03 20:35:20 -0800 |
commit | 069e02ab47656b3efd1b6829c65856b2e1c2d1db (patch) | |
tree | eb643e0a2e88fd64bb9fc927423458d2ae96c2db /deps/v8/src/property-descriptor.h | |
parent | 8938355398c79f583a468284b768652d12ba9bc9 (diff) | |
download | android-node-v8-069e02ab47656b3efd1b6829c65856b2e1c2d1db.tar.gz android-node-v8-069e02ab47656b3efd1b6829c65856b2e1c2d1db.tar.bz2 android-node-v8-069e02ab47656b3efd1b6829c65856b2e1c2d1db.zip |
deps: upgrade to V8 4.9.385.18
Pick up the current branch head for V8 4.9
https://github.com/v8/v8/commit/1ecba0f
PR-URL: https://github.com/nodejs/node/pull/4722
Reviewed-By: Ben Noordhuis <info@bnoordhuis.nl>
Reviewed-By: Michaƫl Zasso <mic.besace@gmail.com>
Diffstat (limited to 'deps/v8/src/property-descriptor.h')
-rw-r--r-- | deps/v8/src/property-descriptor.h | 16 |
1 files changed, 11 insertions, 5 deletions
diff --git a/deps/v8/src/property-descriptor.h b/deps/v8/src/property-descriptor.h index 9425ab10ef..5fbbfa36ec 100644 --- a/deps/v8/src/property-descriptor.h +++ b/deps/v8/src/property-descriptor.h @@ -41,6 +41,17 @@ class PropertyDescriptor { return !IsAccessorDescriptor(desc) && !IsDataDescriptor(desc); } + // ES6 6.2.4.4 + Handle<Object> ToObject(Isolate* isolate); + + // ES6 6.2.4.5 + static bool ToPropertyDescriptor(Isolate* isolate, Handle<Object> obj, + PropertyDescriptor* desc); + + // ES6 6.2.4.6 + static void CompletePropertyDescriptor(Isolate* isolate, + PropertyDescriptor* desc); + bool is_empty() const { return !has_enumerable() && !has_configurable() && !has_writable() && !has_value() && !has_get() && !has_set(); @@ -89,11 +100,6 @@ class PropertyDescriptor { (has_writable() && !writable() ? READ_ONLY : NONE)); } - Handle<Object> ToObject(Isolate* isolate); - - static bool ToPropertyDescriptor(Isolate* isolate, Handle<Object> obj, - PropertyDescriptor* desc); - private: bool enumerable_ : 1; bool has_enumerable_ : 1; |