1 files changed, 9 insertions, 17 deletions
diff --git a/chromium/third_party/WebKit/Source/bindings/v8/ScriptCallStackFactory.cpp b/chromium/third_party/WebKit/Source/bindings/v8/ScriptCallStackFactory.cpp
index 81dea4584c6..8c68a9ddd4a 100644
--- a/chromium/third_party/WebKit/Source/bindings/v8/ScriptCallStackFactory.cpp
+++ b/chromium/third_party/WebKit/Source/bindings/v8/ScriptCallStackFactory.cpp
@@ -31,10 +31,8 @@
 #include "config.h"
 #include "bindings/v8/ScriptCallStackFactory.h"
 
-#include "bindings/v8/ScriptScope.h"
 #include "bindings/v8/ScriptValue.h"
 #include "bindings/v8/V8Binding.h"
-#include "bindings/v8/V8Utilities.h"
 #include "core/inspector/InspectorInstrumentation.h"
 #include "core/inspector/ScriptArguments.h"
 #include "core/inspector/ScriptCallFrame.h"
@@ -86,7 +84,7 @@ static void toScriptCallFramesVector(v8::Handle<v8::StackTrace> stackTrace, Vect
     }
 }
 
-static PassRefPtr<ScriptCallStack> createScriptCallStack(v8::Handle<v8::StackTrace> stackTrace, size_t maxStackSize, bool emptyStackIsAllowed, v8::Isolate* isolate)
+static PassRefPtrWillBeRawPtr<ScriptCallStack> createScriptCallStack(v8::Handle<v8::StackTrace> stackTrace, size_t maxStackSize, bool emptyStackIsAllowed, v8::Isolate* isolate)
 {
     ASSERT(isolate->InContext());
     v8::HandleScope scope(isolate);
@@ -95,44 +93,38 @@ static PassRefPtr<ScriptCallStack> createScriptCallStack(v8::Handle<v8::StackTra
     return ScriptCallStack::create(scriptCallFrames);
 }
 
-PassRefPtr<ScriptCallStack> createScriptCallStack(v8::Handle<v8::StackTrace> stackTrace, size_t maxStackSize, v8::Isolate* isolate)
+PassRefPtrWillBeRawPtr<ScriptCallStack> createScriptCallStack(v8::Handle<v8::StackTrace> stackTrace, size_t maxStackSize, v8::Isolate* isolate)
 {
     return createScriptCallStack(stackTrace, maxStackSize, true, isolate);
 }
 
-PassRefPtr<ScriptCallStack> createScriptCallStack(size_t maxStackSize, bool emptyStackIsAllowed)
+PassRefPtrWillBeRawPtr<ScriptCallStack> createScriptCallStack(size_t maxStackSize, bool emptyStackIsAllowed)
 {
     v8::Isolate* isolate = v8::Isolate::GetCurrent();
     if (!isolate->InContext())
-        return 0;
+        return nullptr;
     v8::HandleScope handleScope(isolate);
     v8::Handle<v8::StackTrace> stackTrace(v8::StackTrace::CurrentStackTrace(isolate, maxStackSize, stackTraceOptions));
     return createScriptCallStack(stackTrace, maxStackSize, emptyStackIsAllowed, isolate);
 }
 
-PassRefPtr<ScriptCallStack> createScriptCallStackForConsole(size_t maxStackSize)
+PassRefPtrWillBeRawPtr<ScriptCallStack> createScriptCallStackForConsole(ScriptState* scriptState, size_t maxStackSize)
 {
     size_t stackSize = 1;
     if (InspectorInstrumentation::hasFrontends()) {
-        ExecutionContext* executionContext = getExecutionContext();
-        if (InspectorInstrumentation::consoleAgentEnabled(executionContext))
+        if (InspectorInstrumentation::consoleAgentEnabled(scriptState->executionContext()))
             stackSize = maxStackSize;
     }
     return createScriptCallStack(stackSize);
 }
 
-PassRefPtr<ScriptArguments> createScriptArguments(const v8::FunctionCallbackInfo<v8::Value>& v8arguments, unsigned skipArgumentCount)
+PassRefPtrWillBeRawPtr<ScriptArguments> createScriptArguments(ScriptState* scriptState, const v8::FunctionCallbackInfo<v8::Value>& v8arguments, unsigned skipArgumentCount)
 {
-    v8::Isolate* isolate = v8arguments.GetIsolate();
-    v8::HandleScope scope(isolate);
-    v8::Local<v8::Context> context = isolate->GetCurrentContext();
-    ScriptState* state = ScriptState::forContext(context);
-
     Vector<ScriptValue> arguments;
     for (int i = skipArgumentCount; i < v8arguments.Length(); ++i)
-        arguments.append(ScriptValue(v8arguments[i], isolate));
+        arguments.append(ScriptValue(scriptState, v8arguments[i]));
 
-    return ScriptArguments::create(state, arguments);
+    return ScriptArguments::create(scriptState, arguments);
 }
 
 } // namespace WebCore