Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1148)

Unified Diff: third_party/WebKit/Source/bindings/tests/results/core/V8TestObject.cpp

Issue 2408083003: Drop [ExperimentalCallbackFunction] (Closed)
Patch Set: Update tests and expectations Created 4 years, 2 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
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 bfd7a70158cded20cc868f9a91a6d463cfa6b69a..a1ac418547a4cff6bd0e2e372237eaf1386184b3 100644
--- a/third_party/WebKit/Source/bindings/tests/results/core/V8TestObject.cpp
+++ b/third_party/WebKit/Source/bindings/tests/results/core/V8TestObject.cpp
@@ -7,6 +7,7 @@
// clang-format off
#include "V8TestObject.h"
+#include "bindings/core/v8/AnyCallbackFunctionOptionalAnyArg.h"
#include "bindings/core/v8/ArrayBufferOrArrayBufferViewOrDictionary.h"
#include "bindings/core/v8/BindingSecurity.h"
#include "bindings/core/v8/BooleanOrStringOrUnrestrictedDouble.h"
@@ -14,7 +15,7 @@
#include "bindings/core/v8/DoubleOrString.h"
#include "bindings/core/v8/ExceptionState.h"
#include "bindings/core/v8/GeneratedCodeHelper.h"
-#include "bindings/core/v8/LongExperimentalCallbackFunction.h"
+#include "bindings/core/v8/LongCallbackFunction.h"
#include "bindings/core/v8/PrivateScriptRunner.h"
#include "bindings/core/v8/ScriptCallStack.h"
#include "bindings/core/v8/ScriptPromise.h"
@@ -63,7 +64,7 @@
#include "bindings/core/v8/V8Uint8Array.h"
#include "bindings/core/v8/V8Window.h"
#include "bindings/core/v8/V8XPathNSResolver.h"
-#include "bindings/core/v8/VoidExperimentalCallbackFunction.h"
+#include "bindings/core/v8/VoidCallbackFunction.h"
#include "core/HTMLNames.h"
#include "core/dom/ClassCollection.h"
#include "core/dom/Document.h"
@@ -948,7 +949,7 @@ static void voidCallbackFunctionAttributeAttributeGetter(const v8::FunctionCallb
TestObject* impl = V8TestObject::toImpl(holder);
- v8SetReturnValue(info, impl->voidCallbackFunctionAttribute().v8Value());
+ v8SetReturnValueFast(info, impl->voidCallbackFunctionAttribute(), impl);
}
void voidCallbackFunctionAttributeAttributeGetterCallback(const v8::FunctionCallbackInfo<v8::Value>& info)
@@ -962,7 +963,7 @@ static void voidCallbackFunctionAttributeAttributeSetter(v8::Local<v8::Value> v8
TestObject* impl = V8TestObject::toImpl(holder);
// Prepare the value to be set.
- ScriptValue cppValue = ScriptValue(ScriptState::current(info.GetIsolate()), v8Value);
+ VoidCallbackFunction* cppValue = VoidCallbackFunction::create(info.GetIsolate(), v8::Local<v8::Function>::Cast(v8Value));
impl->setVoidCallbackFunctionAttribute(cppValue);
}
@@ -980,7 +981,7 @@ static void anyCallbackFunctionOptionalAnyArgAttributeAttributeGetter(const v8::
TestObject* impl = V8TestObject::toImpl(holder);
- v8SetReturnValue(info, impl->anyCallbackFunctionOptionalAnyArgAttribute().v8Value());
+ v8SetReturnValueFast(info, impl->anyCallbackFunctionOptionalAnyArgAttribute(), impl);
}
void anyCallbackFunctionOptionalAnyArgAttributeAttributeGetterCallback(const v8::FunctionCallbackInfo<v8::Value>& info)
@@ -994,7 +995,7 @@ static void anyCallbackFunctionOptionalAnyArgAttributeAttributeSetter(v8::Local<
TestObject* impl = V8TestObject::toImpl(holder);
// Prepare the value to be set.
- ScriptValue cppValue = ScriptValue(ScriptState::current(info.GetIsolate()), v8Value);
+ AnyCallbackFunctionOptionalAnyArg* cppValue = AnyCallbackFunctionOptionalAnyArg::create(info.GetIsolate(), v8::Local<v8::Function>::Cast(v8Value));
impl->setAnyCallbackFunctionOptionalAnyArgAttribute(cppValue);
}
@@ -6748,7 +6749,7 @@ static void voidCallbackFunctionMethodMethod(const v8::FunctionCallbackInfo<v8::
{
TestObject* impl = V8TestObject::toImpl(info.Holder());
- v8SetReturnValue(info, impl->voidCallbackFunctionMethod().v8Value());
+ v8SetReturnValue(info, impl->voidCallbackFunctionMethod());
}
static void voidCallbackFunctionMethodMethodCallback(const v8::FunctionCallbackInfo<v8::Value>& info)
@@ -6760,7 +6761,7 @@ static void anyCallbackFunctionOptionalAnyArgMethodMethod(const v8::FunctionCall
{
TestObject* impl = V8TestObject::toImpl(info.Holder());
- v8SetReturnValue(info, impl->anyCallbackFunctionOptionalAnyArgMethod().v8Value());
+ v8SetReturnValue(info, impl->anyCallbackFunctionOptionalAnyArgMethod());
}
static void anyCallbackFunctionOptionalAnyArgMethodMethodCallback(const v8::FunctionCallbackInfo<v8::Value>& info)
@@ -6777,13 +6778,13 @@ static void voidMethodVoidCallbackFunctionArgMethod(const v8::FunctionCallbackIn
return;
}
- ScriptValue voidCallbackFunctionArg;
+ VoidCallbackFunction* voidCallbackFunctionArg;
if (!info[0]->IsFunction()) {
V8ThrowException::throwTypeError(info.GetIsolate(), ExceptionMessages::failedToExecute("voidMethodVoidCallbackFunctionArg", "TestObject", "The callback provided as parameter 1 is not a function."));
return;
}
- voidCallbackFunctionArg = ScriptValue(ScriptState::current(info.GetIsolate()), info[0]);
+ voidCallbackFunctionArg = VoidCallbackFunction::create(info.GetIsolate(), v8::Local<v8::Function>::Cast(info[0]));
impl->voidMethodVoidCallbackFunctionArg(voidCallbackFunctionArg);
}
@@ -6797,7 +6798,7 @@ static void voidMethodOptionalVoidCallbackFunctionArgMethod(const v8::FunctionCa
{
TestObject* impl = V8TestObject::toImpl(info.Holder());
- ScriptValue voidCallbackFunctionArg;
+ VoidCallbackFunction* voidCallbackFunctionArg;
int numArgsPassed = info.Length();
while (numArgsPassed > 0) {
if (!info[numArgsPassed - 1]->IsUndefined())
@@ -6813,7 +6814,7 @@ static void voidMethodOptionalVoidCallbackFunctionArgMethod(const v8::FunctionCa
return;
}
- voidCallbackFunctionArg = ScriptValue(ScriptState::current(info.GetIsolate()), info[0]);
+ voidCallbackFunctionArg = VoidCallbackFunction::create(info.GetIsolate(), v8::Local<v8::Function>::Cast(info[0]));
impl->voidMethodOptionalVoidCallbackFunctionArg(voidCallbackFunctionArg);
}
@@ -6832,13 +6833,13 @@ static void voidMethodNullableVoidCallbackFunctionArgMethod(const v8::FunctionCa
return;
}
- ScriptValue voidCallbackFunctionArg;
+ Nullable<VoidCallbackFunction*> voidCallbackFunctionArg;
if (!info[0]->IsFunction() && !info[0]->IsNull()) {
V8ThrowException::throwTypeError(info.GetIsolate(), ExceptionMessages::failedToExecute("voidMethodNullableVoidCallbackFunctionArg", "TestObject", "The callback provided as parameter 1 is not a function."));
return;
}
- voidCallbackFunctionArg = ScriptValue(ScriptState::current(info.GetIsolate()), info[0]);
+ voidCallbackFunctionArg = VoidCallbackFunction::create(info.GetIsolate(), v8::Local<v8::Function>::Cast(info[0]));
impl->voidMethodNullableVoidCallbackFunctionArg(voidCallbackFunctionArg);
}
@@ -6857,13 +6858,13 @@ static void voidMethodAnyCallbackFunctionOptionalAnyArgMethod(const v8::Function
return;
}
- ScriptValue anyCallbackFunctionOptionalAnyArgArg;
+ AnyCallbackFunctionOptionalAnyArg* anyCallbackFunctionOptionalAnyArgArg;
if (!info[0]->IsFunction()) {
V8ThrowException::throwTypeError(info.GetIsolate(), ExceptionMessages::failedToExecute("voidMethodAnyCallbackFunctionOptionalAnyArg", "TestObject", "The callback provided as parameter 1 is not a function."));
return;
}
- anyCallbackFunctionOptionalAnyArgArg = ScriptValue(ScriptState::current(info.GetIsolate()), info[0]);
+ anyCallbackFunctionOptionalAnyArgArg = AnyCallbackFunctionOptionalAnyArg::create(info.GetIsolate(), v8::Local<v8::Function>::Cast(info[0]));
impl->voidMethodAnyCallbackFunctionOptionalAnyArg(anyCallbackFunctionOptionalAnyArgArg);
}
@@ -6873,54 +6874,29 @@ static void voidMethodAnyCallbackFunctionOptionalAnyArgMethodCallback(const v8::
TestObjectV8Internal::voidMethodAnyCallbackFunctionOptionalAnyArgMethod(info);
}
-static void voidMethodVoidExperimentalCallbackFunctionArgMethod(const v8::FunctionCallbackInfo<v8::Value>& info)
-{
- TestObject* impl = V8TestObject::toImpl(info.Holder());
-
- if (UNLIKELY(info.Length() < 1)) {
- V8ThrowException::throwTypeError(info.GetIsolate(), ExceptionMessages::failedToExecute("voidMethodVoidExperimentalCallbackFunctionArg", "TestObject", ExceptionMessages::notEnoughArguments(1, info.Length())));
- return;
- }
-
- VoidExperimentalCallbackFunction* voidExperimentalCallbackFunctionArg;
- if (!info[0]->IsFunction()) {
- V8ThrowException::throwTypeError(info.GetIsolate(), ExceptionMessages::failedToExecute("voidMethodVoidExperimentalCallbackFunctionArg", "TestObject", "The callback provided as parameter 1 is not a function."));
-
- return;
- }
- voidExperimentalCallbackFunctionArg = VoidExperimentalCallbackFunction::create(info.GetIsolate(), v8::Local<v8::Function>::Cast(info[0]));
-
- impl->voidMethodVoidExperimentalCallbackFunctionArg(voidExperimentalCallbackFunctionArg);
-}
-
-static void voidMethodVoidExperimentalCallbackFunctionArgMethodCallback(const v8::FunctionCallbackInfo<v8::Value>& info)
-{
- TestObjectV8Internal::voidMethodVoidExperimentalCallbackFunctionArgMethod(info);
-}
-
-static void voidMethodLongExperimentalCallbackFunctionArgMethod(const v8::FunctionCallbackInfo<v8::Value>& info)
+static void voidMethodLongCallbackFunctionArgMethod(const v8::FunctionCallbackInfo<v8::Value>& info)
{
TestObject* impl = V8TestObject::toImpl(info.Holder());
if (UNLIKELY(info.Length() < 1)) {
- V8ThrowException::throwTypeError(info.GetIsolate(), ExceptionMessages::failedToExecute("voidMethodLongExperimentalCallbackFunctionArg", "TestObject", ExceptionMessages::notEnoughArguments(1, info.Length())));
+ V8ThrowException::throwTypeError(info.GetIsolate(), ExceptionMessages::failedToExecute("voidMethodLongCallbackFunctionArg", "TestObject", ExceptionMessages::notEnoughArguments(1, info.Length())));
return;
}
- LongExperimentalCallbackFunction* longExperimentalCallbackFunctionArg;
+ LongCallbackFunction* longCallbackFunctionArg;
if (!info[0]->IsFunction()) {
- V8ThrowException::throwTypeError(info.GetIsolate(), ExceptionMessages::failedToExecute("voidMethodLongExperimentalCallbackFunctionArg", "TestObject", "The callback provided as parameter 1 is not a function."));
+ V8ThrowException::throwTypeError(info.GetIsolate(), ExceptionMessages::failedToExecute("voidMethodLongCallbackFunctionArg", "TestObject", "The callback provided as parameter 1 is not a function."));
return;
}
- longExperimentalCallbackFunctionArg = LongExperimentalCallbackFunction::create(info.GetIsolate(), v8::Local<v8::Function>::Cast(info[0]));
+ longCallbackFunctionArg = LongCallbackFunction::create(info.GetIsolate(), v8::Local<v8::Function>::Cast(info[0]));
- impl->voidMethodLongExperimentalCallbackFunctionArg(longExperimentalCallbackFunctionArg);
+ impl->voidMethodLongCallbackFunctionArg(longCallbackFunctionArg);
}
-static void voidMethodLongExperimentalCallbackFunctionArgMethodCallback(const v8::FunctionCallbackInfo<v8::Value>& info)
+static void voidMethodLongCallbackFunctionArgMethodCallback(const v8::FunctionCallbackInfo<v8::Value>& info)
{
- TestObjectV8Internal::voidMethodLongExperimentalCallbackFunctionArgMethod(info);
+ TestObjectV8Internal::voidMethodLongCallbackFunctionArgMethod(info);
}
static void anyMethodMethod(const v8::FunctionCallbackInfo<v8::Value>& info)
@@ -13187,8 +13163,7 @@ const V8DOMConfiguration::MethodConfiguration V8TestObjectMethods[] = {
{"voidMethodOptionalVoidCallbackFunctionArg", TestObjectV8Internal::voidMethodOptionalVoidCallbackFunctionArgMethodCallback, 0, 0, v8::None, V8DOMConfiguration::ExposedToAllScripts, V8DOMConfiguration::OnPrototype},
{"voidMethodNullableVoidCallbackFunctionArg", TestObjectV8Internal::voidMethodNullableVoidCallbackFunctionArgMethodCallback, 0, 1, v8::None, V8DOMConfiguration::ExposedToAllScripts, V8DOMConfiguration::OnPrototype},
{"voidMethodAnyCallbackFunctionOptionalAnyArg", TestObjectV8Internal::voidMethodAnyCallbackFunctionOptionalAnyArgMethodCallback, 0, 1, v8::None, V8DOMConfiguration::ExposedToAllScripts, V8DOMConfiguration::OnPrototype},
- {"voidMethodVoidExperimentalCallbackFunctionArg", TestObjectV8Internal::voidMethodVoidExperimentalCallbackFunctionArgMethodCallback, 0, 1, v8::None, V8DOMConfiguration::ExposedToAllScripts, V8DOMConfiguration::OnPrototype},
- {"voidMethodLongExperimentalCallbackFunctionArg", TestObjectV8Internal::voidMethodLongExperimentalCallbackFunctionArgMethodCallback, 0, 1, v8::None, V8DOMConfiguration::ExposedToAllScripts, V8DOMConfiguration::OnPrototype},
+ {"voidMethodLongCallbackFunctionArg", TestObjectV8Internal::voidMethodLongCallbackFunctionArgMethodCallback, 0, 1, v8::None, V8DOMConfiguration::ExposedToAllScripts, V8DOMConfiguration::OnPrototype},
{"anyMethod", TestObjectV8Internal::anyMethodMethodCallback, 0, 0, v8::None, V8DOMConfiguration::ExposedToAllScripts, V8DOMConfiguration::OnPrototype},
{"voidMethodEventTargetArg", TestObjectV8Internal::voidMethodEventTargetArgMethodCallback, 0, 1, v8::None, V8DOMConfiguration::ExposedToAllScripts, V8DOMConfiguration::OnPrototype},
{"voidMethodAnyArg", TestObjectV8Internal::voidMethodAnyArgMethodCallback, 0, 1, v8::None, V8DOMConfiguration::ExposedToAllScripts, V8DOMConfiguration::OnPrototype},

Powered by Google App Engine
This is Rietveld 408576698