Remove more ScriptState::current in core/

ScriptState::current should be called in the binding layer.

BUG=357144
NOTRY=true

Review URL: https://codereview.chromium.org/303103002

git-svn-id: svn://svn.chromium.org/blink/trunk@175146 bbb929c8-8fbe-4397-9dbb-9b2b20218538

third_party/WebKit/Source/bindings/templates/methods.cpp

@@ -238,7 +238,7 @@ ScriptState* scriptState = ScriptState::current(info.GetIsolate());
 ExecutionContext* scriptContext = currentExecutionContext(info.GetIsolate());
 {% endif %}
 {% if method.is_call_with_script_arguments %}
-RefPtr<ScriptArguments> scriptArguments(createScriptArguments(info, {{method.number_of_arguments}}));
+RefPtr<ScriptArguments> scriptArguments(createScriptArguments(scriptState, info, {{method.number_of_arguments}}));
 {% endif %}
 {# Call #}
 {% if method.idl_type == 'void' %}

third_party/WebKit/Source/bindings/tests/results/V8TestObject.cpp

@@ -7714,7 +7714,7 @@ static void callWithScriptStateScriptArgumentsVoidMethodMethod(const v8::Functio
 {
     TestObject* impl = V8TestObject::toNative(info.Holder());
     ScriptState* scriptState = ScriptState::current(info.GetIsolate());
-    RefPtr<ScriptArguments> scriptArguments(createScriptArguments(info, 0));
+    RefPtr<ScriptArguments> scriptArguments(createScriptArguments(scriptState, info, 0));
     impl->callWithScriptStateScriptArgumentsVoidMethod(scriptState, scriptArguments.release());
 }
 
@@ -7734,14 +7734,14 @@ static void callWithScriptStateScriptArgumentsVoidMethodOptionalBooleanArgMethod
         V8RethrowTryCatchScope rethrow(block);
         if (UNLIKELY(info.Length() <= 0)) {
             ScriptState* scriptState = ScriptState::current(info.GetIsolate());
-            RefPtr<ScriptArguments> scriptArguments(createScriptArguments(info, 1));
+            RefPtr<ScriptArguments> scriptArguments(createScriptArguments(scriptState, info, 1));
             impl->callWithScriptStateScriptArgumentsVoidMethodOptionalBooleanArg(scriptState, scriptArguments.release());
             return;
         }
         TONATIVE_VOID_INTERNAL(optionalBooleanArg, info[0]->BooleanValue());
     }
     ScriptState* scriptState = ScriptState::current(info.GetIsolate());
-    RefPtr<ScriptArguments> scriptArguments(createScriptArguments(info, 1));
+    RefPtr<ScriptArguments> scriptArguments(createScriptArguments(scriptState, info, 1));
     impl->callWithScriptStateScriptArgumentsVoidMethodOptionalBooleanArg(scriptState, scriptArguments.release(), optionalBooleanArg);
 }
 

third_party/WebKit/Source/bindings/v8/ScriptCallStackFactory.cpp

@@ -118,12 +118,8 @@ PassRefPtr<ScriptCallStack> createScriptCallStackForConsole(ScriptState* scriptS
     return createScriptCallStack(stackSize);
 }
 
