| Index: third_party/WebKit/Source/bindings/tests/results/core/V8TestObject.cpp
|
| diff --git a/third_party/WebKit/Source/bindings/tests/results/core/V8TestObject.cpp b/third_party/WebKit/Source/bindings/tests/results/core/V8TestObject.cpp
|
| index 6bcbda63c98277a8d1af6e34e3318223041a0e72..84333b56027266f8c44102ce0258860183e3f582 100644
|
| --- a/third_party/WebKit/Source/bindings/tests/results/core/V8TestObject.cpp
|
| +++ b/third_party/WebKit/Source/bindings/tests/results/core/V8TestObject.cpp
|
| @@ -1021,7 +1021,7 @@ static void nodeFilterAttributeAttributeSetter(v8::Local<v8::Value> v8Value, con
|
| {
|
| v8::Local<v8::Object> holder = info.Holder();
|
| TestObject* impl = V8TestObject::toImpl(holder);
|
| - RefPtrWillBeRawPtr<NodeFilter> cppValue = toNodeFilter(v8Value, info.Holder(), ScriptState::current(info.GetIsolate()));
|
| + RawPtr<NodeFilter> cppValue = toNodeFilter(v8Value, info.Holder(), ScriptState::current(info.GetIsolate()));
|
| impl->setNodeFilterAttribute(WTF::getPtr(cppValue));
|
| }
|
|
|
| @@ -3013,7 +3013,7 @@ static void locationAttributeSetter(v8::Local<v8::Value> v8Value, const v8::Func
|
| {
|
| v8::Local<v8::Object> holder = info.Holder();
|
| TestObject* proxyImpl = V8TestObject::toImpl(holder);
|
| - RefPtrWillBeRawPtr<TestNode> impl = WTF::getPtr(proxyImpl->location());
|
| + RawPtr<TestNode> impl = WTF::getPtr(proxyImpl->location());
|
| if (!impl)
|
| return;
|
| V8StringResource<> cppValue = v8Value;
|
| @@ -3045,7 +3045,7 @@ static void locationWithExceptionAttributeSetter(v8::Local<v8::Value> v8Value, c
|
| v8::Local<v8::Object> holder = info.Holder();
|
| ExceptionState exceptionState(ExceptionState::SetterContext, "locationWithException", "TestObject", holder, info.GetIsolate());
|
| TestObject* proxyImpl = V8TestObject::toImpl(holder);
|
| - RefPtrWillBeRawPtr<TestNode> impl = WTF::getPtr(proxyImpl->locationWithException());
|
| + RawPtr<TestNode> impl = WTF::getPtr(proxyImpl->locationWithException());
|
| if (!impl)
|
| return;
|
| V8StringResource<> cppValue = v8Value;
|
| @@ -3077,7 +3077,7 @@ static void locationWithCallWithAttributeSetter(v8::Local<v8::Value> v8Value, co
|
| {
|
| v8::Local<v8::Object> holder = info.Holder();
|
| TestObject* proxyImpl = V8TestObject::toImpl(holder);
|
| - RefPtrWillBeRawPtr<TestNode> impl = WTF::getPtr(proxyImpl->locationWithCallWith());
|
| + RawPtr<TestNode> impl = WTF::getPtr(proxyImpl->locationWithCallWith());
|
| if (!impl)
|
| return;
|
| V8StringResource<> cppValue = v8Value;
|
| @@ -3110,7 +3110,7 @@ static void locationByteStringAttributeSetter(v8::Local<v8::Value> v8Value, cons
|
| v8::Local<v8::Object> holder = info.Holder();
|
| ExceptionState exceptionState(ExceptionState::SetterContext, "locationByteString", "TestObject", holder, info.GetIsolate());
|
| TestObject* proxyImpl = V8TestObject::toImpl(holder);
|
| - RefPtrWillBeRawPtr<TestNode> impl = WTF::getPtr(proxyImpl->locationByteString());
|
| + RawPtr<TestNode> impl = WTF::getPtr(proxyImpl->locationByteString());
|
| if (!impl)
|
| return;
|
| V8StringResource<> cppValue = toByteString(info.GetIsolate(), v8Value, exceptionState);
|
| @@ -3141,7 +3141,7 @@ static void locationWithPerWorldBindingsAttributeSetter(v8::Local<v8::Value> v8V
|
| {
|
| v8::Local<v8::Object> holder = info.Holder();
|
| TestObject* proxyImpl = V8TestObject::toImpl(holder);
|
| - RefPtrWillBeRawPtr<TestNode> impl = WTF::getPtr(proxyImpl->locationWithPerWorldBindings());
|
| + RawPtr<TestNode> impl = WTF::getPtr(proxyImpl->locationWithPerWorldBindings());
|
| if (!impl)
|
| return;
|
| V8StringResource<> cppValue = v8Value;
|
| @@ -3172,7 +3172,7 @@ static void locationWithPerWorldBindingsAttributeSetterForMainWorld(v8::Local<v8
|
| {
|
| v8::Local<v8::Object> holder = info.Holder();
|
| TestObject* proxyImpl = V8TestObject::toImpl(holder);
|
| - RefPtrWillBeRawPtr<TestNode> impl = WTF::getPtr(proxyImpl->locationWithPerWorldBindings());
|
| + RawPtr<TestNode> impl = WTF::getPtr(proxyImpl->locationWithPerWorldBindings());
|
| if (!impl)
|
| return;
|
| V8StringResource<> cppValue = v8Value;
|
| @@ -3203,7 +3203,7 @@ static void locationLegacyInterfaceTypeCheckingAttributeSetter(v8::Local<v8::Val
|
| {
|
| v8::Local<v8::Object> holder = info.Holder();
|
| TestObject* proxyImpl = V8TestObject::toImpl(holder);
|
| - RefPtrWillBeRawPtr<TestNode> impl = WTF::getPtr(proxyImpl->locationLegacyInterfaceTypeChecking());
|
| + RawPtr<TestNode> impl = WTF::getPtr(proxyImpl->locationLegacyInterfaceTypeChecking());
|
| if (!impl)
|
| return;
|
| V8StringResource<> cppValue = v8Value;
|
| @@ -3264,7 +3264,7 @@ static void locationWillBeGarbageCollectedAttributeGetter(const v8::FunctionCall
|
| {
|
| v8::Local<v8::Object> holder = info.Holder();
|
| TestObject* impl = V8TestObject::toImpl(holder);
|
| - RefPtrWillBeRawPtr<TestInterfaceWillBeGarbageCollected> cppValue(impl->locationWillBeGarbageCollected());
|
| + RawPtr<TestInterfaceWillBeGarbageCollected> cppValue(impl->locationWillBeGarbageCollected());
|
| if (cppValue && DOMDataStore::setReturnValue(info.GetReturnValue(), cppValue.get()))
|
| return;
|
| v8::Local<v8::Value> v8Value(toV8(cppValue.get(), holder, info.GetIsolate()));
|
| @@ -3284,7 +3284,7 @@ static void locationWillBeGarbageCollectedAttributeSetter(v8::Local<v8::Value> v
|
| v8::Local<v8::Object> holder = info.Holder();
|
| ExceptionState exceptionState(ExceptionState::SetterContext, "locationWillBeGarbageCollected", "TestObject", holder, info.GetIsolate());
|
| TestObject* proxyImpl = V8TestObject::toImpl(holder);
|
| - RefPtrWillBeRawPtr<TestInterfaceWillBeGarbageCollected> impl = WTF::getPtr(proxyImpl->locationWillBeGarbageCollected());
|
| + RawPtr<TestInterfaceWillBeGarbageCollected> impl = WTF::getPtr(proxyImpl->locationWillBeGarbageCollected());
|
| if (!impl)
|
| return;
|
| TestInterfaceWillBeGarbageCollected* cppValue = V8TestInterfaceWillBeGarbageCollected::toImplWithTypeCheck(info.GetIsolate(), v8Value);
|
| @@ -4145,7 +4145,7 @@ static void locationPutForwardsAttributeSetter(v8::Local<v8::Value> v8Value, con
|
| {
|
| v8::Local<v8::Object> holder = info.Holder();
|
| TestObject* proxyImpl = V8TestObject::toImpl(holder);
|
| - RefPtrWillBeRawPtr<TestNode> impl = WTF::getPtr(proxyImpl->locationPutForwards());
|
| + RawPtr<TestNode> impl = WTF::getPtr(proxyImpl->locationPutForwards());
|
| if (!impl)
|
| return;
|
| V8StringResource<> cppValue = v8Value;
|
| @@ -4882,7 +4882,7 @@ static void nodeAttributeAttributeGetter(const v8::FunctionCallbackInfo<v8::Valu
|
| {
|
| v8::Local<v8::Object> holder = info.Holder();
|
| TestObject* impl = V8TestObject::toImpl(holder);
|
| - RefPtrWillBeRawPtr<Node> result = nullptr;
|
| + RawPtr<Node> result = nullptr;
|
| if (!V8TestObject::PrivateScript::nodeAttributeAttributeGetter(toLocalFrame(toFrameIfNotDetached(info.GetIsolate()->GetCurrentContext())), impl, &result))
|
| return;
|
| v8SetReturnValueFast(info, WTF::getPtr(result.release()), impl);
|
| @@ -7009,7 +7009,7 @@ static void voidMethodNodeFilterArgMethod(const v8::FunctionCallbackInfo<v8::Val
|
| return;
|
| }
|
| TestObject* impl = V8TestObject::toImpl(info.Holder());
|
| - RefPtrWillBeRawPtr<NodeFilter> nodeFilterArg;
|
| + RawPtr<NodeFilter> nodeFilterArg;
|
| {
|
| nodeFilterArg = toNodeFilter(info[0], info.Holder(), ScriptState::current(info.GetIsolate()));
|
| }
|
| @@ -7896,7 +7896,7 @@ static void voidMethodVariadicTestInterfaceWillBeGarbageCollectedArgMethod(const
|
| {
|
| ExceptionState exceptionState(ExceptionState::ExecutionContext, "voidMethodVariadicTestInterfaceWillBeGarbageCollectedArg", "TestObject", info.Holder(), info.GetIsolate());
|
| TestObject* impl = V8TestObject::toImpl(info.Holder());
|
| - WillBeHeapVector<RefPtrWillBeMember<TestInterfaceWillBeGarbageCollected>> variadicTestInterfaceWillBeGarbageCollectedArg;
|
| + HeapVector<Member<TestInterfaceWillBeGarbageCollected>> variadicTestInterfaceWillBeGarbageCollectedArg;
|
| {
|
| for (int i = 0; i < info.Length(); ++i) {
|
| if (!V8TestInterfaceWillBeGarbageCollected::hasInstance(info[i], info.GetIsolate())) {
|
| @@ -9280,7 +9280,7 @@ static void callWithScriptStateScriptArgumentsVoidMethodMethod(const v8::Functio
|
| {
|
| TestObject* impl = V8TestObject::toImpl(info.Holder());
|
| ScriptState* scriptState = ScriptState::current(info.GetIsolate());
|
| - RefPtrWillBeRawPtr<ScriptArguments> scriptArguments(ScriptArguments::create(scriptState, info, 0));
|
| + RawPtr<ScriptArguments> scriptArguments(ScriptArguments::create(scriptState, info, 0));
|
| impl->callWithScriptStateScriptArgumentsVoidMethod(scriptState, scriptArguments.release());
|
| }
|
|
|
| @@ -9303,7 +9303,7 @@ static void callWithScriptStateScriptArgumentsVoidMethodOptionalBooleanArgMethod
|
| }
|
| if (UNLIKELY(numArgsPassed <= 0)) {
|
| ScriptState* scriptState = ScriptState::current(info.GetIsolate());
|
| - RefPtrWillBeRawPtr<ScriptArguments> scriptArguments(ScriptArguments::create(scriptState, info, 1));
|
| + RawPtr<ScriptArguments> scriptArguments(ScriptArguments::create(scriptState, info, 1));
|
| impl->callWithScriptStateScriptArgumentsVoidMethodOptionalBooleanArg(scriptState, scriptArguments.release());
|
| return;
|
| }
|
| @@ -9312,7 +9312,7 @@ static void callWithScriptStateScriptArgumentsVoidMethodOptionalBooleanArgMethod
|
| return;
|
| }
|
| ScriptState* scriptState = ScriptState::current(info.GetIsolate());
|
| - RefPtrWillBeRawPtr<ScriptArguments> scriptArguments(ScriptArguments::create(scriptState, info, 1));
|
| + RawPtr<ScriptArguments> scriptArguments(ScriptArguments::create(scriptState, info, 1));
|
| impl->callWithScriptStateScriptArgumentsVoidMethodOptionalBooleanArg(scriptState, scriptArguments.release(), optionalBooleanArg);
|
| }
|
|
|
| @@ -10192,7 +10192,7 @@ void postMessageImpl(const char* interfaceName, TestObject* instance, const v8::
|
| exceptionState.throwIfNeeded();
|
| return;
|
| }
|
| - OwnPtrWillBeRawPtr<MessagePortArray> ports = adoptPtrWillBeNoop(new MessagePortArray);
|
| + RawPtr<MessagePortArray> ports = adoptPtrWillBeNoop(new MessagePortArray);
|
| ArrayBufferArray arrayBuffers;
|
| ImageBitmapArray imageBitmaps;
|
| if (info.Length() > 1) {
|
| @@ -10906,9 +10906,9 @@ static void voidMethodTestInterfaceWillBeGarbageCollectedSequenceArgMethod(const
|
| return;
|
| }
|
| TestObject* impl = V8TestObject::toImpl(info.Holder());
|
| - WillBeHeapVector<RefPtrWillBeMember<TestInterfaceWillBeGarbageCollected>> testInterfaceWillBeGarbageCollectedSequenceArg;
|
| + HeapVector<Member<TestInterfaceWillBeGarbageCollected>> testInterfaceWillBeGarbageCollectedSequenceArg;
|
| {
|
| - testInterfaceWillBeGarbageCollectedSequenceArg = (toRefPtrWillBeMemberNativeArray<TestInterfaceWillBeGarbageCollected, V8TestInterfaceWillBeGarbageCollected>(info[0], 1, info.GetIsolate(), exceptionState));
|
| + testInterfaceWillBeGarbageCollectedSequenceArg = (toMemberNativeArray<TestInterfaceWillBeGarbageCollected, V8TestInterfaceWillBeGarbageCollected>(info[0], 1, info.GetIsolate(), exceptionState));
|
| if (exceptionState.throwIfNeeded())
|
| return;
|
| }
|
| @@ -10929,9 +10929,9 @@ static void voidMethodTestInterfaceWillBeGarbageCollectedArrayArgMethod(const v8
|
| return;
|
| }
|
| TestObject* impl = V8TestObject::toImpl(info.Holder());
|
| - WillBeHeapVector<RefPtrWillBeMember<TestInterfaceWillBeGarbageCollected>> testInterfaceWillBeGarbageCollectedArrayArg;
|
| + HeapVector<Member<TestInterfaceWillBeGarbageCollected>> testInterfaceWillBeGarbageCollectedArrayArg;
|
| {
|
| - testInterfaceWillBeGarbageCollectedArrayArg = (toRefPtrWillBeMemberNativeArray<TestInterfaceWillBeGarbageCollected, V8TestInterfaceWillBeGarbageCollected>(info[0], 1, info.GetIsolate(), exceptionState));
|
| + testInterfaceWillBeGarbageCollectedArrayArg = (toMemberNativeArray<TestInterfaceWillBeGarbageCollected, V8TestInterfaceWillBeGarbageCollected>(info[0], 1, info.GetIsolate(), exceptionState));
|
| if (exceptionState.throwIfNeeded())
|
| return;
|
| }
|
| @@ -11055,7 +11055,7 @@ static void nodeMethodWithNodeArgumentImplementedInPrivateScriptMethod(const v8:
|
| return;
|
| }
|
| }
|
| - RefPtrWillBeRawPtr<Node> result = nullptr;
|
| + RawPtr<Node> result = nullptr;
|
| if (!V8TestObject::PrivateScript::nodeMethodWithNodeArgumentImplementedInPrivateScriptMethod(toLocalFrame(toFrameIfNotDetached(info.GetIsolate()->GetCurrentContext())), impl, value, &result))
|
| return;
|
| v8SetReturnValue(info, result.release());
|
| @@ -11103,7 +11103,7 @@ static void nodeMethodWithVariousArgumentsImplementedInPrivateScriptMethod(const
|
| if (!string.prepare())
|
| return;
|
| }
|
| - RefPtrWillBeRawPtr<Node> result = nullptr;
|
| + RawPtr<Node> result = nullptr;
|
| if (!V8TestObject::PrivateScript::nodeMethodWithVariousArgumentsImplementedInPrivateScriptMethod(toLocalFrame(toFrameIfNotDetached(info.GetIsolate()->GetCurrentContext())), impl, document, node, value1, value2, string, &result))
|
| return;
|
| v8SetReturnValue(info, result.release());
|
| @@ -12279,7 +12279,7 @@ bool V8TestObject::PrivateScript::stringMethodWithStringArgumentImplementedInPri
|
| return true;
|
| }
|
|
|
| -bool V8TestObject::PrivateScript::nodeMethodWithNodeArgumentImplementedInPrivateScriptMethod(LocalFrame* frame, TestObject* holderImpl, PassRefPtrWillBeRawPtr<Node> value, RefPtrWillBeRawPtr<Node>* result)
|
| +bool V8TestObject::PrivateScript::nodeMethodWithNodeArgumentImplementedInPrivateScriptMethod(LocalFrame* frame, TestObject* holderImpl, Node* value, RawPtr<Node>* result)
|
| {
|
| if (!frame)
|
| return false;
|
| @@ -12309,7 +12309,7 @@ bool V8TestObject::PrivateScript::nodeMethodWithNodeArgumentImplementedInPrivate
|
| return true;
|
| }
|
|
|
| -bool V8TestObject::PrivateScript::nodeMethodWithVariousArgumentsImplementedInPrivateScriptMethod(LocalFrame* frame, TestObject* holderImpl, PassRefPtrWillBeRawPtr<Document> document, PassRefPtrWillBeRawPtr<Node> node, int value1, double value2, String string, RefPtrWillBeRawPtr<Node>* result)
|
| +bool V8TestObject::PrivateScript::nodeMethodWithVariousArgumentsImplementedInPrivateScriptMethod(LocalFrame* frame, TestObject* holderImpl, Document* document, Node* node, int value1, double value2, String string, RawPtr<Node>* result)
|
| {
|
| if (!frame)
|
| return false;
|
| @@ -12513,7 +12513,7 @@ bool V8TestObject::PrivateScript::stringAttributeAttributeSetter(LocalFrame* fra
|
| return PrivateScriptRunner::runDOMAttributeSetter(scriptState, scriptStateInUserScript, "TestObject", "stringAttribute", holder, v8String(scriptState->isolate(), cppValue));
|
| }
|
|
|
| -bool V8TestObject::PrivateScript::nodeAttributeAttributeGetter(LocalFrame* frame, TestObject* holderImpl, RefPtrWillBeRawPtr<Node>* result)
|
| +bool V8TestObject::PrivateScript::nodeAttributeAttributeGetter(LocalFrame* frame, TestObject* holderImpl, RawPtr<Node>* result)
|
| {
|
| if (!frame)
|
| return false;
|
| @@ -12542,7 +12542,7 @@ bool V8TestObject::PrivateScript::nodeAttributeAttributeGetter(LocalFrame* frame
|
| return true;
|
| }
|
|
|
| -bool V8TestObject::PrivateScript::nodeAttributeAttributeSetter(LocalFrame* frame, TestObject* holderImpl, PassRefPtrWillBeRawPtr<Node> cppValue)
|
| +bool V8TestObject::PrivateScript::nodeAttributeAttributeSetter(LocalFrame* frame, TestObject* holderImpl, Node* cppValue)
|
| {
|
| if (!frame)
|
| return false;
|
|
|