Merge "Removing tests that pass after a v8 merge"

[android-x86/external-webkit.git] / WebCore / bindings / js / ScriptCallFrame.cpp

diff --git a/WebCore/bindings/js/ScriptCallFrame.cpp b/WebCore/bindings/js/ScriptCallFrame.cpp
index 58168d0..2f74b96 100644 (file)
--- a/WebCore/bindings/js/ScriptCallFrame.cpp
+++ b/WebCore/bindings/js/ScriptCallFrame.cpp
@@ -31,21 +31,23 @@
 #include "config.h"
 #include "ScriptCallFrame.h"
 
-#include <interpreter/CallFrame.h>
+#include <runtime/ArgList.h>
 #include <runtime/UString.h>
 
 using namespace JSC;
 
 namespace WebCore {
 
-ScriptCallFrame::ScriptCallFrame(const UString& functionName, const UString& urlString, int lineNumber, const ArgList& args, unsigned skipArgumentCount)
-    : m_functionName(functionName)
-    , m_sourceURL(urlString)
+ScriptCallFrame::ScriptCallFrame(const UString& functionName, const UString& urlString, int lineNumber, ExecState* exec, unsigned skipArgumentCount)
+    : m_functionName(ustringToString(functionName))
+    , m_sourceURL(ustringToString(urlString))
     , m_lineNumber(lineNumber)
 {
-    size_t argumentCount = args.size();
+    if (!exec)
+        return;
+    size_t argumentCount = exec->argumentCount();
     for (size_t i = skipArgumentCount; i < argumentCount; ++i)
-        m_arguments.append(ScriptValue(args.at(i)));
+        m_arguments.append(ScriptValue(exec->argument(i)));
 }
 
 ScriptCallFrame::~ScriptCallFrame()