diff options
author | Gunnar Sletta <gunnar.sletta@nokia.com> | 2011-09-12 07:49:03 +0200 |
---|---|---|
committer | Gunnar Sletta <gunnar.sletta@nokia.com> | 2011-09-12 07:49:03 +0200 |
commit | a9ac6da893ac10ce160c9eb80141508881cd71e2 (patch) | |
tree | 0e74067407612d44ad07ff74cb7be6d444ee28c5 /src/v8/0006-Allow-access-to-the-calling-script-data.patch | |
parent | 8eb5ba3b9cb1e8e07f28a3153672a946b2d82fd9 (diff) | |
parent | 687461627310e8b781da15d1a907c35bd8ffea6e (diff) |
Merge branch 'master' into refactor
Conflicts:
src/3rdparty/v8
src/gui/text/qfont_qpa.cpp
src/gui/widgets/qlinecontrol.cpp
src/plugins/platforms/fontdatabases/fontconfig/qfontconfigdatabase.cpp
tests/auto/gui.pro
tests/auto/network.pro
tests/auto/qstring/tst_qstring.cpp
Change-Id: Id118c172645303ccf06a207050d5bf1462ff57fe
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 | 18 |
1 files changed, 9 insertions, 9 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 index 50529d67b1..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 f890f0d1a1e5bd62711815489c87755a4f382436 Mon Sep 17 00:00:00 2001 +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 +Subject: [PATCH 06/15] 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<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 @@ -27,7 +27,7 @@ index 39767f4..ff74efb 100644 @@ -3976,6 +3976,18 @@ v8::Local<v8::Object> Context::GetCallingQmlGlobal() { } } - + +v8::Local<v8::Value> Context::GetCallingScriptData() +{ + i::Isolate* isolate = i::Isolate::Current(); @@ -40,9 +40,9 @@ index 39767f4..ff74efb 100644 + 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.6 +-- +1.7.4.4 |