| Index: third_party/WebKit/Source/bindings/tests/results/core/V8TestInterfaceCheckSecurity.cpp
|
| diff --git a/third_party/WebKit/Source/bindings/tests/results/core/V8TestInterfaceCheckSecurity.cpp b/third_party/WebKit/Source/bindings/tests/results/core/V8TestInterfaceCheckSecurity.cpp
|
| index c4eff8b8e40ec86f51931f7895c9c6e6b150caef..4df2344bb184d61a46ad1e8ff761ab174394a51c 100644
|
| --- a/third_party/WebKit/Source/bindings/tests/results/core/V8TestInterfaceCheckSecurity.cpp
|
| +++ b/third_party/WebKit/Source/bindings/tests/results/core/V8TestInterfaceCheckSecurity.cpp
|
| @@ -41,7 +41,6 @@ static void readonlyLongAttributeAttributeGetter(const v8::FunctionCallbackInfo<
|
| ExceptionState exceptionState(ExceptionState::GetterContext, "readonlyLongAttribute", "TestInterfaceCheckSecurity", holder, info.GetIsolate());
|
| if (!BindingSecurity::shouldAllowAccessTo(info.GetIsolate(), currentDOMWindow(info.GetIsolate()), impl, exceptionState)) {
|
| v8SetReturnValueNull(info);
|
| - exceptionState.throwIfNeeded();
|
| return;
|
| }
|
| v8SetReturnValueInt(info, impl->readonlyLongAttribute());
|
| @@ -59,7 +58,6 @@ static void longAttributeAttributeGetter(const v8::FunctionCallbackInfo<v8::Valu
|
| ExceptionState exceptionState(ExceptionState::GetterContext, "longAttribute", "TestInterfaceCheckSecurity", holder, info.GetIsolate());
|
| if (!BindingSecurity::shouldAllowAccessTo(info.GetIsolate(), currentDOMWindow(info.GetIsolate()), impl, exceptionState)) {
|
| v8SetReturnValueNull(info);
|
| - exceptionState.throwIfNeeded();
|
| return;
|
| }
|
| v8SetReturnValueInt(info, impl->longAttribute());
|
| @@ -77,12 +75,12 @@ static void longAttributeAttributeSetter(v8::Local<v8::Value> v8Value, const v8:
|
| TestInterfaceCheckSecurity* impl = V8TestInterfaceCheckSecurity::toImpl(holder);
|
| if (!BindingSecurity::shouldAllowAccessTo(info.GetIsolate(), currentDOMWindow(info.GetIsolate()), impl, exceptionState)) {
|
| v8SetReturnValue(info, v8Value);
|
| - exceptionState.throwIfNeeded();
|
| return;
|
| }
|
| int cppValue = toInt32(info.GetIsolate(), v8Value, NormalConversion, exceptionState);
|
| - if (exceptionState.throwIfNeeded())
|
| + if (exceptionState.hadException()) {
|
| return;
|
| + }
|
| impl->setLongAttribute(cppValue);
|
| }
|
|
|
| @@ -110,8 +108,9 @@ static void doNotCheckSecurityLongAttributeAttributeSetter(v8::Local<v8::Value>
|
| ExceptionState exceptionState(ExceptionState::SetterContext, "doNotCheckSecurityLongAttribute", "TestInterfaceCheckSecurity", holder, info.GetIsolate());
|
| TestInterfaceCheckSecurity* impl = V8TestInterfaceCheckSecurity::toImpl(holder);
|
| int cppValue = toInt32(info.GetIsolate(), v8Value, NormalConversion, exceptionState);
|
| - if (exceptionState.throwIfNeeded())
|
| + if (exceptionState.hadException()) {
|
| return;
|
| + }
|
| impl->setDoNotCheckSecurityLongAttribute(cppValue);
|
| }
|
|
|
| @@ -151,8 +150,9 @@ static void doNotCheckSecurityOnSetterLongAttributeAttributeSetter(v8::Local<v8:
|
| ExceptionState exceptionState(ExceptionState::SetterContext, "doNotCheckSecurityOnSetterLongAttribute", "TestInterfaceCheckSecurity", holder, info.GetIsolate());
|
| TestInterfaceCheckSecurity* impl = V8TestInterfaceCheckSecurity::toImpl(holder);
|
| int cppValue = toInt32(info.GetIsolate(), v8Value, NormalConversion, exceptionState);
|
| - if (exceptionState.throwIfNeeded())
|
| + if (exceptionState.hadException()) {
|
| return;
|
| + }
|
| impl->setDoNotCheckSecurityOnSetterLongAttribute(cppValue);
|
| }
|
|
|
| @@ -197,7 +197,6 @@ static void voidMethodMethod(const v8::FunctionCallbackInfo<v8::Value>& info)
|
| ExceptionState exceptionState(ExceptionState::ExecutionContext, "voidMethod", "TestInterfaceCheckSecurity", info.Holder(), info.GetIsolate());
|
| TestInterfaceCheckSecurity* impl = V8TestInterfaceCheckSecurity::toImpl(info.Holder());
|
| if (!BindingSecurity::shouldAllowAccessTo(info.GetIsolate(), currentDOMWindow(info.GetIsolate()), impl, exceptionState)) {
|
| - exceptionState.throwIfNeeded();
|
| return;
|
| }
|
| impl->voidMethod();
|
| @@ -375,7 +374,6 @@ static void TestInterfaceCheckSecurityOriginSafeMethodSetter(v8::Local<v8::Name>
|
| v8::String::Utf8Value attributeName(name);
|
| ExceptionState exceptionState(ExceptionState::SetterContext, *attributeName, "TestInterfaceCheckSecurity", info.Holder(), info.GetIsolate());
|
| if (!BindingSecurity::shouldAllowAccessTo(info.GetIsolate(), currentDOMWindow(info.GetIsolate()), impl, exceptionState)) {
|
| - exceptionState.throwIfNeeded();
|
| return;
|
| }
|
|
|
|
|