diff options
author | Ryan Dahl <ry@tinyclouds.org> | 2010-12-17 09:29:19 -0800 |
---|---|---|
committer | Ryan Dahl <ry@tinyclouds.org> | 2010-12-17 09:47:55 -0800 |
commit | 7d425a0a160e65b357ed1ad8b35dc01855b5f479 (patch) | |
tree | 5d1c940b27eeea7bbe420361e667ad7304b84a33 /deps/v8/include | |
parent | 9eaf2329e7d1e7c2de20ab7e4461bf55b18595c2 (diff) | |
download | node-new-7d425a0a160e65b357ed1ad8b35dc01855b5f479.tar.gz |
Upgrade V8 to 3.0.3
Diffstat (limited to 'deps/v8/include')
-rw-r--r-- | deps/v8/include/v8-preparser.h | 7 | ||||
-rw-r--r-- | deps/v8/include/v8-profiler.h | 4 | ||||
-rw-r--r-- | deps/v8/include/v8.h | 29 |
3 files changed, 28 insertions, 12 deletions
diff --git a/deps/v8/include/v8-preparser.h b/deps/v8/include/v8-preparser.h index 68ce50223e..9425f7d467 100644 --- a/deps/v8/include/v8-preparser.h +++ b/deps/v8/include/v8-preparser.h @@ -99,13 +99,6 @@ class UnicodeInputStream { // Returns the next Unicode code-point in the input, or a negative value when // there is no more input in the stream. virtual int32_t Next() = 0; - - // Pushes a read character back into the stream, so that it will be the next - // to be read by Advance(). The character pushed back must be the most - // recently read character that hasn't already been pushed back (i.e., if - // pushing back more than one character, they must occur in the opposite order - // of the one they were read in). - virtual void PushBack(int32_t ch) = 0; }; diff --git a/deps/v8/include/v8-profiler.h b/deps/v8/include/v8-profiler.h index 08f47ca36e..675a229854 100644 --- a/deps/v8/include/v8-profiler.h +++ b/deps/v8/include/v8-profiler.h @@ -245,7 +245,6 @@ class V8EXPORT HeapGraphPath { class V8EXPORT HeapGraphNode { public: enum Type { - kInternal = 0, // For compatibility, will be removed. kHidden = 0, // Hidden node, may be filtered when shown to user. kArray = 1, // An array of elements. kString = 2, // A string. @@ -413,7 +412,8 @@ class V8EXPORT HeapProfiler { */ static const HeapSnapshot* TakeSnapshot( Handle<String> title, - HeapSnapshot::Type type = HeapSnapshot::kFull); + HeapSnapshot::Type type = HeapSnapshot::kFull, + ActivityControl* control = NULL); }; diff --git a/deps/v8/include/v8.h b/deps/v8/include/v8.h index 8ecf63aebd..82de6b8b5e 100644 --- a/deps/v8/include/v8.h +++ b/deps/v8/include/v8.h @@ -992,18 +992,23 @@ class String : public Primitive { * the contents of the string and the NULL terminator into the * buffer. * + * WriteUtf8 will not write partial UTF-8 sequences, preferring to stop + * before the end of the buffer. + * * Copies up to length characters into the output buffer. * Only null-terminates if there is enough space in the buffer. * * \param buffer The buffer into which the string will be copied. * \param start The starting position within the string at which * copying begins. - * \param length The number of bytes to copy from the string. + * \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 * subsequent operations. - * \return The number of bytes copied to the buffer - * excluding the NULL terminator. + * \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. */ enum WriteHints { NO_HINTS = 0, @@ -3281,6 +3286,24 @@ class V8EXPORT OutputStream { // NOLINT }; +/** + * An interface for reporting progress and controlling long-running + * activities. + */ +class V8EXPORT ActivityControl { // NOLINT + public: + enum ControlOption { + kContinue = 0, + kAbort = 1 + }; + virtual ~ActivityControl() {} + /** + * Notify about current progress. The activity can be stopped by + * returning kAbort as the callback result. + */ + virtual ControlOption ReportProgressValue(int done, int total) = 0; +}; + // --- I m p l e m e n t a t i o n --- |