summaryrefslogtreecommitdiffstats
path: root/include
diff options
context:
space:
mode:
authorIain Merrick <husky@google.com>2010-08-19 15:07:18 +0100
committerIain Merrick <husky@google.com>2010-08-23 14:25:34 +0100
commit756813857a4c2a4d8ad2e805969d5768d3cf43a0 (patch)
tree002fad3c25654870c9634232d53a48219346c50b /include
parentbb769b257e753aafcbd96767abb2abc645eaa20c (diff)
downloadandroid_external_v8-756813857a4c2a4d8ad2e805969d5768d3cf43a0.tar.gz
android_external_v8-756813857a4c2a4d8ad2e805969d5768d3cf43a0.tar.bz2
android_external_v8-756813857a4c2a4d8ad2e805969d5768d3cf43a0.zip
Update V8 to r5295 as required by WebKit r65615
Change-Id: I1d72d4990703e88b7798919c7a53e12ebf76958a
Diffstat (limited to 'include')
-rw-r--r--include/v8-profiler.h30
-rw-r--r--include/v8.h10
2 files changed, 24 insertions, 16 deletions
diff --git a/include/v8-profiler.h b/include/v8-profiler.h
index c99eb0d9..9e3cb873 100644
--- a/include/v8-profiler.h
+++ b/include/v8-profiler.h
@@ -194,10 +194,10 @@ class HeapGraphNode;
class V8EXPORT HeapGraphEdge {
public:
enum Type {
- CONTEXT_VARIABLE = 0, // A variable from a function context.
- ELEMENT = 1, // An element of an array.
- PROPERTY = 2, // A named object property.
- INTERNAL = 3 // A link that can't be accessed from JS,
+ kContextVariable = 0, // A variable from a function context.
+ kElement = 1, // An element of an array.
+ kProperty = 2, // A named object property.
+ kInternal = 3 // A link that can't be accessed from JS,
// thus, its name isn't a real property name.
};
@@ -240,12 +240,12 @@ class V8EXPORT HeapGraphPath {
class V8EXPORT HeapGraphNode {
public:
enum Type {
- INTERNAL = 0, // Internal node, a virtual one, for housekeeping.
- ARRAY = 1, // An array of elements.
- STRING = 2, // A string.
- OBJECT = 3, // A JS object (except for arrays and strings).
- CODE = 4, // Compiled code.
- CLOSURE = 5 // Function closure.
+ kInternal = 0, // Internal node, a virtual one, for housekeeping.
+ kArray = 1, // An array of elements.
+ kString = 2, // A string.
+ kObject = 3, // A JS object (except for arrays and strings).
+ kCode = 4, // Compiled code.
+ kClosure = 5 // Function closure.
};
/** Returns node type (see HeapGraphNode::Type). */
@@ -268,13 +268,15 @@ class V8EXPORT HeapGraphNode {
int GetSelfSize() const;
/** Returns node's network (self + reachable nodes) size, in bytes. */
- int GetTotalSize() const;
+ int GetReachableSize() const;
/**
- * Returns node's private size, in bytes. That is, the size of memory
- * that will be reclaimed having this node collected.
+ * Returns node's retained size, in bytes. That is, self + sizes of
+ * the objects that are reachable only from this object. In other
+ * words, the size of memory that will be reclaimed having this node
+ * collected.
*/
- int GetPrivateSize() const;
+ int GetRetainedSize() const;
/** Returns child nodes count of the node. */
int GetChildrenCount() const;
diff --git a/include/v8.h b/include/v8.h
index 3ac10ab9..ff732269 100644
--- a/include/v8.h
+++ b/include/v8.h
@@ -919,6 +919,11 @@ class Value : public Data {
*/
V8EXPORT bool IsDate() const;
+ /**
+ * Returns true if this value is a RegExp.
+ */
+ V8EXPORT bool IsRegExp() const;
+
V8EXPORT Local<Boolean> ToBoolean() const;
V8EXPORT Local<Number> ToNumber() const;
V8EXPORT Local<String> ToString() const;
@@ -1819,9 +1824,9 @@ typedef Handle<Value> (*IndexedPropertySetter)(uint32_t index,
/**
* Returns a non-empty handle if the interceptor intercepts the request.
- * The result is true if the property exists and false otherwise.
+ * The result is an integer encoding property attributes.
*/
-typedef Handle<Boolean> (*IndexedPropertyQuery)(uint32_t index,
+typedef Handle<Integer> (*IndexedPropertyQuery)(uint32_t index,
const AccessorInfo& info);
/**
@@ -2140,6 +2145,7 @@ class V8EXPORT ObjectTemplate : public Template {
IndexedPropertyDeleter deleter = 0,
IndexedPropertyEnumerator enumerator = 0,
Handle<Value> data = Handle<Value>());
+
/**
* Sets the callback to be used when calling instances created from
* this template as a function. If no callback is set, instances