ScriptController: limit script execution API to executeScript and callFunction, pass valid ScriptEx…

Source/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 72 matching lines @@
     }
 }
 
 void ScheduledAction::execute(Frame* frame)
 {
     v8::HandleScope handleScope(m_isolate);
 
     v8::Handle<v8::Context> context = m_context.newLocal(m_isolate);
     if (context.IsEmpty())
         return;
-    v8::Context::Scope scope(context);
 
     TRACE_EVENT0("v8", "ScheduledAction::execute");
 
     if (!m_function.isEmpty()) {
+        v8::Context::Scope scope(context);
         Vector<v8::Handle<v8::Value> > args;
         createLocalHandlesForArgs(&args);
         frame->script()->callFunction(m_function.newLocal(m_isolate), context->Global(), args.size(), args.data());
-    } else
-        frame->script()->compileAndRunScript(m_code);
+    } else {
+        frame->script()->executeScriptAndReturnValue(context, ScriptSourceCode(m_code));
+    }
 
     // The frame might be invalid at this point because JavaScript could have released it.
 }
 
 void ScheduledAction::execute(WorkerGlobalScope* worker)
 {
     ASSERT(worker->thread()->isCurrentThread());
     v8::HandleScope handleScope(m_isolate);
     v8::Handle<v8::Context> context = m_context.newLocal(m_isolate);
     ASSERT(!context.IsEmpty());
     v8::Context::Scope scope(context);
     if (!m_function.isEmpty()) {
         Vector<v8::Handle<v8::Value> > args;
         createLocalHandlesForArgs(&args);
         V8ScriptRunner::callFunction(m_function.newLocal(m_isolate), worker, context->Global(), args.size(), args.data(), m_isolate);
     } else
         worker->script()->evaluate(m_code);
 }
 
 void ScheduledAction::createLocalHandlesForArgs(Vector<v8::Handle<v8::Value> >* handles)
 {
     handles->reserveCapacity(m_args.size());
     for (size_t i = 0; i < m_args.size(); ++i)
         handles->append(m_args[i].newLocal(m_isolate));
 }
 
 } // namespace WebCore