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

1 files changed, 9 insertions, 20 deletions

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 <wtf/Noncopyable.h>
 #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
 };