1 files changed, 19 insertions, 15 deletions
diff --git a/WebCore/bridge/c/c_instance.h b/WebCore/bridge/c/c_instance.h
index 6cc4b8d..ed107e9 100644
--- a/WebCore/bridge/c/c_instance.h
+++ b/WebCore/bridge/c/c_instance.h
@@ -36,6 +36,8 @@ typedef struct NPObject NPObject;
 
 namespace JSC {
 
+class UString;
+
 namespace Bindings {
 
 class CClass;
@@ -46,33 +48,35 @@ public:
     {
         return adoptRef(new CInstance(object, rootObject));
     }
+
+    static void setGlobalException(JSC::UString exception);
+
     ~CInstance ();
-    
+
     virtual Class *getClass() const;
 
-    virtual JSValue* valueOf(ExecState*) const;
-    virtual JSValue* defaultValue(ExecState*, PreferredPrimitiveType) const;
-    
-    virtual JSValue* invokeMethod(ExecState*, const MethodList&, const ArgList&);
+    virtual JSValuePtr valueOf(ExecState*) const;
+    virtual JSValuePtr defaultValue(ExecState*, PreferredPrimitiveType) const;
+
+    virtual JSValuePtr invokeMethod(ExecState*, const MethodList&, const ArgList&);
     virtual bool supportsInvokeDefaultMethod() const;
-    virtual JSValue* invokeDefaultMethod(ExecState*, const ArgList&);
-    
+    virtual JSValuePtr invokeDefaultMethod(ExecState*, const ArgList&);
+
     virtual bool supportsConstruct() const;
-    virtual JSValue* invokeConstruct(ExecState*, const ArgList&);
+    virtual JSValuePtr invokeConstruct(ExecState*, const ArgList&);
 
     virtual void getPropertyNames(ExecState*, PropertyNameArray&);
 
-    JSValue* stringValue(ExecState*) const;
-    JSValue* numberValue(ExecState*) const;
-    JSValue* booleanValue() const;
-    
-    NPObject *getObject() const { return _object; }
+    JSValuePtr stringValue(ExecState*) const;
+    JSValuePtr numberValue(ExecState*) const;
+    JSValuePtr booleanValue() const;
 
-    virtual BindingLanguage getBindingLanguage() const { return CLanguage; }
+    NPObject *getObject() const { return _object; }
 
 private:
+    static void moveGlobalExceptionToExecState(ExecState* exec);
     CInstance(NPObject*, PassRefPtr<RootObject>);
-    
+
     mutable CClass *_class;
     NPObject *_object;
 };