diff options
author | Aaron Kennedy <aaron.kennedy@nokia.com> | 2011-10-11 15:06:25 +1000 |
---|---|---|
committer | Qt by Nokia <qt-info@nokia.com> | 2011-11-10 13:22:13 +0100 |
commit | bcd16f9453e543ba819385d87bd7061a4caeb325 (patch) | |
tree | 4296919fa02e8188be3b28ca7fa4ab548693be33 /src/v8/0006-Allow-access-to-the-calling-script-data.patch | |
parent | 95d7abb694d5d21acf0a15dcbf3feb4514bd2ab4 (diff) |
Update V8
Change-Id: Ic239ef1e55bed06260e4a04cc2199f64c2d30059
Reviewed-by: Kent Hansen <kent.hansen@nokia.com>
Diffstat (limited to 'src/v8/0006-Allow-access-to-the-calling-script-data.patch')
-rw-r--r-- | src/v8/0006-Allow-access-to-the-calling-script-data.patch | 48 |
1 files changed, 0 insertions, 48 deletions
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 deleted file mode 100644 index 356142d654..0000000000 --- a/src/v8/0006-Allow-access-to-the-calling-script-data.patch +++ /dev/null @@ -1,48 +0,0 @@ -From 1209b88e96f253cdc19aa4c95e011c84597844f0 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 06/16] Allow access to the calling script data - ---- - include/v8.h | 1 + - src/api.cc | 12 ++++++++++++ - 2 files changed, 13 insertions(+), 0 deletions(-) - -diff --git a/include/v8.h b/include/v8.h -index d78ab1f..2bc0ed1 100644 ---- a/include/v8.h -+++ b/include/v8.h -@@ -3337,6 +3337,7 @@ class V8EXPORT Context { - */ - static Local<Context> GetCalling(); - static Local<Object> GetCallingQmlGlobal(); -+ static Local<Value> GetCallingScriptData(); - - /** - * Sets the security token for the context. To access an object in -diff --git a/src/api.cc b/src/api.cc -index 39767f4..ff74efb 100644 ---- a/src/api.cc -+++ b/src/api.cc -@@ -3976,6 +3976,18 @@ v8::Local<v8::Object> Context::GetCallingQmlGlobal() { - } - } - -+v8::Local<v8::Value> Context::GetCallingScriptData() -+{ -+ i::Isolate* isolate = i::Isolate::Current(); -+ if (IsDeadCheck(isolate, "v8::Context::GetCallingScriptData()")) { -+ return Local<Object>(); -+ } -+ -+ i::JavaScriptFrameIterator it; -+ if (it.done()) return Local<Object>(); -+ i::Handle<i::Script> script(i::Script::cast(i::JSFunction::cast(it.frame()->function())->shared()->script())); -+ return Utils::ToLocal(i::Handle<i::Object>(script->data())); -+} - - v8::Local<v8::Object> Context::Global() { - if (IsDeadCheck(i::Isolate::Current(), "v8::Context::Global()")) { --- -1.7.4.4 - |