From a12e09ff8e1ea37a57d09d87b96b49a8ff97b64a Mon Sep 17 00:00:00 2001
From: Lars Knoll <lars.knoll@digia.com>
Date: Fri, 3 May 2013 14:31:24 +0200
Subject: [PATCH] Remove most remaining traces of v8::Context

The class is now empty apart from two static
methods.

Change-Id: Ia474a2ebd4153e031d9a77e20ac9dfa359456f3e
Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
---
 src/qml/qml/v4/qv4v8.cpp     | 55 +++++---------------------------------------
 src/qml/qml/v4/qv4v8_p.h     | 42 +++++----------------------------
 src/qml/qml/v8/qjsengine.cpp | 29 -----------------------
 src/qml/qml/v8/qjsvalue.cpp  | 26 ---------------------
 src/qml/qml/v8/qv8engine.cpp |  5 ----
 src/qml/qml/v8/qv8engine_p.h |  3 ---
 6 files changed, 12 insertions(+), 148 deletions(-)

diff --git a/src/qml/qml/v4/qv4v8.cpp b/src/qml/qml/v4/qv4v8.cpp
index 0278865..43a1922 100644
--- a/src/qml/qml/v4/qv4v8.cpp
+++ b/src/qml/qml/v4/qv4v8.cpp
@@ -206,7 +206,6 @@ Local<Script> Script::New(Handle<String> source,
     if (origin)
         s->m_origin = *origin;
     s->m_flags = flags;
-    s->m_context = Handle<Context>();
     return Local<Script>::New(Handle<Script>(s));
 }
 
@@ -226,7 +225,6 @@ Local<Script> Script::Compile(Handle<String> source, ScriptOrigin *origin, Scrip
     if (origin)
         s->m_origin = *origin;
     s->m_flags = flags;
-    s->m_context = Context::GetCurrent();
     return Local<Script>::New(Handle<Script>(s));
 }
 
