Merge 142565

Source/WebCore/bindings/v8/ScheduledAction.cpp

 /*
  * 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 31 matching lines @@
 
 #include "ScriptController.h"
 #include "V8Binding.h"
 #include "V8GCController.h"
 #include "V8RecursionScope.h"
 #include "WorkerContext.h"
 #include "WorkerThread.h"
 
 namespace WebCore {
 
-ScheduledAction::ScheduledAction(v8::Handle<v8::Context> context, v8::Handle<v8::Function> function, int argc, v8::Handle<v8::Value> argv[])
+ScheduledAction::ScheduledAction(v8::Handle<v8::Context> context, v8::Handle<v8::Function> function, int argc, v8::Handle<v8::Value> argv[], v8::Isolate* isolate)
     : m_context(context)
     , m_function(function)
     , m_code(String(), KURL(), TextPosition::belowRangePosition())
+    , m_isolate(isolate)
 {
-    v8::Isolate* isolate = m_context->GetIsolate();
     m_args.reserveCapacity(argc);
     for (int i = 0; i < argc; ++i)
-        m_args.append(v8::Persistent<v8::Value>::New(isolate, argv[i]));
+        m_args.append(v8::Persistent<v8::Value>::New(m_isolate, argv[i]));
+}
+
+ScheduledAction::ScheduledAction(v8::Handle<v8::Context> context, const String& code, const KURL& url, v8::Isolate* isolate)
+    : m_context(context)
+    , m_code(code, url)
+    , m_isolate(isolate)
+{
 }
 
 ScheduledAction::~ScheduledAction()
 {
     for (size_t i = 0; i < m_args.size(); ++i) {
-        m_args[i].Dispose(m_context->GetIsolate());
+        m_args[i].Dispose(m_isolate);
         m_args[i].Clear();
     }
 }
 
 void ScheduledAction::execute(ScriptExecutionContext* context)
 {
     if (context->isDocument()) {
         Frame* frame = static_cast<Document*>(context)->frame();
         if (!frame)
             return;
@@ skipping 46 matching lines @@
         ASSERT(!context.IsEmpty());
         v8::Context::Scope scope(context);
 
         m_function->Call(context->Global(), m_args.size(), m_args.data());
     } else
         worker->script()->evaluate(m_code);
 }
 #endif
 
 } // namespace WebCore