Merge webkit.org at r61121: Initial merge by git.

Change-Id: Icd6db395c62285be384d137164d95d7466c98760

1 files changed, 5 insertions, 4 deletions

diff --git a/WebCore/bindings/v8/custom/V8CustomPositionErrorCallback.h b/WebCore/bindings/v8/custom/V8CustomPositionErrorCallback.h
index aaf56a7..5211b60 100644
--- a/WebCore/bindings/v8/custom/V8CustomPositionErrorCallback.h
+++ b/WebCore/bindings/v8/custom/V8CustomPositionErrorCallback.h
@@ -27,6 +27,7 @@
 #define V8CustomPositionErrorCallback_h
 
 #include "PositionErrorCallback.h"
+
 #include <v8.h>
 #include <wtf/PassRefPtr.h>
 #include <wtf/RefPtr.h>
@@ -35,23 +36,23 @@ namespace WebCore {
 
 class Frame;
 class PositionError;
+class ScriptExecutionContext;
 
 class V8CustomPositionErrorCallback : public PositionErrorCallback {
 public:
-    static PassRefPtr<V8CustomPositionErrorCallback> create(v8::Local<v8::Value> value, Frame* frame)
+    static PassRefPtr<V8CustomPositionErrorCallback> create(v8::Local<v8::Value> value, ScriptExecutionContext* context)
     {
         ASSERT(value->IsObject());
-        return adoptRef(new V8CustomPositionErrorCallback(value->ToObject(), frame));
+        return adoptRef(new V8CustomPositionErrorCallback(value->ToObject(), context));
     }
     virtual ~V8CustomPositionErrorCallback();
 
     virtual void handleEvent(PositionError*);
 
 private:
-    V8CustomPositionErrorCallback(v8::Local<v8::Object>, Frame*);
+    V8CustomPositionErrorCallback(v8::Local<v8::Object>, ScriptExecutionContext*);
 
     v8::Persistent<v8::Object> m_callback;
-    RefPtr<Frame> m_frame;
 };
 
 } // namespace WebCore