From bc2eac1ef3e6902f8fed65f72b70b582f93bcb19 Mon Sep 17 00:00:00 2001 From: Aaron Kennedy Date: Wed, 7 Sep 2011 10:51:39 +1000 Subject: Update V8 This fixes a few bugs in QML mode name resolution and simplifies our V8 patchset a little by folding some patches together. Change-Id: Ia528a43ac8ccad95ac81bcdff5d05aaeab4b48b2 Reviewed-on: http://codereview.qt.nokia.com/4294 Reviewed-by: Aaron Kennedy --- .../0006-Allow-access-to-the-calling-script-data.patch | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) (limited to 'src/v8/0006-Allow-access-to-the-calling-script-data.patch') 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 50529d67b1..68b28ae1bb 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,7 +1,7 @@ -From f890f0d1a1e5bd62711815489c87755a4f382436 Mon Sep 17 00:00:00 2001 +From 1209b88e96f253cdc19aa4c95e011c84597844f0 Mon Sep 17 00:00:00 2001 From: Aaron Kennedy Date: Wed, 25 May 2011 10:36:13 +1000 -Subject: [PATCH 06/16] Allow access to the calling script data +Subject: [PATCH 06/14] Allow access to the calling script data --- include/v8.h | 1 + @@ -9,15 +9,15 @@ Subject: [PATCH 06/16] Allow access to the calling script data 2 files changed, 13 insertions(+), 0 deletions(-) diff --git a/include/v8.h b/include/v8.h -index a858eae..9aba4a8 100644 +index d78ab1f..2bc0ed1 100644 --- a/include/v8.h +++ b/include/v8.h -@@ -3336,6 +3336,7 @@ class V8EXPORT Context { +@@ -3337,6 +3337,7 @@ class V8EXPORT Context { */ static Local GetCalling(); static Local GetCallingQmlGlobal(); + static Local GetCallingScriptData(); - + /** * Sets the security token for the context. To access an object in diff --git a/src/api.cc b/src/api.cc @@ -27,7 +27,7 @@ index 39767f4..ff74efb 100644 @@ -3976,6 +3976,18 @@ v8::Local Context::GetCallingQmlGlobal() { } } - + +v8::Local Context::GetCallingScriptData() +{ + i::Isolate* isolate = i::Isolate::Current(); @@ -40,9 +40,9 @@ index 39767f4..ff74efb 100644 + i::Handle script(i::Script::cast(i::JSFunction::cast(it.frame()->function())->shared()->script())); + return Utils::ToLocal(i::Handle(script->data())); +} - + v8::Local Context::Global() { if (IsDeadCheck(i::Isolate::Current(), "v8::Context::Global()")) { --- -1.7.6 +-- +1.7.4.4 -- cgit v1.2.3 From b57c3cc40f24277c9bab0a6811bddc79c83ad0ec Mon Sep 17 00:00:00 2001 From: Aaron Kennedy Date: Fri, 9 Sep 2011 14:20:18 +1000 Subject: Update V8 Add a "NativeMode" to V8 script compilation. Change-Id: I73b087c9787ca7f961c2af89f45de2b8813ce1a5 Task-number: QTBUG-20344 Reviewed-on: http://codereview.qt-project.org/4500 Reviewed-by: Qt Sanity Bot Reviewed-by: Aaron Kennedy --- src/v8/0006-Allow-access-to-the-calling-script-data.patch | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/v8/0006-Allow-access-to-the-calling-script-data.patch') 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 68b28ae1bb..5c81fcfb7b 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,7 +1,7 @@ From 1209b88e96f253cdc19aa4c95e011c84597844f0 Mon Sep 17 00:00:00 2001 From: Aaron Kennedy Date: Wed, 25 May 2011 10:36:13 +1000 -Subject: [PATCH 06/14] Allow access to the calling script data +Subject: [PATCH 06/15] Allow access to the calling script data --- include/v8.h | 1 + -- cgit v1.2.3