From cdce139e4aac3d2f1e4b2f41f6fc4d77779b2b7f Mon Sep 17 00:00:00 2001 From: "dglazkov@google.com" Date: Fri, 10 Oct 2008 17:56:04 +0000 Subject: Rolling back tree breakage TBR=pkasting Review URL: http://codereview.chromium.org/7086 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@3224 0039d316-1c4b-4281-b951-d872f2087c98 --- webkit/pending/ExceptionContext.h | 29 +++++++++-------------------- 1 file changed, 9 insertions(+), 20 deletions(-) (limited to 'webkit/pending') diff --git a/webkit/pending/ExceptionContext.h b/webkit/pending/ExceptionContext.h index 529b8f3..7b6c1b4 100644 --- a/webkit/pending/ExceptionContext.h +++ b/webkit/pending/ExceptionContext.h @@ -35,13 +35,6 @@ #include #include "ScriptController.h" -#if USE(JSC) -namespace KJS { -class ExecState; -} -#endif - - namespace WebCore { class Node; @@ -54,30 +47,26 @@ class ExceptionCatcher; // by the ExceptionCatcher. class ExceptionContext : Noncopyable { public: - ExceptionContext(Node*); -#if USE(V8) ExceptionContext(); -#elif USE(JSC) - ExceptionContext(KJS::ExecState* exec) : m_exec(exec) {} - KJS::ExecState* exec() const { return m_exec; } -#endif - ~ExceptionContext() {} + ~ExceptionContext(); bool hadException(); - JSException exception() const; + JSException exception() const { return m_exception; } + + static ExceptionContext* createFromNode(Node*); // Returns a non-exception code object. - static JSException noException(); + static JSException NoException(); private: + void setException(JSException exception) { m_exception = exception; } + + JSException m_exception; + #if USE(V8) friend class ExceptionCatcher; - void setException(JSException exception) { m_exception = exception; } void setExceptionCatcher(ExceptionCatcher*); - JSException m_exception; ExceptionCatcher* m_exceptionCatcher; -#elif USE(JSC) - KJS::ExecState* m_exec; #endif }; -- cgit v1.1