Index: include/v8.h |
diff --git a/include/v8.h b/include/v8.h |
index 79f4478ea6f626ff297314b4ed227d5dc088abed..b38627573e0d764b9c39208efe069ea778f54e55 100644 |
--- a/include/v8.h |
+++ b/include/v8.h |
@@ -4018,10 +4018,23 @@ class V8_EXPORT Isolate { |
*/ |
CpuProfiler* GetCpuProfiler(); |
+ /** Returns true if this isolate has a current context. */ |
+ bool InContext(); |
+ |
/** Returns the context that is on the top of the stack. */ |
Local<Context> GetCurrentContext(); |
/** |
+ * Returns the context of the calling JavaScript code. That is the |
+ * context of the top-most JavaScript frame. If there are no |
+ * JavaScript frames an empty handle is returned. |
+ */ |
+ Local<Context> GetCallingContext(); |
+ |
+ /** Returns the last entered context. */ |
+ Local<Context> GetEnteredContext(); |
+ |
+ /** |
* Allows the host application to group objects together. If one |
* object in the group is alive, all objects in the group are alive. |
* After each garbage collection, object groups are removed. It is |
@@ -4923,24 +4936,16 @@ class V8_EXPORT Context { |
Handle<ObjectTemplate> global_template = Handle<ObjectTemplate>(), |
Handle<Value> global_object = Handle<Value>()); |
- /** Deprecated. Use Isolate version instead. */ |
- V8_DEPRECATED(static Persistent<Context> New( |
- ExtensionConfiguration* extensions = NULL, |
- Handle<ObjectTemplate> global_template = Handle<ObjectTemplate>(), |
- Handle<Value> global_object = Handle<Value>())); |
- |
- /** Returns the last entered context. */ |
+ // TODO(dcarney): Remove this function. |
+ /** Deprecated. Use Isolate::GetEnteredContext */ |
static Local<Context> GetEntered(); |
- // TODO(svenpanne) Actually deprecate this. |
+ // TODO(dcarney) Remove this function. |
/** Deprecated. Use Isolate::GetCurrentContext instead. */ |
static Local<Context> GetCurrent(); |
- /** |
- * Returns the context of the calling JavaScript code. That is the |
- * context of the top-most JavaScript frame. If there are no |
- * JavaScript frames an empty handle is returned. |
- */ |
+ // TODO(dcarney) Remove this function. |
+ /** Deprecated. Use Isolate::GetCallingContext instead. */ |
static Local<Context> GetCalling(); |
/** |
@@ -4972,7 +4977,8 @@ class V8_EXPORT Context { |
/** Returns true if the context has experienced an out of memory situation. */ |
bool HasOutOfMemoryException(); |
- /** Returns true if V8 has a current context. */ |
+ // TODO(dcarney) Remove this function. |
+ /** Deprecated. Use Isolate::InContext instead. */ |
static bool InContext(); |
/** Returns an isolate associated with a current context. */ |