Merge of master

1 files changed, 16 insertions, 2 deletions

diff --git a/src/3rdparty/webkit/JavaScriptCore/interpreter/CallFrame.cpp b/src/3rdparty/webkit/JavaScriptCore/interpreter/CallFrame.cpp
index 1c74280..9724875 100644
--- a/src/3rdparty/webkit/JavaScriptCore/interpreter/CallFrame.cpp
+++ b/src/3rdparty/webkit/JavaScriptCore/interpreter/CallFrame.cpp
@@ -27,12 +27,26 @@
 #include "CallFrame.h"
 
 #include "CodeBlock.h"
+#include "Interpreter.h"
 
 namespace JSC {
 
-JSValuePtr CallFrame::thisValue()
+JSValue CallFrame::thisValue()
 {
-    return this[codeBlock()->thisRegister()].jsValue(this);
+    return this[codeBlock()->thisRegister()].jsValue();
 }
 
+#ifndef NDEBUG
+void CallFrame::dumpCaller()
+{
+    int signedLineNumber;
+    intptr_t sourceID;
+    UString urlString;
+    JSValue function;
+    
+    interpreter()->retrieveLastCaller(this, signedLineNumber, sourceID, urlString, function);
+    printf("Callpoint => %s:%d\n", urlString.ascii(), signedLineNumber);
+}
+#endif
+
 }