Remove V8TryCatchRethrowScope from private script bindings

Remove V8TryCatchRethrowScope from private script bindings

When a private script throws an exception, what the private script binding does is:

- if the exception is the one supported in private scripts,
the private script binding clones the exception in the user's script and throws it.

- if the exception is the one not (yet) supported in private scripts,
the private script binding dies.

Since these operations are done explicitly, we should use ReThrow()
instead of relying on V8TryCatchRethrowScope. (V8TryCatchRethrowScope is not
a proper mechanism for doing this because V8TryCatchRethrowScope is intended
to be used to rethrow an exception the way it is without doing any conversion.)

BUG=341031
Committed: https://src.chromium.org/viewvc/blink?view=rev&revision=179955

[haraken, 2014-08-11 11:45:02]

PTAL

[Jens Widell, 2014-08-11 11:49:14]

LGTM

[haraken, 2014-08-11 12:51:30]

The CQ bit was checked by haraken@chromium.org

[commit-bot: I haz the power, 2014-08-11 12:52:37]

CQ is trying da patch. Follow status at
 https://chromium-status.appspot.com/cq/haraken@chromium.org/461593002/1

[commit-bot: I haz the power, 2014-08-11 12:52:44]

The CQ bit was unchecked by commit-bot@chromium.org

[commit-bot: I haz the power, 2014-08-11 12:52:45]

Failed to apply patch for Source/bindings/tests/results/V8TestObject.cpp:
While running patch -p1 --forward --force --no-backup-if-mismatch;
  patching file Source/bindings/tests/results/V8TestObject.cpp
  Hunk #1 FAILED at 10701.
  Hunk #2 succeeded at 10782 (offset 50 lines).
  Hunk #3 succeeded at 10817 (offset 50 lines).
  Hunk #4 succeeded at 10852 (offset 50 lines).
  Hunk #5 succeeded at 10887 (offset 50 lines).
  Hunk #6 succeeded at 10926 (offset 50 lines).
  Hunk #7 succeeded at 10962 (offset 50 lines).
  Hunk #8 succeeded at 10995 (offset 50 lines).
  Hunk #9 succeeded at 11028 (offset 50 lines).
  Hunk #10 succeeded at 11061 (offset 50 lines).
  Hunk #11 succeeded at 11091 (offset 50 lines).
  Hunk #12 succeeded at 11124 (offset 50 lines).
  Hunk #13 succeeded at 11154 (offset 50 lines).
  Hunk #14 succeeded at 11187 (offset 50 lines).
  Hunk #15 succeeded at 11217 (offset 50 lines).
  Hunk #16 succeeded at 11250 (offset 50 lines).
  1 out of 16 hunks FAILED -- saving rejects to file
Source/bindings/tests/results/V8TestObject.cpp.rej

Patch:       Source/bindings/tests/results/V8TestObject.cpp
Index: Source/bindings/tests/results/V8TestObject.cpp
diff --git a/Source/bindings/tests/results/V8TestObject.cpp
b/Source/bindings/tests/results/V8TestObject.cpp
index
c2f5eef11f4c1c24857e256cbb973b4ad1edef26..8329aca7ebf787714cb691428854619b9603ce38
100644
--- a/Source/bindings/tests/results/V8TestObject.cpp
+++ b/Source/bindings/tests/results/V8TestObject.cpp
@@ -10701,13 +10701,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;
@@ -10732,13 +10732,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);
@@ -10767,13 +10767,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);
@@ -10802,13 +10802,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);
@@ -10837,13 +10837,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);
@@ -10876,13 +10876,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);
@@ -10912,13 +10912,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);
@@ -10945,13 +10945,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);
@@ -10978,13 +10978,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…
(message too large)

[haraken, 2014-08-11 13:40:34]

The CQ bit was checked by haraken@chromium.org

[commit-bot: I haz the power, 2014-08-11 13:41:38]

CQ is trying da patch. Follow status at
 https://chromium-status.appspot.com/cq/haraken@chromium.org/461593002/20001

[commit-bot: I haz the power, 2014-08-11 14:38:53]

Change committed as 179955