Merge WebKit at r65072 : Initial merge by git.

Change-Id: Ibcf418498376b2660aacb7f8d46ea7085ef91585

1 files changed, 12 insertions, 8 deletions

diff --git a/WebCore/bindings/scripts/test/V8/V8TestCallback.h b/WebCore/bindings/scripts/test/V8/V8TestCallback.h
index aed6b22..a105d75 100644
--- a/WebCore/bindings/scripts/test/V8/V8TestCallback.h
+++ b/WebCore/bindings/scripts/test/V8/V8TestCallback.h
@@ -23,6 +23,7 @@
 #ifndef V8TestCallback_h
 #define V8TestCallback_h
 
+#include "ActiveDOMCallback.h"
 #include "TestCallback.h"
 #include "WorldContextHandle.h"
 #include <v8.h>
@@ -30,24 +31,27 @@
 
 namespace WebCore {
 
-class V8TestCallback : public TestCallback {
+class ScriptExecutionContext;
+
+class V8TestCallback : public TestCallback, public ActiveDOMCallback {
 public:
-    static PassRefPtr<V8TestCallback> create(v8::Local<v8::Value> value)
+    static PassRefPtr<V8TestCallback> create(v8::Local<v8::Value> value, ScriptExecutionContext* context)
     {
         ASSERT(value->IsObject());
-        return adoptRef(new V8TestCallback(value->ToObject()));
+        ASSERT(context);
+        return adoptRef(new V8TestCallback(value->ToObject(), context));
     }
 
     virtual ~V8TestCallback();
 
     // Functions
-    virtual bool callbackWithClass1Param(ScriptExecutionContext*, Class1* class1Param);
-    virtual bool callbackWithClass2Param(ScriptExecutionContext*, Class2* class2Param, const String& strArg);
-    COMPILE_ASSERT(false)    virtual int callbackWithNonBoolReturnType(ScriptExecutionContext*, Class3* class3Param);
-    virtual int customCallback(ScriptExecutionContext*, Class5* class5Param, Class6* class6Param);
+    virtual bool callbackWithClass1Param(Class1* class1Param);
+    virtual bool callbackWithClass2Param(Class2* class2Param, const String& strArg);
+    COMPILE_ASSERT(false)    virtual int callbackWithNonBoolReturnType(Class3* class3Param);
+    virtual int customCallback(Class5* class5Param, Class6* class6Param);
 
 private:
-    V8TestCallback(v8::Local<v8::Object>);
+    V8TestCallback(v8::Local<v8::Object>, ScriptExecutionContext*);
 
     v8::Persistent<v8::Object> m_callback;
     WorldContextHandle m_worldContext;