@@ -241,11 +239,7 @@ Local<Script> Script::Compile(Handle<String> source,
 
 Local<Value> Script::Run()
 {
-    Handle<Context> context = m_context;
-    if (context.IsEmpty())
-        context = Context::GetCurrent();
-    ASSERT(context.get());
-    QV4::ExecutionEngine *engine = context->GetEngine();
+    QV4::ExecutionEngine *engine = Isolate::GetCurrent()->GetEngine();
     QV4::ExecutionContext *ctx = engine->current;
 
     QV4::Value result = QV4::Value::undefinedValue();
@@ -255,7 +249,7 @@ Local<Value> Script::Run()
         if (!f)
             __qmljs_throw(engine->current, QV4::Value::fromObject(engine->newSyntaxErrorObject(engine->current, 0)));
 
-        result = context->GetEngine()->run(f);
+        result = engine->run(f);
     } catch (QV4::Exception &e) {
         Isolate::GetCurrent()->setException(e.value());
         e.accept(ctx);
@@ -267,11 +261,7 @@ Local<Value> Script::Run()
 
 Local<Value> Script::Run(Handle<Object> qml)
 {
-    Handle<Context> context = m_context;
-    if (context.IsEmpty())
-        context = Context::GetCurrent();
-    ASSERT(context.get());
-    QV4::ExecutionEngine *engine = context->GetEngine();
+    QV4::ExecutionEngine *engine = Isolate::GetCurrent()->GetEngine();
     QV4::ExecutionContext *ctx = engine->current;
 
     QV4::Value result = QV4::Value::undefinedValue();
@@ -1948,14 +1938,14 @@ void Isolate::setException(const QV4::Value &ex)
 
 ExecutionEngine *Isolate::GetEngine()
 {
-    return Isolate::GetCurrent()->m_context->GetEngine();
+    return Isolate::GetCurrent()->m_engine;
 }
 
 Isolate *Isolate::GetCurrent()
 {
     if (!currentIsolate.hasLocalData()) {
         Isolate *i = new Isolate;
-        i->m_context = new Context;
+        i->m_engine = new QV4::ExecutionEngine;
         currentIsolate.setLocalData(i);
     }
     return currentIsolate.localData();
@@ -2068,36 +2058,9 @@ void TryCatch::Reset()
 }
 
 
-
-struct Context::Private
-{
-    Private()
-    {
-        engine.reset(new QV4::ExecutionEngine);
-    }
-
-    QScopedPointer<QV4::ExecutionEngine> engine;
-};
-
-Context::Context()
-    : m_lastContext(0)
-    , d(new Private)
-{
-}
-
-Context::~Context()
-{
-    delete d;
-}
-
-Local<Context> Context::GetCurrent()
-{
-    return Context::Adopt(Isolate::GetCurrent()->m_context);
-}
-
 Local<Object> Context::GetCallingQmlGlobal()
 {
-    QV4::ExecutionEngine *engine = GetCurrent()->GetEngine();
+    QV4::ExecutionEngine *engine = Isolate::GetCurrent()->GetEngine();
     QV4::ExecutionContext *ctx = engine->current;
     while (ctx && ctx->outer->type != ExecutionContext::Type_GlobalContext)
         ctx = ctx->outer;
@@ -2115,10 +2078,4 @@ Local<Value> Context::GetCallingScriptData()
     Q_UNREACHABLE();
 }
 
-QV4::ExecutionEngine *Context::GetEngine()
-{
-    return d->engine.data();
-}
-
-
 }
diff --git a/src/qml/qml/v4/qv4v8_p.h b/src/qml/qml/v4/qv4v8_p.h
index 053e05f..eb5ddd2 100644
--- a/src/qml/qml/v4/qv4v8_p.h
+++ b/src/qml/qml/v4/qv4v8_p.h
@@ -731,7 +731,6 @@ private:
   QString m_script;
   ScriptOrigin m_origin;
   CompileFlags m_flags;
-  Handle<Context> m_context;
 };
 
 DEFINE_REFCOUNTED_HANDLE_OPERATIONS(Script)
@@ -2210,8 +2209,8 @@ class V8EXPORT Isolate {
   private:
       friend class Context;
       friend class TryCatch;
-      Context *m_context;
       TryCatch *tryCatch;
+      QV4::ExecutionEngine *m_engine;
 };
 
 
@@ -2370,22 +2369,8 @@ class V8EXPORT ExtensionConfiguration;
  * A sandboxed execution context with its own set of built-in objects
  * and functions.
  */
-class V8EXPORT Context : public QSharedData {
- public:
-    Context();
-    ~Context();
-
-    static Local<Context> Adopt(Context *p)
-    {
-        Local<Context> l;
-        l.object = p;
-        l.object->ref.ref();
-        return l;
-    }
-
-  /** Returns the context that is on the top of the stack. */
-  static Local<Context> GetCurrent();
-
+class V8EXPORT Context {
+public:
   /**
    * Returns the context of the calling JavaScript code.  That is the
    * context of the top-most JavaScript frame.  If there are no
@@ -2394,27 +2379,12 @@ class V8EXPORT Context : public QSharedData {
   static Local<Object> GetCallingQmlGlobal();
   static Local<Value> GetCallingScriptData();
 
-  /**
-   * Associate an additional data object with the context. This is mainly used
-   * with the debugger to provide additional information on the context through
-   * the debugger API.
-   */
-  void SetData(Handle<Value> data);
-  Local<Value> GetData();
-
-  QV4::ExecutionEngine *GetEngine();
-
 private:
-  Context* m_lastContext;
-  struct Private;
-  Private *d;
-  friend class Value;
-  friend class Script;
-  friend class Object;
-  friend class Function;
+  Context() {}
+  ~Context() {}
 };
 
-DEFINE_REFCOUNTED_HANDLE_OPERATIONS(Context)
+//DEFINE_HANDLE_OPERATIONS(Context)
 
 template<typename T>
 void Persistent<T>::MakeWeak(void* parameters, WeakReferenceCallback callback)
diff --git a/src/qml/qml/v8/qjsengine.cpp b/src/qml/qml/v8/qjsengine.cpp
index 36bd688..9ba1c79 100644
--- a/src/qml/qml/v8/qjsengine.cpp
+++ b/src/qml/qml/v8/qjsengine.cpp
@@ -419,35 +419,6 @@ bool QJSEngine::convertV2(const QJSValue &value, int type, void *ptr)
     \sa toScriptValue()
 */
 
-/*!
-    \internal
-
-    Returns this engine's internal V8 context.
-
-    The context enables direct use of the V8 API.
-    The caller is responsible for ensuring that a handle scope is in place,
-    and for entering/exiting the context.
-    Example:
-
-    \code
-    QJSEngine eng;
-    ...
-    v8::HandleScope handleScope;
-    v8::Local<v8::Context> context = qt_QJSEngineV8Context(&eng);
-    v8::Context::Scope contextScope(context);
-
-    // Do stuff (e.g., call v8::Script::Compile()) ...
-    \endcode
-
-    \sa qt_QJSValueV8Value()
-*/
-Q_QML_EXPORT v8::Local<v8::Context> qt_QJSEngineV8Context(QJSEngine *engine)
-{
-    Q_ASSERT(engine != 0);
-    QV8Engine *d = engine->handle();
-    return v8::Local<v8::Context>::New(d->context());
-}
-
 QT_END_NAMESPACE
 
 #include "moc_qjsengine.cpp"
diff --git a/src/qml/qml/v8/qjsvalue.cpp b/src/qml/qml/v8/qjsvalue.cpp
index 8a965f8..b0202fa 100644
--- a/src/qml/qml/v8/qjsvalue.cpp
+++ b/src/qml/qml/v8/qjsvalue.cpp
@@ -962,30 +962,4 @@ bool QJSValue::isQObject() const
     return false;
 }
 
-/*!
-    \internal
-
-    Returns this value's internal V8 value, or an empty handle if
-    the QJSValue isn't bound to a QJSEngine.
-
-    The V8 value enables direct use of the V8 API.
-    The caller is responsible for ensuring that a handle scope is in place.
-    Example:
-
-    \code
-    QJSValue value = ...;
-    v8::HandleScope handleScope;
-    v8::Local<v8::Value> v8value = qt_QJSValueV8Value(value);
-
-    // Do something with the V8 value (e.g., call v8::Value::IsInt32()) ...
-    \endcode
-
-    \sa qt_QJSEngineV8Context()
-*/
-Q_QML_EXPORT v8::Local<v8::Value> qt_QJSValueV8Value(const QJSValue &value)
-{
-    QJSValuePrivate *d = QJSValuePrivate::get(value);
-    return v8::Local<v8::Value>::New(v8::Value::fromV4Value(d->value));
-}
-
 QT_END_NAMESPACE
diff --git a/src/qml/qml/v8/qv8engine.cpp b/src/qml/qml/v8/qv8engine.cpp
index 7d84b32..6c30568 100644
--- a/src/qml/qml/v8/qv8engine.cpp
+++ b/src/qml/qml/v8/qv8engine.cpp
@@ -149,9 +149,6 @@ QV8Engine::QV8Engine(QJSEngine* qq)
 
     ensurePerThreadIsolate();
 
-    m_context = v8::Persistent<v8::Context>::New(v8::Context::GetCurrent());
-    qPersistentRegister(m_context);
-
     m_v4Engine = v8::Isolate::GetEngine();
     m_v4Engine->publicEngine = q;
 
@@ -194,8 +191,6 @@ QV8Engine::~QV8Engine()
     m_typeWrapper.destroy();
     m_qobjectWrapper.destroy();
     m_contextWrapper.destroy();
-
-    qPersistentDispose(m_context);
 }
 
 QVariant QV8Engine::toVariant(const QV4::Value &value, int typeHint)
diff --git a/src/qml/qml/v8/qv8engine_p.h b/src/qml/qml/v8/qv8engine_p.h
index b5a0e07..e85d027 100644
--- a/src/qml/qml/v8/qv8engine_p.h
+++ b/src/qml/qml/v8/qv8engine_p.h
@@ -280,7 +280,6 @@ public:
     void setEngine(QQmlEngine *engine);
     QQmlEngine *engine() { return m_engine; }
     QV4::Value global();
-    v8::Handle<v8::Context> context() const { return m_context; }
 
     QV8ContextWrapper *contextWrapper() { return &m_contextWrapper; }
     QV8QObjectWrapper *qobjectWrapper() { return &m_qobjectWrapper; }
@@ -433,8 +432,6 @@ protected:
 
     QV4::ExecutionEngine *m_v4Engine;
 
-    v8::Persistent<v8::Context> m_context;
-
     QV4::PersistentValue m_bindingFlagKey;
 
     QV8ContextWrapper m_contextWrapper;
-- 
2.7.4