Merge 142565

Source/WebCore/bindings/v8/ScheduledAction.h

 /*
  * Copyright (C) 2007-2009 Google Inc. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are
  * met:
  *
  *     * Redistributions of source code must retain the above copyright
  * notice, this list of conditions and the following disclaimer.
  *     * Redistributions in binary form must reproduce the above
@@ skipping 27 matching lines @@
 #include <wtf/Vector.h>
 
 namespace WebCore {
 
 class Frame;
 class ScriptExecutionContext;
 class WorkerContext;
 
 class ScheduledAction {
 public:
-    ScheduledAction(v8::Handle<v8::Context>, v8::Handle<v8::Function>, int argc, v8::Handle<v8::Value> argv[]);
+    ScheduledAction(v8::Handle<v8::Context>, v8::Handle<v8::Function>, int argc, v8::Handle<v8::Value> argv[], v8::Isolate*);
+    ScheduledAction(v8::Handle<v8::Context>, const String&, const KURL&, v8::Isolate*);
+    ~ScheduledAction();
 
-    ScheduledAction(v8::Handle<v8::Context> context, const String& code, const KURL& url = KURL())
-        : m_context(context)
-        , m_code(code, url)
-    {
-    }
-
-    ~ScheduledAction();
     void execute(ScriptExecutionContext*);
 
 private:
     void execute(Frame*);
 #if ENABLE(WORKERS)
     void execute(WorkerContext*);
 #endif
 
     ScopedPersistent<v8::Context> m_context;
     ScopedPersistent<v8::Function> m_function;
     Vector<v8::Persistent<v8::Value> > m_args;
     ScriptSourceCode m_code;
+    v8::Isolate* m_isolate;
 };
 
 } // namespace WebCore
 
 #endif // ScheduledAction