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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: Source/bindings/tests/results/V8TestObject.cpp

Issue 461593002: Remove V8TryCatchRethrowScope from private script bindings (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Created 6 years, 4 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 | « Source/bindings/tests/results/V8TestInterface.cpp ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: Source/bindings/tests/results/V8TestObject.cpp
diff --git a/Source/bindings/tests/results/V8TestObject.cpp b/Source/bindings/tests/results/V8TestObject.cpp
index d988249f16a5c95dbc9b949f2e5498898673000f..8bbc8a28c0a872825afc95925ce75cfe01f9e66b 100644
--- a/Source/bindings/tests/results/V8TestObject.cpp
+++ b/Source/bindings/tests/results/V8TestObject.cpp
@@ -10751,13 +10751,13 @@ bool V8TestObject::PrivateScript::voidMethodImplementedInPrivateScriptMethod(Loc
v8::Handle<v8::Value> *argv = 0;
ExceptionState exceptionState(ExceptionState::ExecutionContext, "voidMethodImplementedInPrivateScript", "TestObject", scriptState->context()->Global(), scriptState->isolate());
v8::TryCatch block;
- V8RethrowTryCatchScope rethrow(block);
PrivateScriptRunner::runDOMMethod(scriptState, "TestObject", "voidMethodImplementedInPrivateScript", holder, 0, argv);
if (block.HasCaught()) {
if (!PrivateScriptRunner::throwDOMExceptionInPrivateScriptIfNeeded(scriptState->isolate(), exceptionState, block.Exception())) {
// FIXME: We should support more exceptions.
RELEASE_ASSERT_NOT_REACHED();
}
+ block.ReThrow();
return false;
}
return true;
@@ -10782,13 +10782,13 @@ bool V8TestObject::PrivateScript::shortMethodImplementedInPrivateScriptMethod(Lo
v8::Handle<v8::Value> *argv = 0;
ExceptionState exceptionState(ExceptionState::ExecutionContext, "shortMethodImplementedInPrivateScript", "TestObject", scriptState->context()->Global(), scriptState->isolate());
v8::TryCatch block;
- V8RethrowTryCatchScope rethrow(block);
v8::Handle<v8::Value> v8Value = PrivateScriptRunner::runDOMMethod(scriptState, "TestObject", "shortMethodImplementedInPrivateScript", holder, 0, argv);
if (block.HasCaught()) {
if (!PrivateScriptRunner::throwDOMExceptionInPrivateScriptIfNeeded(scriptState->isolate(), exceptionState, block.Exception())) {
// FIXME: We should support more exceptions.
RELEASE_ASSERT_NOT_REACHED();
}
+ block.ReThrow();
return false;
}
TONATIVE_DEFAULT_EXCEPTIONSTATE(int, cppValue, toInt16(v8Value, exceptionState), exceptionState, false);
@@ -10817,13 +10817,13 @@ bool V8TestObject::PrivateScript::shortMethodWithShortArgumentImplementedInPriva
v8::Handle<v8::Value> argv[] = { valueHandle };
ExceptionState exceptionState(ExceptionState::ExecutionContext, "shortMethodWithShortArgumentImplementedInPrivateScript", "TestObject", scriptState->context()->Global(), scriptState->isolate());
v8::TryCatch block;
- V8RethrowTryCatchScope rethrow(block);
v8::Handle<v8::Value> v8Value = PrivateScriptRunner::runDOMMethod(scriptState, "TestObject", "shortMethodWithShortArgumentImplementedInPrivateScript", holder, 1, argv);
if (block.HasCaught()) {
if (!PrivateScriptRunner::throwDOMExceptionInPrivateScriptIfNeeded(scriptState->isolate(), exceptionState, block.Exception())) {
// FIXME: We should support more exceptions.
RELEASE_ASSERT_NOT_REACHED();
}
+ block.ReThrow();
return false;
}
TONATIVE_DEFAULT_EXCEPTIONSTATE(int, cppValue, toInt16(v8Value, exceptionState), exceptionState, false);
@@ -10852,13 +10852,13 @@ bool V8TestObject::PrivateScript::stringMethodWithStringArgumentImplementedInPri
v8::Handle<v8::Value> argv[] = { valueHandle };
ExceptionState exceptionState(ExceptionState::ExecutionContext, "stringMethodWithStringArgumentImplementedInPrivateScript", "TestObject", scriptState->context()->Global(), scriptState->isolate());
v8::TryCatch block;
- V8RethrowTryCatchScope rethrow(block);
v8::Handle<v8::Value> v8Value = PrivateScriptRunner::runDOMMethod(scriptState, "TestObject", "stringMethodWithStringArgumentImplementedInPrivateScript", holder, 1, argv);
if (block.HasCaught()) {
if (!PrivateScriptRunner::throwDOMExceptionInPrivateScriptIfNeeded(scriptState->isolate(), exceptionState, block.Exception())) {
// FIXME: We should support more exceptions.
RELEASE_ASSERT_NOT_REACHED();
}
+ block.ReThrow();
return false;
}
TOSTRING_DEFAULT(V8StringResource<>, cppValue, v8Value, false);
@@ -10887,13 +10887,13 @@ bool V8TestObject::PrivateScript::nodeMethodWithNodeArgumentImplementedInPrivate
v8::Handle<v8::Value> argv[] = { valueHandle };
ExceptionState exceptionState(ExceptionState::ExecutionContext, "nodeMethodWithNodeArgumentImplementedInPrivateScript", "TestObject", scriptState->context()->Global(), scriptState->isolate());
v8::TryCatch block;
- V8RethrowTryCatchScope rethrow(block);
v8::Handle<v8::Value> v8Value = PrivateScriptRunner::runDOMMethod(scriptState, "TestObject", "nodeMethodWithNodeArgumentImplementedInPrivateScript", holder, 1, argv);
if (block.HasCaught()) {
if (!PrivateScriptRunner::throwDOMExceptionInPrivateScriptIfNeeded(scriptState->isolate(), exceptionState, block.Exception())) {
// FIXME: We should support more exceptions.
RELEASE_ASSERT_NOT_REACHED();
}
+ block.ReThrow();
return false;
}
TONATIVE_DEFAULT(Node*, cppValue, V8Node::toNativeWithTypeCheck(scriptState->isolate(), v8Value), false);
@@ -10926,13 +10926,13 @@ bool V8TestObject::PrivateScript::nodeMethodWithVariousArgumentsImplementedInPri
v8::Handle<v8::Value> argv[] = { documentHandle, nodeHandle, value1Handle, value2Handle, stringHandle };
ExceptionState exceptionState(ExceptionState::ExecutionContext, "nodeMethodWithVariousArgumentsImplementedInPrivateScript", "TestObject", scriptState->context()->Global(), scriptState->isolate());
v8::TryCatch block;
- V8RethrowTryCatchScope rethrow(block);
v8::Handle<v8::Value> v8Value = PrivateScriptRunner::runDOMMethod(scriptState, "TestObject", "nodeMethodWithVariousArgumentsImplementedInPrivateScript", holder, 5, argv);
if (block.HasCaught()) {
if (!PrivateScriptRunner::throwDOMExceptionInPrivateScriptIfNeeded(scriptState->isolate(), exceptionState, block.Exception())) {
// FIXME: We should support more exceptions.
RELEASE_ASSERT_NOT_REACHED();
}
+ block.ReThrow();
return false;
}
TONATIVE_DEFAULT(Node*, cppValue, V8Node::toNativeWithTypeCheck(scriptState->isolate(), v8Value), false);
@@ -10962,13 +10962,13 @@ bool V8TestObject::PrivateScript::methodForPrivateScriptOnlyMethod(LocalFrame* f
v8::Handle<v8::Value> argv[] = { value1Handle, value2Handle };
ExceptionState exceptionState(ExceptionState::ExecutionContext, "methodForPrivateScriptOnly", "TestObject", scriptState->context()->Global(), scriptState->isolate());
v8::TryCatch block;
- V8RethrowTryCatchScope rethrow(block);
v8::Handle<v8::Value> v8Value = PrivateScriptRunner::runDOMMethod(scriptState, "TestObject", "methodForPrivateScriptOnly", holder, 2, argv);
if (block.HasCaught()) {
if (!PrivateScriptRunner::throwDOMExceptionInPrivateScriptIfNeeded(scriptState->isolate(), exceptionState, block.Exception())) {
// FIXME: We should support more exceptions.
RELEASE_ASSERT_NOT_REACHED();
}
+ block.ReThrow();
return false;
}
TONATIVE_DEFAULT_EXCEPTIONSTATE(int, cppValue, toInt16(v8Value, exceptionState), exceptionState, false);
@@ -10995,13 +10995,13 @@ bool V8TestObject::PrivateScript::readonlyShortAttributeAttributeGetter(LocalFra
ExceptionState exceptionState(ExceptionState::GetterContext, "readonlyShortAttribute", "TestObject", scriptState->context()->Global(), scriptState->isolate());
v8::TryCatch block;
- V8RethrowTryCatchScope rethrow(block);
v8::Handle<v8::Value> v8Value = PrivateScriptRunner::runDOMAttributeGetter(scriptState, "TestObject", "readonlyShortAttribute", holder);
if (block.HasCaught()) {
if (!PrivateScriptRunner::throwDOMExceptionInPrivateScriptIfNeeded(scriptState->isolate(), exceptionState, block.Exception())) {
// FIXME: We should support more exceptions.
RELEASE_ASSERT_NOT_REACHED();
}
+ block.ReThrow();
return false;
}
TONATIVE_DEFAULT_EXCEPTIONSTATE(int, cppValue, toInt16(v8Value, exceptionState), exceptionState, false);
@@ -11028,13 +11028,13 @@ bool V8TestObject::PrivateScript::shortAttributeAttributeGetter(LocalFrame* fram
ExceptionState exceptionState(ExceptionState::GetterContext, "shortAttribute", "TestObject", scriptState->context()->Global(), scriptState->isolate());
v8::TryCatch block;
- V8RethrowTryCatchScope rethrow(block);
v8::Handle<v8::Value> v8Value = PrivateScriptRunner::runDOMAttributeGetter(scriptState, "TestObject", "shortAttribute", holder);
if (block.HasCaught()) {
if (!PrivateScriptRunner::throwDOMExceptionInPrivateScriptIfNeeded(scriptState->isolate(), exceptionState, block.Exception())) {
// FIXME: We should support more exceptions.
RELEASE_ASSERT_NOT_REACHED();
}
+ block.ReThrow();
return false;
}
TONATIVE_DEFAULT_EXCEPTIONSTATE(int, cppValue, toInt16(v8Value, exceptionState), exceptionState, false);
@@ -11061,13 +11061,13 @@ bool V8TestObject::PrivateScript::shortAttributeAttributeSetter(LocalFrame* fram
ExceptionState exceptionState(ExceptionState::SetterContext, "shortAttribute", "TestObject", scriptState->context()->Global(), scriptState->isolate());
v8::TryCatch block;
- V8RethrowTryCatchScope rethrow(block);
PrivateScriptRunner::runDOMAttributeSetter(scriptState, "TestObject", "shortAttribute", holder, v8::Integer::New(scriptState->isolate(), cppValue));
if (block.HasCaught()) {
if (!PrivateScriptRunner::throwDOMExceptionInPrivateScriptIfNeeded(scriptState->isolate(), exceptionState, block.Exception())) {
// FIXME: We should support more exceptions.
RELEASE_ASSERT_NOT_REACHED();
}
+ block.ReThrow();
return false;
}
return true;
@@ -11091,13 +11091,13 @@ bool V8TestObject::PrivateScript::stringAttributeAttributeGetter(LocalFrame* fra
ExceptionState exceptionState(ExceptionState::GetterContext, "stringAttribute", "TestObject", scriptState->context()->Global(), scriptState->isolate());
v8::TryCatch block;
- V8RethrowTryCatchScope rethrow(block);
v8::Handle<v8::Value> v8Value = PrivateScriptRunner::runDOMAttributeGetter(scriptState, "TestObject", "stringAttribute", holder);
if (block.HasCaught()) {
if (!PrivateScriptRunner::throwDOMExceptionInPrivateScriptIfNeeded(scriptState->isolate(), exceptionState, block.Exception())) {
// FIXME: We should support more exceptions.
RELEASE_ASSERT_NOT_REACHED();
}
+ block.ReThrow();
return false;
}
TOSTRING_DEFAULT(V8StringResource<>, cppValue, v8Value, false);
@@ -11124,13 +11124,13 @@ bool V8TestObject::PrivateScript::stringAttributeAttributeSetter(LocalFrame* fra
ExceptionState exceptionState(ExceptionState::SetterContext, "stringAttribute", "TestObject", scriptState->context()->Global(), scriptState->isolate());
v8::TryCatch block;
- V8RethrowTryCatchScope rethrow(block);
PrivateScriptRunner::runDOMAttributeSetter(scriptState, "TestObject", "stringAttribute", holder, v8String(scriptState->isolate(), cppValue));
if (block.HasCaught()) {
if (!PrivateScriptRunner::throwDOMExceptionInPrivateScriptIfNeeded(scriptState->isolate(), exceptionState, block.Exception())) {
// FIXME: We should support more exceptions.
RELEASE_ASSERT_NOT_REACHED();
}
+ block.ReThrow();
return false;
}
return true;
@@ -11154,13 +11154,13 @@ bool V8TestObject::PrivateScript::nodeAttributeAttributeGetter(LocalFrame* frame
ExceptionState exceptionState(ExceptionState::GetterContext, "nodeAttribute", "TestObject", scriptState->context()->Global(), scriptState->isolate());
v8::TryCatch block;
- V8RethrowTryCatchScope rethrow(block);
v8::Handle<v8::Value> v8Value = PrivateScriptRunner::runDOMAttributeGetter(scriptState, "TestObject", "nodeAttribute", holder);
if (block.HasCaught()) {
if (!PrivateScriptRunner::throwDOMExceptionInPrivateScriptIfNeeded(scriptState->isolate(), exceptionState, block.Exception())) {
// FIXME: We should support more exceptions.
RELEASE_ASSERT_NOT_REACHED();
}
+ block.ReThrow();
return false;
}
TONATIVE_DEFAULT(Node*, cppValue, V8Node::toNativeWithTypeCheck(scriptState->isolate(), v8Value), false);
@@ -11187,13 +11187,13 @@ bool V8TestObject::PrivateScript::nodeAttributeAttributeSetter(LocalFrame* frame
ExceptionState exceptionState(ExceptionState::SetterContext, "nodeAttribute", "TestObject", scriptState->context()->Global(), scriptState->isolate());
v8::TryCatch block;
- V8RethrowTryCatchScope rethrow(block);
PrivateScriptRunner::runDOMAttributeSetter(scriptState, "TestObject", "nodeAttribute", holder, toV8(cppValue, scriptState->context()->Global(), scriptState->isolate()));
if (block.HasCaught()) {
if (!PrivateScriptRunner::throwDOMExceptionInPrivateScriptIfNeeded(scriptState->isolate(), exceptionState, block.Exception())) {
// FIXME: We should support more exceptions.
RELEASE_ASSERT_NOT_REACHED();
}
+ block.ReThrow();
return false;
}
return true;
@@ -11217,13 +11217,13 @@ bool V8TestObject::PrivateScript::attributeForPrivateScriptOnlyAttributeGetter(L
ExceptionState exceptionState(ExceptionState::GetterContext, "attributeForPrivateScriptOnly", "TestObject", scriptState->context()->Global(), scriptState->isolate());
v8::TryCatch block;
- V8RethrowTryCatchScope rethrow(block);
v8::Handle<v8::Value> v8Value = PrivateScriptRunner::runDOMAttributeGetter(scriptState, "TestObject", "attributeForPrivateScriptOnly", holder);
if (block.HasCaught()) {
if (!PrivateScriptRunner::throwDOMExceptionInPrivateScriptIfNeeded(scriptState->isolate(), exceptionState, block.Exception())) {
// FIXME: We should support more exceptions.
RELEASE_ASSERT_NOT_REACHED();
}
+ block.ReThrow();
return false;
}
TOSTRING_DEFAULT(V8StringResource<>, cppValue, v8Value, false);
@@ -11250,13 +11250,13 @@ bool V8TestObject::PrivateScript::attributeForPrivateScriptOnlyAttributeSetter(L
ExceptionState exceptionState(ExceptionState::SetterContext, "attributeForPrivateScriptOnly", "TestObject", scriptState->context()->Global(), scriptState->isolate());
v8::TryCatch block;
- V8RethrowTryCatchScope rethrow(block);
PrivateScriptRunner::runDOMAttributeSetter(scriptState, "TestObject", "attributeForPrivateScriptOnly", holder, v8String(scriptState->isolate(), cppValue));
if (block.HasCaught()) {
if (!PrivateScriptRunner::throwDOMExceptionInPrivateScriptIfNeeded(scriptState->isolate(), exceptionState, block.Exception())) {
// FIXME: We should support more exceptions.
RELEASE_ASSERT_NOT_REACHED();
}
+ block.ReThrow();
return false;
}
return true;
« no previous file with comments | « Source/bindings/tests/results/V8TestInterface.cpp ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698