diff options
Diffstat (limited to 'WebKit/win/WebScriptCallFrame.h')
-rw-r--r-- | WebKit/win/WebScriptCallFrame.h | 24 |
1 files changed, 9 insertions, 15 deletions
diff --git a/WebKit/win/WebScriptCallFrame.h b/WebKit/win/WebScriptCallFrame.h index f7da9ea..d3cc4f8 100644 --- a/WebKit/win/WebScriptCallFrame.h +++ b/WebKit/win/WebScriptCallFrame.h @@ -29,25 +29,20 @@ #ifndef WebScriptCallFrame_h #define WebScriptCallFrame_h -#include "IWebScriptCallFrame.h" +#include "WebKit.h" +#include <runtime/JSValue.h> -#include <JavaScriptCore/ExecState.h> -#pragma warning(push, 0) -#include <WebCore/COMPtr.h> -#pragma warning(pop) - -namespace KJS { +namespace JSC { class ExecState; - class JSValue; class UString; } class WebScriptCallFrame : public IWebScriptCallFrame { public: - static WebScriptCallFrame* createInstance(KJS::ExecState*, IWebScriptCallFrame* caller); + static WebScriptCallFrame* createInstance(JSC::ExecState*); private: - WebScriptCallFrame(KJS::ExecState*, IWebScriptCallFrame* caller); + WebScriptCallFrame(JSC::ExecState*); virtual ~WebScriptCallFrame(); public: @@ -79,16 +74,15 @@ public: /* [out, retval] */ BSTR* value); // Helper and accessors - virtual KJS::JSValue* valueByEvaluatingJavaScriptFromString(BSTR script); - virtual KJS::ExecState* state() const { return m_state; } + virtual JSC::JSValue* valueByEvaluatingJavaScriptFromString(BSTR script); + virtual JSC::ExecState* state() const { return m_state; } - static KJS::UString jsValueToString(KJS::ExecState*, KJS::JSValue*); + static JSC::UString jsValueToString(JSC::ExecState*, JSC::JSValue*); private: ULONG m_refCount; - KJS::ExecState* m_state; - COMPtr<IWebScriptCallFrame> m_caller; + JSC::ExecState* m_state; }; #endif |