diff options
author | Ben Murdoch <benm@google.com> | 2011-11-30 16:03:39 +0000 |
---|---|---|
committer | Ben Murdoch <benm@google.com> | 2011-12-02 17:28:02 +0000 |
commit | 69a99ed0b2b2ef69d393c371b03db3a98aaf880e (patch) | |
tree | 6438154d0f3ab526b9206f8860fa4db5cf073c11 /include | |
parent | 3fb3ca8c7ca439d408449a395897395c0faae8d1 (diff) | |
download | android_external_v8-69a99ed0b2b2ef69d393c371b03db3a98aaf880e.tar.gz android_external_v8-69a99ed0b2b2ef69d393c371b03db3a98aaf880e.tar.bz2 android_external_v8-69a99ed0b2b2ef69d393c371b03db3a98aaf880e.zip |
Upgrade to V8 3.5
Merge V8 3.5.10.24
Simple merge required updates to makefiles only.
Bug: 5688872
Change-Id: I0acdb9a1a53919d84e9a7525308e8371739d2f06
Diffstat (limited to 'include')
-rw-r--r--[-rwxr-xr-x] | include/v8-debug.h | 0 | ||||
-rw-r--r-- | include/v8-profiler.h | 6 | ||||
-rw-r--r-- | include/v8.h | 48 |
3 files changed, 28 insertions, 26 deletions
diff --git a/include/v8-debug.h b/include/v8-debug.h index 504cbfed..504cbfed 100755..100644 --- a/include/v8-debug.h +++ b/include/v8-debug.h diff --git a/include/v8-profiler.h b/include/v8-profiler.h index 4febcb95..f67646f5 100644 --- a/include/v8-profiler.h +++ b/include/v8-profiler.h @@ -307,6 +307,12 @@ class V8EXPORT HeapGraphNode { * path from the snapshot root to the current node. */ const HeapGraphNode* GetDominatorNode() const; + + /** + * Finds and returns a value from the heap corresponding to this node, + * if the value is still reachable. + */ + Handle<Value> GetHeapValue() const; }; diff --git a/include/v8.h b/include/v8.h index f4f81e4c..5a781607 100644 --- a/include/v8.h +++ b/include/v8.h @@ -171,12 +171,12 @@ template <class T> class Handle { /** * Creates an empty handle. */ - inline Handle(); + inline Handle() : val_(0) {} /** * Creates a new handle for the specified value. */ - inline explicit Handle(T* val) : val_(val) { } + inline explicit Handle(T* val) : val_(val) {} /** * Creates a handle for the contents of the specified handle. This @@ -203,14 +203,14 @@ template <class T> class Handle { */ inline bool IsEmpty() const { return val_ == 0; } - inline T* operator->() const { return val_; } - - inline T* operator*() const { return val_; } - /** * Sets the handle to be empty. IsEmpty() will then return true. */ - inline void Clear() { this->val_ = 0; } + inline void Clear() { val_ = 0; } + + inline T* operator->() const { return val_; } + + inline T* operator*() const { return val_; } /** * Checks whether two handles are the same. @@ -1039,29 +1039,30 @@ class String : public Primitive { * \param length The number of characters to copy from the string. For * WriteUtf8 the number of bytes in the buffer. * \param nchars_ref The number of characters written, can be NULL. - * \param hints Various hints that might affect performance of this or + * \param options Various options that might affect performance of this or * subsequent operations. * \return The number of characters copied to the buffer excluding the null * terminator. For WriteUtf8: The number of bytes copied to the buffer - * including the null terminator. + * including the null terminator (if written). */ - enum WriteHints { - NO_HINTS = 0, - HINT_MANY_WRITES_EXPECTED = 1 + enum WriteOptions { + NO_OPTIONS = 0, + HINT_MANY_WRITES_EXPECTED = 1, + NO_NULL_TERMINATION = 2 }; V8EXPORT int Write(uint16_t* buffer, int start = 0, int length = -1, - WriteHints hints = NO_HINTS) const; // UTF-16 + int options = NO_OPTIONS) const; // UTF-16 V8EXPORT int WriteAscii(char* buffer, int start = 0, int length = -1, - WriteHints hints = NO_HINTS) const; // ASCII + int options = NO_OPTIONS) const; // ASCII V8EXPORT int WriteUtf8(char* buffer, int length = -1, int* nchars_ref = NULL, - WriteHints hints = NO_HINTS) const; // UTF-8 + int options = NO_OPTIONS) const; // UTF-8 /** * A zero length string. @@ -1335,7 +1336,7 @@ class Number : public Primitive { static inline Number* Cast(v8::Value* obj); private: V8EXPORT Number(); - static void CheckCast(v8::Value* obj); + V8EXPORT static void CheckCast(v8::Value* obj); }; @@ -1709,7 +1710,7 @@ class Array : public Object { static inline Array* Cast(Value* obj); private: V8EXPORT Array(); - static void CheckCast(Value* obj); + V8EXPORT static void CheckCast(Value* obj); }; @@ -2231,11 +2232,10 @@ class V8EXPORT FunctionTemplate : public Template { void SetHiddenPrototype(bool value); /** - * Sets the property attributes of the 'prototype' property of functions - * created from this FunctionTemplate. Can be any combination of ReadOnly, - * DontEnum and DontDelete. + * Sets the ReadOnly flag in the attributes of the 'prototype' property + * of functions created from this FunctionTemplate to true. */ - void SetPrototypeAttributes(int attributes); + void ReadOnlyPrototype(); /** * Returns true if the given object is an instance of this function @@ -3607,7 +3607,7 @@ class V8EXPORT Locker { /** * Returns whether v8::Locker is being used by this V8 instance. */ - static bool IsActive() { return active_; } + static bool IsActive(); private: bool has_lock_; @@ -3828,10 +3828,6 @@ class Internals { template <class T> -Handle<T>::Handle() : val_(0) { } - - -template <class T> Local<T>::Local() : Handle<T>() { } |