| Index: Source/bindings/core/v8/custom/V8InjectedScriptHostCustom.cpp
|
| diff --git a/Source/bindings/core/v8/custom/V8InjectedScriptHostCustom.cpp b/Source/bindings/core/v8/custom/V8InjectedScriptHostCustom.cpp
|
| index ea0d2ec28aa4e50d3c2ffed26bfa5d76ccdfaa50..5b8bc118e4e701976f10cc1ce3443cebc7e29945 100644
|
| --- a/Source/bindings/core/v8/custom/V8InjectedScriptHostCustom.cpp
|
| +++ b/Source/bindings/core/v8/custom/V8InjectedScriptHostCustom.cpp
|
| @@ -69,7 +69,7 @@ Node* InjectedScriptHost::scriptValueAsNode(ScriptState* scriptState, ScriptValu
|
| ScriptState::Scope scope(scriptState);
|
| if (!value.isObject() || value.isNull())
|
| return 0;
|
| - return V8Node::toNative(v8::Handle<v8::Object>::Cast(value.v8Value()));
|
| + return V8Node::toImpl(v8::Handle<v8::Object>::Cast(value.v8Value()));
|
| }
|
|
|
| ScriptValue InjectedScriptHost::nodeAsScriptValue(ScriptState* scriptState, Node* node)
|
| @@ -92,7 +92,7 @@ void V8InjectedScriptHost::inspectedObjectMethodCustom(const v8::FunctionCallbac
|
| return;
|
| }
|
|
|
| - InjectedScriptHost* host = V8InjectedScriptHost::toNative(info.Holder());
|
| + InjectedScriptHost* host = V8InjectedScriptHost::toImpl(info.Holder());
|
| InjectedScriptHost::InspectableObject* object = host->inspectedObject(info[0]->ToInt32()->Value());
|
| v8SetReturnValue(info, object->get(ScriptState::current(info.GetIsolate())).v8Value());
|
| }
|
| @@ -212,7 +212,7 @@ void V8InjectedScriptHost::functionDetailsMethodCustom(const v8::FunctionCallbac
|
| v8::Handle<v8::String> name = functionDisplayName(function);
|
| result->Set(v8AtomicString(isolate, "functionName"), name.IsEmpty() ? v8AtomicString(isolate, "") : name);
|
|
|
| - InjectedScriptHost* host = V8InjectedScriptHost::toNative(info.Holder());
|
| + InjectedScriptHost* host = V8InjectedScriptHost::toImpl(info.Holder());
|
| ScriptDebugServer& debugServer = host->scriptDebugServer();
|
| v8::Handle<v8::Value> scopes = debugServer.functionScopes(function);
|
| if (!scopes.IsEmpty() && scopes->IsArray())
|
| @@ -228,7 +228,7 @@ void V8InjectedScriptHost::collectionEntriesMethodCustom(const v8::FunctionCallb
|
|
|
| v8::Handle<v8::Object> object = v8::Handle<v8::Object>::Cast(info[0]);
|
|
|
| - InjectedScriptHost* host = V8InjectedScriptHost::toNative(info.Holder());
|
| + InjectedScriptHost* host = V8InjectedScriptHost::toImpl(info.Holder());
|
| ScriptDebugServer& debugServer = host->scriptDebugServer();
|
| v8SetReturnValue(info, debugServer.collectionEntries(object));
|
| }
|
| @@ -240,7 +240,7 @@ void V8InjectedScriptHost::getInternalPropertiesMethodCustom(const v8::FunctionC
|
|
|
| v8::Handle<v8::Object> object = v8::Handle<v8::Object>::Cast(info[0]);
|
|
|
| - InjectedScriptHost* host = V8InjectedScriptHost::toNative(info.Holder());
|
| + InjectedScriptHost* host = V8InjectedScriptHost::toImpl(info.Holder());
|
| ScriptDebugServer& debugServer = host->scriptDebugServer();
|
| v8SetReturnValue(info, debugServer.getInternalProperties(object));
|
| }
|
| @@ -284,7 +284,7 @@ void V8InjectedScriptHost::getEventListenersMethodCustom(const v8::FunctionCallb
|
|
|
|
|
| v8::Local<v8::Value> value = info[0];
|
| - EventTarget* target = V8EventTarget::toNativeWithTypeCheck(info.GetIsolate(), value);
|
| + EventTarget* target = V8EventTarget::toImplWithTypeCheck(info.GetIsolate(), value);
|
|
|
| // We need to handle a LocalDOMWindow specially, because a LocalDOMWindow wrapper exists on a prototype chain.
|
| if (!target)
|
| @@ -293,7 +293,7 @@ void V8InjectedScriptHost::getEventListenersMethodCustom(const v8::FunctionCallb
|
| if (!target || !target->executionContext())
|
| return;
|
|
|
| - InjectedScriptHost* host = V8InjectedScriptHost::toNative(info.Holder());
|
| + InjectedScriptHost* host = V8InjectedScriptHost::toImpl(info.Holder());
|
| Vector<EventListenerInfo> listenersArray;
|
| host->getEventListenersImpl(target, listenersArray);
|
|
|
| @@ -314,7 +314,7 @@ void V8InjectedScriptHost::inspectMethodCustom(const v8::FunctionCallbackInfo<v8
|
| if (info.Length() < 2)
|
| return;
|
|
|
| - InjectedScriptHost* host = V8InjectedScriptHost::toNative(info.Holder());
|
| + InjectedScriptHost* host = V8InjectedScriptHost::toImpl(info.Holder());
|
| ScriptState* scriptState = ScriptState::current(info.GetIsolate());
|
| ScriptValue object(scriptState, info[0]);
|
| ScriptValue hints(scriptState, info[1]);
|
| @@ -381,7 +381,7 @@ void V8InjectedScriptHost::setFunctionVariableValueMethodCustom(const v8::Functi
|
| String variableName = toCoreStringWithUndefinedOrNullCheck(info[2]);
|
| v8::Handle<v8::Value> newValue = info[3];
|
|
|
| - InjectedScriptHost* host = V8InjectedScriptHost::toNative(info.Holder());
|
| + InjectedScriptHost* host = V8InjectedScriptHost::toImpl(info.Holder());
|
| ScriptDebugServer& debugServer = host->scriptDebugServer();
|
| v8SetReturnValue(info, debugServer.setFunctionVariableValue(functionValue, scopeIndex, variableName, newValue));
|
| }
|
| @@ -410,7 +410,7 @@ void V8InjectedScriptHost::debugFunctionMethodCustom(const v8::FunctionCallbackI
|
| if (!getFunctionLocation(info, &scriptId, &lineNumber, &columnNumber))
|
| return;
|
|
|
| - InjectedScriptHost* host = V8InjectedScriptHost::toNative(info.Holder());
|
| + InjectedScriptHost* host = V8InjectedScriptHost::toImpl(info.Holder());
|
| host->debugFunction(scriptId, lineNumber, columnNumber);
|
| }
|
|
|
| @@ -422,7 +422,7 @@ void V8InjectedScriptHost::undebugFunctionMethodCustom(const v8::FunctionCallbac
|
| if (!getFunctionLocation(info, &scriptId, &lineNumber, &columnNumber))
|
| return;
|
|
|
| - InjectedScriptHost* host = V8InjectedScriptHost::toNative(info.Holder());
|
| + InjectedScriptHost* host = V8InjectedScriptHost::toImpl(info.Holder());
|
| host->undebugFunction(scriptId, lineNumber, columnNumber);
|
| }
|
|
|
| @@ -442,7 +442,7 @@ void V8InjectedScriptHost::monitorFunctionMethodCustom(const v8::FunctionCallbac
|
| name = function->GetInferredName();
|
| }
|
|
|
| - InjectedScriptHost* host = V8InjectedScriptHost::toNative(info.Holder());
|
| + InjectedScriptHost* host = V8InjectedScriptHost::toImpl(info.Holder());
|
| host->monitorFunction(scriptId, lineNumber, columnNumber, toCoreStringWithUndefinedOrNullCheck(name));
|
| }
|
|
|
| @@ -454,7 +454,7 @@ void V8InjectedScriptHost::unmonitorFunctionMethodCustom(const v8::FunctionCallb
|
| if (!getFunctionLocation(info, &scriptId, &lineNumber, &columnNumber))
|
| return;
|
|
|
| - InjectedScriptHost* host = V8InjectedScriptHost::toNative(info.Holder());
|
| + InjectedScriptHost* host = V8InjectedScriptHost::toImpl(info.Holder());
|
| host->unmonitorFunction(scriptId, lineNumber, columnNumber);
|
| }
|
|
|
| @@ -491,7 +491,7 @@ void V8InjectedScriptHost::callFunctionMethodCustom(const v8::FunctionCallbackIn
|
|
|
| void V8InjectedScriptHost::suppressWarningsAndCallFunctionMethodCustom(const v8::FunctionCallbackInfo<v8::Value>& info)
|
| {
|
| - InjectedScriptHost* host = V8InjectedScriptHost::toNative(info.Holder());
|
| + InjectedScriptHost* host = V8InjectedScriptHost::toImpl(info.Holder());
|
| ScriptDebugServer& debugServer = host->scriptDebugServer();
|
| debugServer.muteWarningsAndDeprecations();
|
|
|
|
|