Commit 4adf734f authored by r.nagaraj@samsung.com's avatar r.nagaraj@samsung.com

Move the v8::Isolate* parameter to the first parameter of various binding...

Move the v8::Isolate* parameter to the first parameter of various binding methods in third_party/WebKit/Source/bindings

This step is to move the v8::Isolate* parameter to the first parameter of various binding methods in third_party/WebKit/Source/bindings
(Ref: binding-methods changed:
static v8::Local<v8::Object> createWrapper(v8::Handle<v8::Object> creationContext, const WrapperTypeInfo*, ScriptWrappableBase* internalPointer, v8::Isolate*)
PassRefPtrWillBeRawPtr<ScriptCallStack> createScriptCallStack(v8::Handle<v8::StackTrace>, size_t maxStackSize, v8::Isolate*))

BUG=424446

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

git-svn-id: svn://svn.chromium.org/blink/trunk@185116 bbb929c8-8fbe-4397-9dbb-9b2b20218538
parent 46f4fe3f
...@@ -84,7 +84,7 @@ static void toScriptCallFramesVector(v8::Handle<v8::StackTrace> stackTrace, Vect ...@@ -84,7 +84,7 @@ static void toScriptCallFramesVector(v8::Handle<v8::StackTrace> stackTrace, Vect
} }
} }
static PassRefPtrWillBeRawPtr<ScriptCallStack> createScriptCallStack(v8::Handle<v8::StackTrace> stackTrace, size_t maxStackSize, bool emptyStackIsAllowed, v8::Isolate* isolate) static PassRefPtrWillBeRawPtr<ScriptCallStack> createScriptCallStack(v8::Isolate* isolate, v8::Handle<v8::StackTrace> stackTrace, size_t maxStackSize, bool emptyStackIsAllowed)
{ {
ASSERT(isolate->InContext()); ASSERT(isolate->InContext());
v8::HandleScope scope(isolate); v8::HandleScope scope(isolate);
...@@ -96,9 +96,9 @@ static PassRefPtrWillBeRawPtr<ScriptCallStack> createScriptCallStack(v8::Handle< ...@@ -96,9 +96,9 @@ static PassRefPtrWillBeRawPtr<ScriptCallStack> createScriptCallStack(v8::Handle<
return callStack.release(); return callStack.release();
} }
PassRefPtrWillBeRawPtr<ScriptCallStack> createScriptCallStack(v8::Handle<v8::StackTrace> stackTrace, size_t maxStackSize, v8::Isolate* isolate) PassRefPtrWillBeRawPtr<ScriptCallStack> createScriptCallStack(v8::Isolate* isolate, v8::Handle<v8::StackTrace> stackTrace, size_t maxStackSize)
{ {
return createScriptCallStack(stackTrace, maxStackSize, true, isolate); return createScriptCallStack(isolate, stackTrace, maxStackSize, true);
} }
PassRefPtrWillBeRawPtr<ScriptCallStack> createScriptCallStack(size_t maxStackSize, bool emptyStackIsAllowed) PassRefPtrWillBeRawPtr<ScriptCallStack> createScriptCallStack(size_t maxStackSize, bool emptyStackIsAllowed)
...@@ -108,7 +108,7 @@ PassRefPtrWillBeRawPtr<ScriptCallStack> createScriptCallStack(size_t maxStackSiz ...@@ -108,7 +108,7 @@ PassRefPtrWillBeRawPtr<ScriptCallStack> createScriptCallStack(size_t maxStackSiz
return nullptr; return nullptr;
v8::HandleScope handleScope(isolate); v8::HandleScope handleScope(isolate);
v8::Handle<v8::StackTrace> stackTrace(v8::StackTrace::CurrentStackTrace(isolate, maxStackSize, stackTraceOptions)); v8::Handle<v8::StackTrace> stackTrace(v8::StackTrace::CurrentStackTrace(isolate, maxStackSize, stackTraceOptions));
return createScriptCallStack(stackTrace, maxStackSize, emptyStackIsAllowed, isolate); return createScriptCallStack(isolate, stackTrace, maxStackSize, emptyStackIsAllowed);
} }
PassRefPtrWillBeRawPtr<ScriptCallStack> createScriptCallStackForConsole(size_t maxStackSize, bool emptyStackIsAllowed) PassRefPtrWillBeRawPtr<ScriptCallStack> createScriptCallStackForConsole(size_t maxStackSize, bool emptyStackIsAllowed)
......
...@@ -48,7 +48,7 @@ const v8::StackTrace::StackTraceOptions stackTraceOptions = static_cast<v8::Stac ...@@ -48,7 +48,7 @@ const v8::StackTrace::StackTraceOptions stackTraceOptions = static_cast<v8::Stac
| v8::StackTrace::kScriptNameOrSourceURL | v8::StackTrace::kScriptNameOrSourceURL
| v8::StackTrace::kFunctionName); | v8::StackTrace::kFunctionName);
PassRefPtrWillBeRawPtr<ScriptCallStack> createScriptCallStack(v8::Handle<v8::StackTrace>, size_t maxStackSize, v8::Isolate*); PassRefPtrWillBeRawPtr<ScriptCallStack> createScriptCallStack(v8::Isolate*, v8::Handle<v8::StackTrace>, size_t maxStackSize);
PassRefPtrWillBeRawPtr<ScriptCallStack> createScriptCallStack(size_t maxStackSize, bool emptyStackIsAllowed = false); PassRefPtrWillBeRawPtr<ScriptCallStack> createScriptCallStack(size_t maxStackSize, bool emptyStackIsAllowed = false);
PassRefPtrWillBeRawPtr<ScriptCallStack> createScriptCallStackForConsole(size_t maxStackSize = ScriptCallStack::maxCallStackSizeToCapture, bool emptyStackIsAllowed = false); PassRefPtrWillBeRawPtr<ScriptCallStack> createScriptCallStackForConsole(size_t maxStackSize = ScriptCallStack::maxCallStackSizeToCapture, bool emptyStackIsAllowed = false);
PassRefPtrWillBeRawPtr<ScriptArguments> createScriptArguments(ScriptState*, const v8::FunctionCallbackInfo<v8::Value>& v8arguments, unsigned skipArgumentCount); PassRefPtrWillBeRawPtr<ScriptArguments> createScriptArguments(ScriptState*, const v8::FunctionCallbackInfo<v8::Value>& v8arguments, unsigned skipArgumentCount);
......
...@@ -666,7 +666,7 @@ void ScriptDebugServer::compileScript(ScriptState* scriptState, const String& ex ...@@ -666,7 +666,7 @@ void ScriptDebugServer::compileScript(ScriptState* scriptState, const String& ex
*exceptionDetailsText = toCoreStringWithUndefinedOrNullCheck(message->Get()); *exceptionDetailsText = toCoreStringWithUndefinedOrNullCheck(message->Get());
*lineNumber = message->GetLineNumber(); *lineNumber = message->GetLineNumber();
*columnNumber = message->GetStartColumn(); *columnNumber = message->GetStartColumn();
*stackTrace = createScriptCallStack(message->GetStackTrace(), message->GetStackTrace()->GetFrameCount(), m_isolate); *stackTrace = createScriptCallStack(m_isolate, message->GetStackTrace(), message->GetStackTrace()->GetFrameCount());
} }
return; return;
} }
...@@ -707,7 +707,7 @@ void ScriptDebugServer::runScript(ScriptState* scriptState, const String& script ...@@ -707,7 +707,7 @@ void ScriptDebugServer::runScript(ScriptState* scriptState, const String& script
*exceptionDetailsText = toCoreStringWithUndefinedOrNullCheck(message->Get()); *exceptionDetailsText = toCoreStringWithUndefinedOrNullCheck(message->Get());
*lineNumber = message->GetLineNumber(); *lineNumber = message->GetLineNumber();
*columnNumber = message->GetStartColumn(); *columnNumber = message->GetStartColumn();
*stackTrace = createScriptCallStack(message->GetStackTrace(), message->GetStackTrace()->GetFrameCount(), m_isolate); *stackTrace = createScriptCallStack(m_isolate, message->GetStackTrace(), message->GetStackTrace()->GetFrameCount());
} }
} else { } else {
*result = ScriptValue(scriptState, value); *result = ScriptValue(scriptState, value);
......
...@@ -57,7 +57,7 @@ v8::Handle<v8::Object> ScriptWrappableBase::wrap(v8::Handle<v8::Object> creation ...@@ -57,7 +57,7 @@ v8::Handle<v8::Object> ScriptWrappableBase::wrap(v8::Handle<v8::Object> creation
ASSERT(!DOMDataStore::containsWrapper(this, isolate)); ASSERT(!DOMDataStore::containsWrapper(this, isolate));
v8::Handle<v8::Object> wrapper = V8DOMWrapper::createWrapper(creationContext, wrapperTypeInfo, this, isolate); v8::Handle<v8::Object> wrapper = V8DOMWrapper::createWrapper(isolate, creationContext, wrapperTypeInfo, this);
if (UNLIKELY(wrapper.IsEmpty())) if (UNLIKELY(wrapper.IsEmpty()))
return wrapper; return wrapper;
...@@ -78,7 +78,7 @@ v8::Handle<v8::Object> ScriptWrappable::wrap(v8::Handle<v8::Object> creationCont ...@@ -78,7 +78,7 @@ v8::Handle<v8::Object> ScriptWrappable::wrap(v8::Handle<v8::Object> creationCont
ASSERT(!DOMDataStore::containsWrapper(this, isolate)); ASSERT(!DOMDataStore::containsWrapper(this, isolate));
v8::Handle<v8::Object> wrapper = V8DOMWrapper::createWrapper(creationContext, wrapperTypeInfo, toScriptWrappableBase(), isolate); v8::Handle<v8::Object> wrapper = V8DOMWrapper::createWrapper(isolate, creationContext, wrapperTypeInfo, toScriptWrappableBase());
if (UNLIKELY(wrapper.IsEmpty())) if (UNLIKELY(wrapper.IsEmpty()))
return wrapper; return wrapper;
......
...@@ -68,7 +68,7 @@ static v8::Local<v8::Object> wrapInShadowTemplate(v8::Local<v8::Object> wrapper, ...@@ -68,7 +68,7 @@ static v8::Local<v8::Object> wrapInShadowTemplate(v8::Local<v8::Object> wrapper,
return shadow; return shadow;
} }
v8::Local<v8::Object> V8DOMWrapper::createWrapper(v8::Handle<v8::Object> creationContext, const WrapperTypeInfo* type, ScriptWrappableBase* scriptWrappableBase, v8::Isolate* isolate) v8::Local<v8::Object> V8DOMWrapper::createWrapper(v8::Isolate* isolate, v8::Handle<v8::Object> creationContext, const WrapperTypeInfo* type, ScriptWrappableBase* scriptWrappableBase)
{ {
V8WrapperInstantiationScope scope(creationContext, isolate); V8WrapperInstantiationScope scope(creationContext, isolate);
......
...@@ -45,7 +45,7 @@ struct WrapperTypeInfo; ...@@ -45,7 +45,7 @@ struct WrapperTypeInfo;
class V8DOMWrapper { class V8DOMWrapper {
public: public:
static v8::Local<v8::Object> createWrapper(v8::Handle<v8::Object> creationContext, const WrapperTypeInfo*, ScriptWrappableBase*, v8::Isolate*); static v8::Local<v8::Object> createWrapper(v8::Isolate*, v8::Handle<v8::Object> creationContext, const WrapperTypeInfo*, ScriptWrappableBase*);
static v8::Handle<v8::Object> associateObjectWithWrapper(v8::Isolate*, ScriptWrappableBase*, const WrapperTypeInfo*, v8::Handle<v8::Object> wrapper); static v8::Handle<v8::Object> associateObjectWithWrapper(v8::Isolate*, ScriptWrappableBase*, const WrapperTypeInfo*, v8::Handle<v8::Object> wrapper);
static v8::Handle<v8::Object> associateObjectWithWrapper(v8::Isolate*, ScriptWrappable*, const WrapperTypeInfo*, v8::Handle<v8::Object>); static v8::Handle<v8::Object> associateObjectWithWrapper(v8::Isolate*, ScriptWrappable*, const WrapperTypeInfo*, v8::Handle<v8::Object>);
......
...@@ -112,7 +112,7 @@ static void messageHandlerInMainThread(v8::Handle<v8::Message> message, v8::Hand ...@@ -112,7 +112,7 @@ static void messageHandlerInMainThread(v8::Handle<v8::Message> message, v8::Hand
int scriptId = message->GetScriptOrigin().ScriptID()->Value(); int scriptId = message->GetScriptOrigin().ScriptID()->Value();
// Currently stack trace is only collected when inspector is open. // Currently stack trace is only collected when inspector is open.
if (!stackTrace.IsEmpty() && stackTrace->GetFrameCount() > 0) { if (!stackTrace.IsEmpty() && stackTrace->GetFrameCount() > 0) {
callStack = createScriptCallStack(stackTrace, ScriptCallStack::maxCallStackSizeToCapture, isolate); callStack = createScriptCallStack(isolate, stackTrace, ScriptCallStack::maxCallStackSizeToCapture);
bool success = false; bool success = false;
int topScriptId = callStack->at(0).scriptId().toInt(&success); int topScriptId = callStack->at(0).scriptId().toInt(&success);
if (success && topScriptId == scriptId) if (success && topScriptId == scriptId)
...@@ -256,7 +256,7 @@ static void promiseRejectHandlerInMainThread(v8::PromiseRejectMessage message) ...@@ -256,7 +256,7 @@ static void promiseRejectHandlerInMainThread(v8::PromiseRejectMessage message)
RefPtrWillBeRawPtr<ScriptCallStack> callStack = nullptr; RefPtrWillBeRawPtr<ScriptCallStack> callStack = nullptr;
v8::Handle<v8::StackTrace> stackTrace = message.GetStackTrace(); v8::Handle<v8::StackTrace> stackTrace = message.GetStackTrace();
if (!stackTrace.IsEmpty() && stackTrace->GetFrameCount() > 0) if (!stackTrace.IsEmpty() && stackTrace->GetFrameCount() > 0)
callStack = createScriptCallStack(stackTrace, ScriptCallStack::maxCallStackSizeToCapture, isolate); callStack = createScriptCallStack(isolate, stackTrace, ScriptCallStack::maxCallStackSizeToCapture);
if (!callStack && V8DOMWrapper::isDOMWrapper(message.GetValue())) { if (!callStack && V8DOMWrapper::isDOMWrapper(message.GetValue())) {
// Try to get the stack from a wrapped exception object (e.g. DOMException). // Try to get the stack from a wrapped exception object (e.g. DOMException).
...@@ -265,7 +265,7 @@ static void promiseRejectHandlerInMainThread(v8::PromiseRejectMessage message) ...@@ -265,7 +265,7 @@ static void promiseRejectHandlerInMainThread(v8::PromiseRejectMessage message)
if (!error.IsEmpty()) { if (!error.IsEmpty()) {
stackTrace = v8::Exception::GetStackTrace(error); stackTrace = v8::Exception::GetStackTrace(error);
if (!stackTrace.IsEmpty() && stackTrace->GetFrameCount() > 0) if (!stackTrace.IsEmpty() && stackTrace->GetFrameCount() > 0)
callStack = createScriptCallStack(stackTrace, ScriptCallStack::maxCallStackSizeToCapture, isolate); callStack = createScriptCallStack(isolate, stackTrace, ScriptCallStack::maxCallStackSizeToCapture);
} }
} }
...@@ -289,7 +289,7 @@ static void promiseRejectHandlerInWorker(v8::PromiseRejectMessage message) ...@@ -289,7 +289,7 @@ static void promiseRejectHandlerInWorker(v8::PromiseRejectMessage message)
RefPtrWillBeRawPtr<ScriptCallStack> callStack = nullptr; RefPtrWillBeRawPtr<ScriptCallStack> callStack = nullptr;
v8::Handle<v8::StackTrace> stackTrace = message.GetStackTrace(); v8::Handle<v8::StackTrace> stackTrace = message.GetStackTrace();
if (!stackTrace.IsEmpty() && stackTrace->GetFrameCount() > 0) if (!stackTrace.IsEmpty() && stackTrace->GetFrameCount() > 0)
callStack = createScriptCallStack(stackTrace, ScriptCallStack::maxCallStackSizeToCapture, isolate); callStack = createScriptCallStack(isolate, stackTrace, ScriptCallStack::maxCallStackSizeToCapture);
ScriptState* scriptState = ScriptState::from(context); ScriptState* scriptState = ScriptState::from(context);
promiseRejectMessageQueue().append(PromiseRejectMessage(ScriptValue(scriptState, promise), callStack)); promiseRejectMessageQueue().append(PromiseRejectMessage(ScriptValue(scriptState, promise), callStack));
......
...@@ -65,7 +65,7 @@ static v8::Local<v8::Object> createInjectedScriptHostV8Wrapper(PassRefPtrWillBeR ...@@ -65,7 +65,7 @@ static v8::Local<v8::Object> createInjectedScriptHostV8Wrapper(PassRefPtrWillBeR
{ {
ASSERT(host); ASSERT(host);
v8::Handle<v8::Object> wrapper = V8DOMWrapper::createWrapper(creationContext, &V8InjectedScriptHost::wrapperTypeInfo, host->toScriptWrappableBase(), isolate); v8::Handle<v8::Object> wrapper = V8DOMWrapper::createWrapper(isolate, creationContext, &V8InjectedScriptHost::wrapperTypeInfo, host->toScriptWrappableBase());
if (UNLIKELY(wrapper.IsEmpty())) if (UNLIKELY(wrapper.IsEmpty()))
return wrapper; return wrapper;
......
...@@ -5748,7 +5748,7 @@ v8::Handle<v8::Object> Document::wrap(v8::Handle<v8::Object> creationContext, v8 ...@@ -5748,7 +5748,7 @@ v8::Handle<v8::Object> Document::wrap(v8::Handle<v8::Object> creationContext, v8
return wrapper; return wrapper;
} }
v8::Handle<v8::Object> wrapper = V8DOMWrapper::createWrapper(creationContext, wrapperType, toScriptWrappableBase(), isolate); v8::Handle<v8::Object> wrapper = V8DOMWrapper::createWrapper(isolate, creationContext, wrapperType, toScriptWrappableBase());
if (UNLIKELY(wrapper.IsEmpty())) if (UNLIKELY(wrapper.IsEmpty()))
return wrapper; return wrapper;
......
...@@ -3234,7 +3234,7 @@ v8::Handle<v8::Object> Element::wrapCustomElement(v8::Handle<v8::Object> creatio ...@@ -3234,7 +3234,7 @@ v8::Handle<v8::Object> Element::wrapCustomElement(v8::Handle<v8::Object> creatio
return ContainerNode::wrap(creationContext, isolate); return ContainerNode::wrap(creationContext, isolate);
const WrapperTypeInfo* wrapperType = wrapperTypeInfo(); const WrapperTypeInfo* wrapperType = wrapperTypeInfo();
v8::Handle<v8::Object> wrapper = V8DOMWrapper::createWrapper(creationContext, wrapperType, toScriptWrappableBase(), isolate); v8::Handle<v8::Object> wrapper = V8DOMWrapper::createWrapper(isolate, creationContext, wrapperType, toScriptWrappableBase());
if (wrapper.IsEmpty()) if (wrapper.IsEmpty())
return v8::Handle<v8::Object>(); return v8::Handle<v8::Object>();
......
...@@ -2428,7 +2428,7 @@ v8::Handle<v8::Object> Node::wrap(v8::Handle<v8::Object> creationContext, v8::Is ...@@ -2428,7 +2428,7 @@ v8::Handle<v8::Object> Node::wrap(v8::Handle<v8::Object> creationContext, v8::Is
const WrapperTypeInfo* wrapperType = wrapperTypeInfo(); const WrapperTypeInfo* wrapperType = wrapperTypeInfo();
v8::Handle<v8::Object> wrapper = V8DOMWrapper::createWrapper(creationContext, wrapperType, toScriptWrappableBase(), isolate); v8::Handle<v8::Object> wrapper = V8DOMWrapper::createWrapper(isolate, creationContext, wrapperType, toScriptWrappableBase());
if (UNLIKELY(wrapper.IsEmpty())) if (UNLIKELY(wrapper.IsEmpty()))
return wrapper; return wrapper;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment