diff options
| m--------- | src/3rdparty/v8 | 0 | ||||
| -rw-r--r-- | src/v8/0005-Introduce-a-QML-compilation-mode.patch | 18 | ||||
| -rw-r--r-- | src/v8/0006-Allow-access-to-the-calling-script-data.patch | 6 | ||||
| -rw-r--r-- | src/v8/0007-Fix-warnings.patch | 2 |
4 files changed, 16 insertions, 10 deletions
diff --git a/src/3rdparty/v8 b/src/3rdparty/v8 -Subproject b16d11e3e614470004b1f80b25c55a8926c9e15 +Subproject f7c8bc0d210ba97fad3261c5581f48221610f50 diff --git a/src/v8/0005-Introduce-a-QML-compilation-mode.patch b/src/v8/0005-Introduce-a-QML-compilation-mode.patch index ffaacb6558..5b85166f6b 100644 --- a/src/v8/0005-Introduce-a-QML-compilation-mode.patch +++ b/src/v8/0005-Introduce-a-QML-compilation-mode.patch @@ -1,4 +1,4 @@ -From 980411965c51c0b2c80803d96ac55c498bb1b2c9 Mon Sep 17 00:00:00 2001 +From 2762e881e1990169c3d9d9f02d5db56d79de79ba Mon Sep 17 00:00:00 2001 From: Aaron Kennedy <aaron.kennedy@nokia.com> Date: Mon, 23 May 2011 18:26:19 +1000 Subject: [PATCH 5/7] Introduce a QML compilation mode @@ -16,7 +16,7 @@ object, so different objects can be passed in different script runs. --- include/v8.h | 18 ++++++++-- - src/api.cc | 46 +++++++++++++++++++++----- + src/api.cc | 52 ++++++++++++++++++++++++----- src/arm/code-stubs-arm.cc | 4 ++ src/arm/full-codegen-arm.cc | 21 +++++++----- src/arm/macro-assembler-arm.h | 5 +++ @@ -48,7 +48,7 @@ runs. src/x64/code-stubs-x64.cc | 4 ++ src/x64/full-codegen-x64.cc | 21 +++++++----- src/x64/macro-assembler-x64.h | 5 +++ - 33 files changed, 341 insertions(+), 86 deletions(-) + 33 files changed, 347 insertions(+), 86 deletions(-) diff --git a/include/v8.h b/include/v8.h index b377c53..a67feb2 100644 @@ -122,7 +122,7 @@ index b377c53..a67feb2 100644 /** * Sets the security token for the context. To access an object in diff --git a/src/api.cc b/src/api.cc -index 3137d6c..2f5898c 100644 +index 3137d6c..61ed79e 100644 --- a/src/api.cc +++ b/src/api.cc @@ -1372,7 +1372,8 @@ ScriptData* ScriptData::New(const char* data, int length) { @@ -207,7 +207,7 @@ index 3137d6c..2f5898c 100644 EXCEPTION_BAILOUT_CHECK(isolate, Local<Value>()); raw_result = *result; } -@@ -3928,6 +3938,24 @@ v8::Local<v8::Context> Context::GetCalling() { +@@ -3928,6 +3938,30 @@ v8::Local<v8::Context> Context::GetCalling() { } @@ -217,9 +217,15 @@ index 3137d6c..2f5898c 100644 + return Local<Object>(); + } + ++ i::Context *context = isolate->context(); ++ if (!context->qml_global()->IsUndefined()) { ++ i::Handle<i::Object> qmlglobal(context->qml_global()); ++ return Utils::ToLocal(i::Handle<i::JSObject>::cast(qmlglobal)); ++ } ++ + i::JavaScriptFrameIterator it; + if (it.done()) return Local<Object>(); -+ i::Context *context = i::Context::cast(it.frame()->context()); ++ context = i::Context::cast(it.frame()->context()); + if (!context->qml_global()->IsUndefined()) { + i::Handle<i::Object> qmlglobal(context->qml_global()); + return Utils::ToLocal(i::Handle<i::JSObject>::cast(qmlglobal)); diff --git a/src/v8/0006-Allow-access-to-the-calling-script-data.patch b/src/v8/0006-Allow-access-to-the-calling-script-data.patch index 7bc2046521..cc4fbabf73 100644 --- a/src/v8/0006-Allow-access-to-the-calling-script-data.patch +++ b/src/v8/0006-Allow-access-to-the-calling-script-data.patch @@ -1,4 +1,4 @@ -From 4dc4b08826e198360776eeb3ff40e0ddd811c14b Mon Sep 17 00:00:00 2001 +From bbf7e31aa48416f43efbff97eb84b89954fa6607 Mon Sep 17 00:00:00 2001 From: Aaron Kennedy <aaron.kennedy@nokia.com> Date: Wed, 25 May 2011 10:36:13 +1000 Subject: [PATCH 6/7] Allow access to the calling script data @@ -21,10 +21,10 @@ index a67feb2..6577a30 100644 /** * Sets the security token for the context. To access an object in diff --git a/src/api.cc b/src/api.cc -index 2f5898c..ee15573 100644 +index 61ed79e..f2fb371 100644 --- a/src/api.cc +++ b/src/api.cc -@@ -3955,6 +3955,18 @@ v8::Local<v8::Object> Context::GetCallingQmlGlobal() { +@@ -3961,6 +3961,18 @@ v8::Local<v8::Object> Context::GetCallingQmlGlobal() { } } diff --git a/src/v8/0007-Fix-warnings.patch b/src/v8/0007-Fix-warnings.patch index 4f05a0740d..5292ae0b8a 100644 --- a/src/v8/0007-Fix-warnings.patch +++ b/src/v8/0007-Fix-warnings.patch @@ -1,4 +1,4 @@ -From b16d11e3e614470004b1f80b25c55a8926c9e15e Mon Sep 17 00:00:00 2001 +From f7c8bc0d210ba97fad3261c5581f48221610f503 Mon Sep 17 00:00:00 2001 From: Aaron Kennedy <aaron.kennedy@nokia.com> Date: Fri, 27 May 2011 13:04:15 +1000 Subject: [PATCH 7/7] Fix warnings |