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

Issues Search
    My Issues | Starred     Open | Closed | All

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

Issue 2301993002: binding: Introduces ExceptionToPromiseScope. (Closed)
Patch Set: Addressed review comments (rename, empty line). Created 4 years, 3 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
« no previous file with comments | « third_party/WebKit/Source/bindings/tests/results/core/V8TestInterfaceConstructor.cpp ('k') | third_party/WebKit/Source/bindings/tests/results/core/V8TestInterfaceConstructor3.cpp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: third_party/WebKit/Source/bindings/tests/results/core/V8TestInterfaceConstructor2.cpp
diff --git a/third_party/WebKit/Source/bindings/tests/results/core/V8TestInterfaceConstructor2.cpp b/third_party/WebKit/Source/bindings/tests/results/core/V8TestInterfaceConstructor2.cpp
index 49190cd9efebbfbb6e90269b8f155399c4e95802..d32e2b272524c2c0d34d5393cf7c5406466fa09f 100644
--- a/third_party/WebKit/Source/bindings/tests/results/core/V8TestInterfaceConstructor2.cpp
+++ b/third_party/WebKit/Source/bindings/tests/results/core/V8TestInterfaceConstructor2.cpp
@@ -53,11 +53,10 @@ namespace TestInterfaceConstructor2V8Internal {
static void constructor1(const v8::FunctionCallbackInfo<v8::Value>& info)
{
V8StringResource<> stringArg;
- {
- stringArg = info[0];
- if (!stringArg.prepare())
- return;
- }
+ stringArg = info[0];
+ if (!stringArg.prepare())
+ return;
+
TestInterfaceConstructor2* impl = TestInterfaceConstructor2::create(stringArg);
v8::Local<v8::Object> wrapper = info.Holder();
wrapper = impl->associateWithWrapper(info.GetIsolate(), &V8TestInterfaceConstructor2::wrapperTypeInfo, wrapper);
@@ -66,17 +65,18 @@ static void constructor1(const v8::FunctionCallbackInfo<v8::Value>& info)
static void constructor2(const v8::FunctionCallbackInfo<v8::Value>& info)
{
- ExceptionState exceptionState(ExceptionState::ConstructionContext, "TestInterfaceConstructor2", info.Holder(), info.GetIsolate());
+ ExceptionState exceptionState(info.GetIsolate(), ExceptionState::ConstructionContext, "TestInterfaceConstructor2");
+
Dictionary dictionaryArg;
- {
- if (!isUndefinedOrNull(info[0]) && !info[0]->IsObject()) {
- exceptionState.throwTypeError("parameter 1 ('dictionaryArg') is not an object.");
- return;
- }
- dictionaryArg = Dictionary(info[0], info.GetIsolate(), exceptionState);
- if (exceptionState.hadException())
- return;
+ if (!isUndefinedOrNull(info[0]) && !info[0]->IsObject()) {
+ exceptionState.throwTypeError("parameter 1 ('dictionaryArg') is not an object.");
+
+ return;
}
+ dictionaryArg = Dictionary(info[0], info.GetIsolate(), exceptionState);
+ if (exceptionState.hadException())
+ return;
+
TestInterfaceConstructor2* impl = TestInterfaceConstructor2::create(dictionaryArg);
v8::Local<v8::Object> wrapper = info.Holder();
wrapper = impl->associateWithWrapper(info.GetIsolate(), &V8TestInterfaceConstructor2::wrapperTypeInfo, wrapper);
@@ -85,13 +85,13 @@ static void constructor2(const v8::FunctionCallbackInfo<v8::Value>& info)
static void constructor3(const v8::FunctionCallbackInfo<v8::Value>& info)
{
- ExceptionState exceptionState(ExceptionState::ConstructionContext, "TestInterfaceConstructor2", info.Holder(), info.GetIsolate());
+ ExceptionState exceptionState(info.GetIsolate(), ExceptionState::ConstructionContext, "TestInterfaceConstructor2");
+
Vector<Vector<String>> stringSequenceSequenceArg;
- {
- stringSequenceSequenceArg = toImplArray<Vector<Vector<String>>>(info[0], 1, info.GetIsolate(), exceptionState);
- if (exceptionState.hadException())
- return;
- }
+ stringSequenceSequenceArg = toImplArray<Vector<Vector<String>>>(info[0], 1, info.GetIsolate(), exceptionState);
+ if (exceptionState.hadException())
+ return;
+
TestInterfaceConstructor2* impl = TestInterfaceConstructor2::create(stringSequenceSequenceArg);
v8::Local<v8::Object> wrapper = info.Holder();
wrapper = impl->associateWithWrapper(info.GetIsolate(), &V8TestInterfaceConstructor2::wrapperTypeInfo, wrapper);
@@ -100,56 +100,62 @@ static void constructor3(const v8::FunctionCallbackInfo<v8::Value>& info)
static void constructor4(const v8::FunctionCallbackInfo<v8::Value>& info)
{
- ExceptionState exceptionState(ExceptionState::ConstructionContext, "TestInterfaceConstructor2", info.Holder(), info.GetIsolate());
+ ExceptionState exceptionState(info.GetIsolate(), ExceptionState::ConstructionContext, "TestInterfaceConstructor2");
+
TestInterfaceEmpty* testInterfaceEmptyArg;
int longArg;
V8StringResource<> defaultUndefinedOptionalStringArg;
V8StringResource<> defaultNullStringOptionalStringArg;
Dictionary defaultUndefinedOptionalDictionaryArg;
V8StringResource<> optionalStringArg;
- {
- int numArgsPassed = info.Length();
- while (numArgsPassed > 0) {
- if (!info[numArgsPassed - 1]->IsUndefined())
- break;
- --numArgsPassed;
- }
- testInterfaceEmptyArg = V8TestInterfaceEmpty::toImplWithTypeCheck(info.GetIsolate(), info[0]);
- if (!testInterfaceEmptyArg) {
- exceptionState.throwTypeError("parameter 1 is not of type 'TestInterfaceEmpty'.");
- return;
- }
- longArg = toInt32(info.GetIsolate(), info[1], NormalConversion, exceptionState);
- if (exceptionState.hadException())
- return;
- defaultUndefinedOptionalStringArg = info[2];
- if (!defaultUndefinedOptionalStringArg.prepare())
- return;
- if (!info[3]->IsUndefined()) {
- defaultNullStringOptionalStringArg = info[3];
- if (!defaultNullStringOptionalStringArg.prepare())
- return;
- } else {
- defaultNullStringOptionalStringArg = nullptr;
- }
- if (!isUndefinedOrNull(info[4]) && !info[4]->IsObject()) {
- exceptionState.throwTypeError("parameter 5 ('defaultUndefinedOptionalDictionaryArg') is not an object.");
- return;
- }
- defaultUndefinedOptionalDictionaryArg = Dictionary(info[4], info.GetIsolate(), exceptionState);
- if (exceptionState.hadException())
- return;
- if (UNLIKELY(numArgsPassed <= 5)) {
- TestInterfaceConstructor2* impl = TestInterfaceConstructor2::create(testInterfaceEmptyArg, longArg, defaultUndefinedOptionalStringArg, defaultNullStringOptionalStringArg, defaultUndefinedOptionalDictionaryArg);
- v8::Local<v8::Object> wrapper = info.Holder();
- wrapper = impl->associateWithWrapper(info.GetIsolate(), &V8TestInterfaceConstructor2::wrapperTypeInfo, wrapper);
- v8SetReturnValue(info, wrapper);
- return;
- }
- optionalStringArg = info[5];
- if (!optionalStringArg.prepare())
+ int numArgsPassed = info.Length();
+ while (numArgsPassed > 0) {
+ if (!info[numArgsPassed - 1]->IsUndefined())
+ break;
+ --numArgsPassed;
+ }
+ testInterfaceEmptyArg = V8TestInterfaceEmpty::toImplWithTypeCheck(info.GetIsolate(), info[0]);
+ if (!testInterfaceEmptyArg) {
+ exceptionState.throwTypeError("parameter 1 is not of type 'TestInterfaceEmpty'.");
+
+ return;
+ }
+
+ longArg = toInt32(info.GetIsolate(), info[1], NormalConversion, exceptionState);
+ if (exceptionState.hadException())
+ return;
+
+ defaultUndefinedOptionalStringArg = info[2];
+ if (!defaultUndefinedOptionalStringArg.prepare())
+ return;
+
+ if (!info[3]->IsUndefined()) {
+ defaultNullStringOptionalStringArg = info[3];
+ if (!defaultNullStringOptionalStringArg.prepare())
return;
+ } else {
+ defaultNullStringOptionalStringArg = nullptr;
+ }
+ if (!isUndefinedOrNull(info[4]) && !info[4]->IsObject()) {
+ exceptionState.throwTypeError("parameter 5 ('defaultUndefinedOptionalDictionaryArg') is not an object.");
+
+ return;
}
+ defaultUndefinedOptionalDictionaryArg = Dictionary(info[4], info.GetIsolate(), exceptionState);
+ if (exceptionState.hadException())
+ return;
+
+ if (UNLIKELY(numArgsPassed <= 5)) {
+ TestInterfaceConstructor2* impl = TestInterfaceConstructor2::create(testInterfaceEmptyArg, longArg, defaultUndefinedOptionalStringArg, defaultNullStringOptionalStringArg, defaultUndefinedOptionalDictionaryArg);
+ v8::Local<v8::Object> wrapper = info.Holder();
+ wrapper = impl->associateWithWrapper(info.GetIsolate(), &V8TestInterfaceConstructor2::wrapperTypeInfo, wrapper);
+ v8SetReturnValue(info, wrapper);
+ return;
+ }
+ optionalStringArg = info[5];
+ if (!optionalStringArg.prepare())
+ return;
+
TestInterfaceConstructor2* impl = TestInterfaceConstructor2::create(testInterfaceEmptyArg, longArg, defaultUndefinedOptionalStringArg, defaultNullStringOptionalStringArg, defaultUndefinedOptionalDictionaryArg, optionalStringArg);
v8::Local<v8::Object> wrapper = info.Holder();
wrapper = impl->associateWithWrapper(info.GetIsolate(), &V8TestInterfaceConstructor2::wrapperTypeInfo, wrapper);
« no previous file with comments | « third_party/WebKit/Source/bindings/tests/results/core/V8TestInterfaceConstructor.cpp ('k') | third_party/WebKit/Source/bindings/tests/results/core/V8TestInterfaceConstructor3.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698