-PassRefPtr<ScriptArguments> createScriptArguments(const v8::FunctionCallbackInfo<v8::Value>& v8arguments, unsigned skipArgumentCount)
+PassRefPtr<ScriptArguments> createScriptArguments(ScriptState* scriptState, const v8::FunctionCallbackInfo<v8::Value>& v8arguments, unsigned skipArgumentCount)
 {
-    v8::Isolate* isolate = v8arguments.GetIsolate();
-    v8::HandleScope scope(isolate);
-    ScriptState* scriptState = ScriptState::current(isolate);
-
     Vector<ScriptValue> arguments;
     for (int i = skipArgumentCount; i < v8arguments.Length(); ++i)
         arguments.append(ScriptValue(scriptState, v8arguments[i]));

third_party/WebKit/Source/bindings/v8/ScriptCallStackFactory.h

@@ -51,7 +51,7 @@ const v8::StackTrace::StackTraceOptions stackTraceOptions = static_cast<v8::Stac
 PassRefPtr<ScriptCallStack> createScriptCallStack(v8::Handle<v8::StackTrace>, size_t maxStackSize, v8::Isolate*);
 PassRefPtr<ScriptCallStack> createScriptCallStack(size_t maxStackSize, bool emptyStackIsAllowed = false);
 PassRefPtr<ScriptCallStack> createScriptCallStackForConsole(ScriptState*, size_t maxStackSize = ScriptCallStack::maxCallStackSizeToCapture);
-PassRefPtr<ScriptArguments> createScriptArguments(const v8::FunctionCallbackInfo<v8::Value>& v8arguments, unsigned skipArgumentCount);
+PassRefPtr<ScriptArguments> createScriptArguments(ScriptState*, const v8::FunctionCallbackInfo<v8::Value>& v8arguments, unsigned skipArgumentCount);
 
 } // namespace WebCore
 

third_party/WebKit/Source/core/inspector/JavaScriptCallFrame.cpp

@@ -167,7 +167,7 @@ v8::Handle<v8::Object> JavaScriptCallFrame::innerCallFrame()
     return m_callFrame.newLocal(m_isolate);
 }
 
-ScriptValue JavaScriptCallFrame::setVariableValue(int scopeNumber, const String& variableName, const ScriptValue& newValue)
+ScriptValue JavaScriptCallFrame::setVariableValue(ScriptState* scriptState, int scopeNumber, const String& variableName, const ScriptValue& newValue)
 {
     v8::Handle<v8::Object> callFrame = m_callFrame.newLocal(m_isolate);
     v8::Handle<v8::Function> setVariableValueFunction = v8::Handle<v8::Function>::Cast(callFrame->Get(v8AtomicString(m_isolate, "setVariableValue")));
@@ -176,7 +176,7 @@ ScriptValue JavaScriptCallFrame::setVariableValue(int scopeNumber, const String&
         v8String(m_isolate, variableName),
         newValue.v8Value()
     };
-    return ScriptValue(ScriptState::current(m_isolate), setVariableValueFunction->Call(callFrame, WTF_ARRAY_LENGTH(argv), argv));
+    return ScriptValue(scriptState, setVariableValueFunction->Call(callFrame, WTF_ARRAY_LENGTH(argv), argv));
 }
 
 } // namespace WebCore

third_party/WebKit/Source/core/inspector/JavaScriptCallFrame.h

@@ -33,6 +33,7 @@
 
 
 #include "bindings/v8/ScopedPersistent.h"
+#include "bindings/v8/ScriptState.h"
 #include "bindings/v8/ScriptWrappable.h"
 #include <v8-debug.h>
 #include "wtf/RefCounted.h"
@@ -66,7 +67,7 @@ public:
 
     v8::Handle<v8::Value> evaluate(const String& expression);
     v8::Handle<v8::Value> restart();
-    ScriptValue setVariableValue(int scopeNumber, const String& variableName, const ScriptValue& newValue);
+    ScriptValue setVariableValue(ScriptState*, int scopeNumber, const String& variableName, const ScriptValue& newValue);
     v8::Handle<v8::Object> innerCallFrame();
 
 private:

third_party/WebKit/Source/core/inspector/JavaScriptCallFrame.idl

@@ -39,7 +39,7 @@
     [Custom] any restart();
 
     // Only declarative scope (local, with and catch) is accepted. Returns undefined.
-    any setVariableValue([Default=Undefined] optional long scopeIndex, [TreatNullAs=NullString, TreatUndefinedAs=NullString, Default=Undefined] optional DOMString variableName, [Default=Undefined] optional any newValue);
+    [CallWith=ScriptState] any setVariableValue([Default=Undefined] optional long scopeIndex, [TreatNullAs=NullString, TreatUndefinedAs=NullString, Default=Undefined] optional DOMString variableName, [Default=Undefined] optional any newValue);
 
     readonly attribute JavaScriptCallFrame caller;
     readonly attribute long sourceID;