Remove IDBNotFoundError ExceptionCode

Source/bindings/scripts/CodeGeneratorV8.pm

 # Copyright (C) 2005, 2006 Nikolas Zimmermann <zimmermann@kde.org>
 # Copyright (C) 2006 Anders Carlsson <andersca@mac.com>
 # Copyright (C) 2006 Samuel Weinig <sam.weinig@gmail.com>
 # Copyright (C) 2006 Alexey Proskuryakov <ap@webkit.org>
 # Copyright (C) 2006 Apple Computer, Inc.
 # Copyright (C) 2007, 2008, 2009, 2012 Google Inc.
 # Copyright (C) 2009 Cameron McCormack <cam@mcc.id.au>
 # Copyright (C) Research In Motion Limited 2010. All rights reserved.
 # Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies)
 # Copyright (C) 2012 Ericsson AB. All rights reserved.
@@ skipping 1403 matching lines @@
         AddToImplIncludes("bindings/v8/BindingSecurity.h");
         $code .= "    if (!BindingSecurity::shouldAllowAccessToNode(imp->" . GetImplName($attribute) . "())) {\n";
         $code .= "        v8SetReturnValueNull(info);\n";
         $code .= "        return;\n";
         $code .= "    }\n";
     }
 
     my $useExceptions = 1 if $attribute->extendedAttributes->{"GetterRaisesException"} ||  $attribute->extendedAttributes->{"RaisesException"};
     my $isNullable = $attribute->isNullable;
     if ($useExceptions) {
-        AddToImplIncludes("core/dom/ExceptionCode.h");
-        $code .= "    ExceptionCode ec = 0;\n";
+        AddToImplIncludes("bindings/v8/ExceptionState.h");
+        $code .= "    ExceptionState es(info.GetIsolate());\n";
     }
 
     if ($isNullable) {
         $code .= "    bool isNull = false;\n";
     }
 
     my $returnType = $attribute->type;
     my $getterString;
 
     if ($getterStringUsesImp) {
         my ($functionName, @arguments) = GetterExpression($interfaceName, $attribute);
         push(@arguments, "isNull") if $isNullable;
-        push(@arguments, "ec") if $useExceptions;
+        push(@arguments, "es") if $useExceptions;
         if ($attribute->extendedAttributes->{"ImplementedBy"}) {
             my $implementedBy = $attribute->extendedAttributes->{"ImplementedBy"};
             my $implementedByImplName = GetImplNameFromImplementedBy($implementedBy);
             AddToImplIncludes(HeaderFilesForInterface($implementedBy, $implementedByImplName));
             unshift(@arguments, "imp") if !$attribute->isStatic;
             $functionName = "${implementedByImplName}::${functionName}";
         } elsif ($attribute->isStatic) {
             $functionName = "${implClassName}::${functionName}";
         } else {
             $functionName = "imp->${functionName}";
@@ skipping 20 matching lines @@
         }
 
         if ($isNullable) {
             $code .= "    if (isNull) {\n";
             $code .= "        v8SetReturnValueNull(info);\n";
             $code .= "        return;\n";
             $code .= "    }\n";
         }
 
         if ($useExceptions) {
-            $code .= "    if (UNLIKELY(ec)) {\n";
-            $code .= "        setDOMException(ec, info.GetIsolate());\n";
-            $code .= "        return;\n";
-            $code .= "    };\n";
+            if ($useExceptions) {
+                $code .= "    if (UNLIKELY(es.throwIfNeeded()))\n";
+                $code .= "        return;\n";
+            }
 
             if (ExtendedAttributeContains($attribute->extendedAttributes->{"CallWith"}, "ScriptState")) {
                 $code .= "    if (state.hadException()) {\n";
                 $code .= "        throwError(state.exception(), info.GetIsolate());\n";
                 $code .= "        return;\n";
                 $code .= "    }\n";
             }
         }
 
         $expression = "v";
@@ skipping 283 matching lines @@
     }
 
     my $svgNativeType = GetSVGTypeNeedingTearOff($interfaceName);
     if ($svgNativeType) {
         my $svgWrappedNativeType = GetSVGWrappedTypeNeedingTearOff($interfaceName);
         if ($svgWrappedNativeType =~ /List$/) {
             $code .= <<END;
     $svgNativeType* imp = ${v8ClassName}::toNative(info.Holder());
 END
         } else {
-            AddToImplIncludes("core/dom/ExceptionCode.h");
+            AddToImplIncludes("bindings/v8/ExceptionState.h");
             $code .= "    $svgNativeType* wrapper = ${v8ClassName}::toNative(info.Holder());\n";
             $code .= "    if (wrapper->isReadOnly()) {\n";
             $code .= "        setDOMException(NoModificationAllowedError, info.GetIsolate());\n";
             $code .= "        return;\n";
             $code .= "    }\n";
             $code .= "    $svgWrappedNativeType& impInstance = wrapper->propertyReference();\n";
             $code .= "    $svgWrappedNativeType* imp = &impInstance;\n";
         }
     } elsif ($attrExt->{"OnProto"}) {
         $code .= <<END;
@@ skipping 52 matching lines @@
     my $returnType = $attribute->type;
     if (IsRefPtrType($returnType) && !GetArrayType($returnType)) {
         $expression = "WTF::getPtr(" . $expression . ")";
     }
 
     $code .= GenerateCustomElementInvocationScopeIfNeeded($attribute->extendedAttributes);
 
     my $useExceptions = 1 if $attribute->extendedAttributes->{"SetterRaisesException"} ||  $attribute->extendedAttributes->{"RaisesException"};
 
     if ($useExceptions) {
-        AddToImplIncludes("core/dom/ExceptionCode.h");
-        $code .= "    ExceptionCode ec = 0;\n";
+        AddToImplIncludes("bindings/v8/ExceptionState.h");
+        $code .= "    ExceptionState es(info.GetIsolate());\n";
     }
 
     if ($interfaceName eq "SVGNumber") {
         $code .= "    *imp = $expression;\n";
     } else {
         if ($attribute->type eq "EventListener") {
             my $implSetterFunctionName = FirstLetterToUpperCase($attrName);
             AddToImplIncludes("bindings/v8/V8AbstractEventListener.h");
             if (!InheritsInterface($interface, "Node")) {
                 my $attrImplName = GetImplName($attribute);
                 $code .= "    transferHiddenDependency(info.Holder(), imp->${attrImplName}(isolatedWorldForIsolate(info.GetIsolate())), value, ${v8ClassName}::eventListenerCacheIndex, info.GetIsolate());\n";
             }
             AddToImplIncludes("bindings/v8/V8EventListenerList.h");
             if (($interfaceName eq "Window" or $interfaceName eq "WorkerGlobalScope") and $attribute->name eq "onerror") {
                 AddToImplIncludes("bindings/v8/V8ErrorHandler.h");
                 $code .= "    imp->set$implSetterFunctionName(V8EventListenerList::findOrCreateWrapper<V8ErrorHandler>(value, true), isolatedWorldForIsolate(info.GetIsolate()));\n";
             } else {
                 $code .= "    imp->set$implSetterFunctionName(V8EventListenerList::getEventListener(value, true, ListenerFindOrCreate), isolatedWorldForIsolate(info.GetIsolate()));\n";
             }
         } else {
             my ($functionName, @arguments) = SetterExpression($interfaceName, $attribute);
             push(@arguments, $expression);
-            push(@arguments, "ec") if $useExceptions;
+            push(@arguments, "es") if $useExceptions;
             if ($attribute->extendedAttributes->{"ImplementedBy"}) {
                 my $implementedBy = $attribute->extendedAttributes->{"ImplementedBy"};
                 my $implementedByImplName = GetImplNameFromImplementedBy($implementedBy);
                 AddToImplIncludes(HeaderFilesForInterface($implementedBy, $implementedByImplName));
                 unshift(@arguments, "imp") if !$attribute->isStatic;
                 $functionName = "${implementedByImplName}::${functionName}";
             } elsif ($attribute->isStatic) {
                 $functionName = "${implClassName}::${functionName}";
             } else {
                 $functionName = "imp->${functionName}";
             }
             my ($arg, $subCode) = GenerateCallWith($attribute->extendedAttributes->{"SetterCallWith"} || $attribute->extendedAttributes->{"CallWith"}, "    ", 1);
             $code .= $subCode;
             unshift(@arguments, @$arg);
             $code .= "    ${functionName}(" . join(", ", @arguments) . ");\n";
         }
     }
 
     if ($useExceptions) {
-        $code .= "    if (UNLIKELY(ec))\n";
-        $code .= "        setDOMException(ec, info.GetIsolate());\n";
+        $code .= "    es.throwIfNeeded();\n";
     }
 
     if (ExtendedAttributeContains($attribute->extendedAttributes->{"CallWith"}, "ScriptState")) {
         $code .= "    if (state.hadException())\n";
         $code .= "        throwError(state.exception(), info.GetIsolate());\n";
     }
 
     if ($svgNativeType) {
         if ($useExceptions) {
-            $code .= "    if (!ec)\n";
+            $code .= "    if (!es.hadException())\n";
             $code .= "        wrapper->commitChange();\n";
         } else {
             $code .= "    wrapper->commitChange();\n";
         }
     }
 
     if ($attribute->type eq "SerializedScriptValue" && $attribute->extendedAttributes->{"CachedAttribute"}) {
         $code .= <<END;
     info.Holder()->DeleteHiddenValue(v8::String::NewSymbol("${attrName}")); // Invalidate the cached value.
 END
@@ skipping 246 matching lines @@
         return;
     }
 
     my ($svgPropertyType, $svgListPropertyType, $svgNativeType) = GetSVGPropertyTypes($interfaceName);
 
     if ($svgNativeType) {
         my $nativeClassName = GetNativeType($interfaceName);
         if ($interfaceName =~ /List$/) {
             $code .= "    $nativeClassName imp = ${v8ClassName}::toNative(args.Holder());\n";
         } else {
-            AddToImplIncludes("core/dom/ExceptionCode.h");
+            AddToImplIncludes("bindings/v8/ExceptionState.h");
             $code .= "    $nativeClassName wrapper = ${v8ClassName}::toNative(args.Holder());\n";
             $code .= "    if (wrapper->isReadOnly()) {\n";
             $code .= "        setDOMException(NoModificationAllowedError, args.GetIsolate());\n";
             $code .= "        return;\n";
             $code .= "    }\n";
             my $svgWrappedNativeType = GetSVGWrappedTypeNeedingTearOff($interfaceName);
             $code .= "    $svgWrappedNativeType& impInstance = wrapper->propertyReference();\n";
             $code .= "    $svgWrappedNativeType* imp = &impInstance;\n";
         }
     } elsif (!$function->isStatic) {
@@ skipping 18 matching lines @@
     my $raisesExceptions = $function->extendedAttributes->{"RaisesException"};
     if (!$raisesExceptions) {
         foreach my $parameter (@{$function->parameters}) {
             if ($parameter->extendedAttributes->{"IsIndex"}) {
                 $raisesExceptions = 1;
             }
         }
     }
 
     if ($raisesExceptions) {
-        AddToImplIncludes("core/dom/ExceptionCode.h");
-        $code .= "    ExceptionCode ec = 0;\n";
+        AddToImplIncludes("bindings/v8/ExceptionState.h");
+        $code .= "    ExceptionState es(args.GetIsolate());\n";
     }
 
     if ($function->extendedAttributes->{"CheckSecurityForNode"}) {
         AddToImplIncludes("bindings/v8/BindingSecurity.h");
-        $code .= "    if (!BindingSecurity::shouldAllowAccessToNode(imp->" . GetImplName($function) . "(ec))) {\n";
+        # FIXME: Change to ExceptionState
+        $code .= "    if (!BindingSecurity::shouldAllowAccessToNode(imp->" . GetImplName($function) . "(es))) {\n";
         $code .= "        v8SetReturnValueNull(args);\n";
         $code .= "        return;\n";
         $code .= "    }\n";
 END
     }
 
     my ($parameterCheckString, $paramIndex, %replacements) = GenerateParametersCheck($function, $interface, $forMainWorldSuffix);
     $code .= $parameterCheckString;
 
     # Build the function call string.
@@ skipping 91 matching lines @@
             $parameterCheckString .= $multiLine ? "    }\n" : "\n";
         }
 
         my $parameterDefaultPolicy = "DefaultIsUndefined";
         my $default = defined $parameter->extendedAttributes->{"Default"} ? $parameter->extendedAttributes->{"Default"} : "";
         if ($parameter->isOptional and $default eq "NullString") {
             $parameterDefaultPolicy = "DefaultIsNullString";
         }
 
         my $parameterName = $parameter->name;
-        AddToImplIncludes("core/dom/ExceptionCode.h");
+        AddToImplIncludes("bindings/v8/ExceptionState.h");
         if (IsCallbackInterface($parameter->type)) {
             my $v8ClassName = "V8" . $parameter->type;
             AddToImplIncludes("$v8ClassName.h");
             if ($parameter->isOptional) {
                 $parameterCheckString .= "    RefPtr<" . $parameter->type . "> $parameterName;\n";
                 $parameterCheckString .= "    if (args.Length() > $paramIndex && !args[$paramIndex]->IsNull() && !args[$paramIndex]->IsUndefined()) {\n";
                 $parameterCheckString .= "        if (!args[$paramIndex]->IsFunction()) {\n";
                 $parameterCheckString .= "            throwTypeError(0, args.GetIsolate());\n";
                 $parameterCheckString .= "            return;\n";
                 $parameterCheckString .= "        }\n";
@@ skipping 159 matching lines @@
     $code .= <<END;
 static void constructor${overloadedIndexString}(const v8::FunctionCallbackInfo<v8::Value>& args)
 {
 END
 
     if ($function->overloadedIndex == 0) {
         $code .= GenerateArgumentsCountCheck($function, $interface);
     }
 
     if ($raisesExceptions) {
-        AddToImplIncludes("core/dom/ExceptionCode.h");
-        $code .= "    ExceptionCode ec = 0;\n";
+        AddToImplIncludes("bindings/v8/ExceptionState.h");
+        $code .= "    ExceptionState es(args.GetIsolate());\n";
     }
 
     # FIXME: Currently [Constructor(...)] does not yet support optional arguments without [Default=...]
     my ($parameterCheckString, $paramIndex, %replacements) = GenerateParametersCheck($function, $interface, "");
     $code .= $parameterCheckString;
 
     if ($interface->extendedAttributes->{"ConstructorCallWith"} && $interface->extendedAttributes->{"ConstructorCallWith"} eq "ScriptExecutionContext") {
         push(@beforeArgumentList, "context");
         $code .= <<END;
 
     ScriptExecutionContext* context = getScriptExecutionContext();
 END
     }
 
     if ($interface->extendedAttributes->{"ConstructorRaisesException"}) {
-        push(@afterArgumentList, "ec");
+        push(@afterArgumentList, "es");
     }
 
     my @argumentList;
     my $index = 0;
     foreach my $parameter (@{$function->parameters}) {
         last if $index eq $paramIndex;
         if ($replacements{$parameter->name}) {
             push(@argumentList, $replacements{$parameter->name});
         } else {
             push(@argumentList, $parameter->name);
         }
         $index++;
     }
 
     my $argumentString = join(", ", @beforeArgumentList, @argumentList, @afterArgumentList);
     $code .= "\n";
     $code .= "    RefPtr<${implClassName}> impl = ${implClassName}::create(${argumentString});\n";
     $code .= "    v8::Handle<v8::Object> wrapper = args.Holder();\n";
 
     if ($interface->extendedAttributes->{"ConstructorRaisesException"}) {
-        $code .= "    if (ec) {\n";
-        $code .= "        setDOMException(ec, args.GetIsolate());\n";
+        $code .= "    if (es.throwIfNeeded())\n";
         $code .= "        return;\n";
-        $code .= "    }\n";
     }
 
     $code .= <<END;
 
     V8DOMWrapper::associateObjectWithWrapper(impl.release(), &${v8ClassName}::info, wrapper, args.GetIsolate(), WrapperConfiguration::Dependent);
     args.GetReturnValue().Set(wrapper);
 }
 
 END
     $implementation{nameSpaceInternal}->add($code);
@@ skipping 211 matching lines @@
 
     // Make sure the document is added to the DOM Node map. Otherwise, the ${implClassName} instance
     // may end up being the only node in the map and get garbage-collected prematurely.
     toV8(document, args.Holder(), args.GetIsolate());
 
 END
 
     $code .= GenerateArgumentsCountCheck($function, $interface);
 
     if ($raisesExceptions) {
-        AddToImplIncludes("core/dom/ExceptionCode.h");
-        $code .= "    ExceptionCode ec = 0;\n";
+        AddToImplIncludes("bindings/v8/ExceptionState.h");
+        $code .= "    ExceptionState es(args.GetIsolate());\n";
     }
 
     my ($parameterCheckString, $paramIndex, %replacements) = GenerateParametersCheck($function, $interface);
     $code .= $parameterCheckString;
 
     push(@beforeArgumentList, "document");
 
     if ($interface->extendedAttributes->{"ConstructorRaisesException"}) {
-        push(@afterArgumentList, "ec");
+        push(@afterArgumentList, "es");
     }
 
     my @argumentList;
     my $index = 0;
     foreach my $parameter (@{$function->parameters}) {
         last if $index eq $paramIndex;
         if ($replacements{$parameter->name}) {
             push(@argumentList, $replacements{$parameter->name});
         } else {
             push(@argumentList, $parameter->name);
         }
         $index++;
     }
 
     my $argumentString = join(", ", @beforeArgumentList, @argumentList, @afterArgumentList);
     $code .= "\n";
     $code .= "    RefPtr<${implClassName}> impl = ${implClassName}::createForJSConstructor(${argumentString});\n";
     $code .= "    v8::Handle<v8::Object> wrapper = args.Holder();\n";
 
     if ($interface->extendedAttributes->{"ConstructorRaisesException"}) {
-        $code .= "    if (ec) {\n";
-        $code .= "        setDOMException(ec, args.GetIsolate());\n";
+        $code .= "    if (es.throwIfNeeded())\n";
         $code .= "        return;\n";
-        $code .= "    }\n";
     }
 
     $code .= <<END;
 
     V8DOMWrapper::associateObjectWithWrapper(impl.release(), &${v8ClassName}Constructor::info, wrapper, args.GetIsolate(), WrapperConfiguration::Dependent);
     args.GetReturnValue().Set(wrapper);
 }
 
 END
     $implementation{nameSpaceWebCore}->add($code);
@@ skipping 393 matching lines @@
     my $v8ClassName = GetV8ClassName($interface);
     my $methodName = GetImplName($indexedGetterFunction);
 
     my $returnType = $indexedGetterFunction->type;
     my $nativeType = GetNativeType($returnType);
     my $nativeValue = "element";
     $nativeValue .= ".release()" if (IsRefPtrType($returnType));
     my $isNull = GenerateIsNullExpression($returnType, "element");
     my $returnJSValueCode = NativeToJSValue($indexedGetterFunction->type, $indexedGetterFunction->extendedAttributes, $nativeValue, "    ", "", "info.Holder()", "info.GetIsolate()", "info", "collection", "", "", "return");
     my $raisesExceptions = $indexedGetterFunction->extendedAttributes->{"RaisesException"};
-    my $methodCallCode = GenerateMethodCall($returnType, "element", "collection->${methodName}", "index", $raisesExceptions);
+    my $methodCallCode = GenerateMethodCallForPropertyGetter($returnType, "element", "collection->${methodName}", "index", $raisesExceptions);
     my $getterCode = "static void indexedPropertyGetter(uint32_t index, const v8::PropertyCallbackInfo<v8::Value>& info)\n";
     $getterCode .= "{\n";
     $getterCode .= "    ASSERT(V8DOMWrapper::maybeDOMWrapper(info.Holder()));\n";
     $getterCode .= "    ${implClassName}* collection = ${v8ClassName}::toNative(info.Holder());\n";
     if ($raisesExceptions) {
-        $getterCode .= "    ExceptionCode ec = 0;\n";
+        $getterCode .= "    ExceptionState es(info.GetIsolate());\n";
     }
     $getterCode .= $methodCallCode . "\n";
     if ($raisesExceptions) {
-        $getterCode .= "    if (ec) {\n";
-        $getterCode .= "        setDOMException(ec, info.GetIsolate());\n";
+        $getterCode .= "    if (es.throwIfNeeded())\n";
         $getterCode .= "        return;\n";
-        $getterCode .= "    }\n";
     }
     if (IsUnionType($returnType)) {
         $getterCode .= "${returnJSValueCode}\n";
         $getterCode .= "    return;\n";
     } else {
         $getterCode .= "    if (${isNull})\n";
         $getterCode .= "        return;\n";
         $getterCode .= $returnJSValueCode . "\n";
     }
     $getterCode .= "}\n\n";
@@ skipping 72 matching lines @@
     my $raisesExceptions = $indexedSetterFunction->extendedAttributes->{"RaisesException"};
     my $treatNullAs = $indexedSetterFunction->parameters->[1]->extendedAttributes->{"TreatNullAs"};
     my $treatUndefinedAs = $indexedSetterFunction->parameters->[1]->extendedAttributes->{"TreatUndefinedAs"};
     my $code = "static void indexedPropertySetter(uint32_t index, v8::Local<v8::Value> value, const v8::PropertyCallbackInfo<v8::Value>& info)\n";
     $code .= "{\n";
     $code .= "    ${implClassName}* collection = ${v8ClassName}::toNative(info.Holder());\n";
     $code .= JSValueToNativeStatement($indexedSetterFunction->parameters->[1]->type, $indexedSetterFunction->extendedAttributes, "value", "propertyValue", "    ", "info.GetIsolate()");
 
     my $extraArguments = "";
     if ($raisesExceptions) {
-        $code .= "    ExceptionCode ec = 0;\n";
-        $extraArguments = ", ec";
+        $code .= "    ExceptionState es(info.GetIsolate());\n";
+        $extraArguments = ", es";
     }
     my @conditions = ();
     my @statements = ();
     if ($treatNullAs && $treatNullAs ne "NullString") {
         push @conditions, "value->IsNull()";
         push @statements, "collection->${treatNullAs}(index$extraArguments);";
     }
     if ($treatUndefinedAs && $treatUndefinedAs ne "NullString") {
         push @conditions, "value->IsUndefined()";
         push @statements, "collection->${treatUndefinedAs}(index$extraArguments);";
     }
     push @conditions, "";
     push @statements, "collection->${methodName}(index, propertyValue$extraArguments);";
     $code .= GenerateIfElseStatement("bool", "result", \@conditions, \@statements);
 
     $code .= "    if (!result)\n";
     $code .= "        return;\n";
     if ($raisesExceptions) {
-        $code .= "    if (ec) {\n";
-        $code .= "        setDOMException(ec, info.GetIsolate());\n";
+        $code .= "    if (es.throwIfNeeded())\n";
         $code .= "        return;\n";
-        $code .= "    }\n";
     }
     $code .= "    v8SetReturnValue(info, value);\n";
     $code .= "}\n\n";
     $implementation{nameSpaceInternal}->add($code);
 }
 
 sub GenerateImplementationNamedPropertyAccessors
 {
     my $interface = shift;
 
@@ skipping 156 matching lines @@
     if ($hasCustom) {
         $code .= "    ${v8ClassName}::namedPropertyQueryCustom(name, info);\n";
     } else {
         $code .= "    ${implClassName}V8Internal::namedPropertyQuery(name, info);\n";
     }
     $code .= "    TRACE_EVENT_SET_SAMPLING_STATE(\"V8\", \"Execution\");\n";
     $code .= "}\n\n";
     $implementation{nameSpaceInternal}->add($code);
 }
 
-sub GenerateMethodCall
+sub GenerateMethodCallForPropertyGetter
 {
     my $returnType = shift; # string or UnionType
     my $returnName = shift;
     my $functionExpression = shift;
     my $firstArgument = shift;
     my $raisesExceptions = shift;
 
     my @arguments = ();
     push @arguments, $firstArgument;
     if ($raisesExceptions) {
-        push @arguments, "ec";
+        push @arguments, "es";
     }
 
     if (IsUnionType($returnType)) {
         my $code = "";
         my @extraArguments = ();
         for my $i (0..scalar(@{$returnType->unionMemberTypes})-1) {
             my $unionMemberType = $returnType->unionMemberTypes->[$i];
             my $nativeType = GetNativeType($unionMemberType);
             my $unionMemberVariable = $returnName . $i;
             my $unionMemberEnabledVariable = $returnName . $i . "Enabled";
@@ skipping 18 matching lines @@
     my $implClassName = GetImplName($interface);
     my $v8ClassName = GetV8ClassName($interface);
     my $methodName = GetImplName($namedGetterFunction);
 
     my $returnType = $namedGetterFunction->type;
     my $isNull = GenerateIsNullExpression($returnType, "element");
     my $nativeValue = "element";
     $nativeValue .= ".release()" if (IsRefPtrType($returnType));
     my $returnJSValueCode = NativeToJSValue($namedGetterFunction->type, $namedGetterFunction->extendedAttributes, $nativeValue, "    ", "", "info.Holder()", "info.GetIsolate()", "info", "collection", "", "", "return");
     my $raisesExceptions = $namedGetterFunction->extendedAttributes->{"RaisesException"};
-    my $methodCallCode = GenerateMethodCall($returnType, "element", "collection->${methodName}", "propertyName", $raisesExceptions);
+    my $methodCallCode = GenerateMethodCallForPropertyGetter($returnType, "element", "collection->${methodName}", "propertyName", $raisesExceptions);
 
     my $code = "static void namedPropertyGetter(v8::Local<v8::String> name, const v8::PropertyCallbackInfo<v8::Value>& info)\n";
     $code .= "{\n";
     if (!$namedGetterFunction->extendedAttributes->{"OverrideBuiltins"}) {
         $code .= "    if (!info.Holder()->GetRealNamedPropertyInPrototypeChain(name).IsEmpty())\n";
         $code .= "        return;\n";
         $code .= "    if (info.Holder()->HasRealNamedCallbackProperty(name))\n";
         $code .= "        return;\n";
         $code .= "    if (info.Holder()->HasRealNamedProperty(name))\n";
         $code .= "        return;\n";
     }
     $code .= "\n";
     $code .= "    ASSERT(V8DOMWrapper::maybeDOMWrapper(info.Holder()));\n";
     $code .= "    ${implClassName}* collection = ${v8ClassName}::toNative(info.Holder());\n";
     $code .= "    AtomicString propertyName = toWebCoreAtomicString(name);\n";
     if ($raisesExceptions) {
-        $code .= "    ExceptionCode ec = 0;\n";
+        $code .= "    ExceptionState es(info.GetIsolate());\n";
     }
     $code .= $methodCallCode . "\n";
     if ($raisesExceptions) {
-        $code .= "    if (ec) {\n";
-        $code .= "        setDOMException(ec, info.GetIsolate());\n";
+        $code .= "    if (es.throwIfNeeded())\n";
         $code .= "        return;\n";
-        $code .= "    }\n";
     }
     if (IsUnionType($returnType)) {
         $code .= "${returnJSValueCode}\n";
         $code .= "    return;\n";
     } else {
         $code .= "    if (${isNull})\n";
         $code .= "        return;\n";
         $code .= $returnJSValueCode . "\n";
     }
     $code .= "}\n\n";
@@ skipping 20 matching lines @@
         $code .= "    if (info.Holder()->HasRealNamedCallbackProperty(name))\n";
         $code .= "        return;\n";
         $code .= "    if (info.Holder()->HasRealNamedProperty(name))\n";
         $code .= "        return;\n";
     }
     $code .= "    ${implClassName}* collection = ${v8ClassName}::toNative(info.Holder());\n";
     $code .= JSValueToNativeStatement($namedSetterFunction->parameters->[0]->type, $namedSetterFunction->extendedAttributes, "name", "propertyName", "    ", "info.GetIsolate()");
     $code .= JSValueToNativeStatement($namedSetterFunction->parameters->[1]->type, $namedSetterFunction->extendedAttributes, "value", "propertyValue", "    ", "info.GetIsolate()");
     my $extraArguments = "";
     if ($raisesExceptions) {
-        $code .= "    ExceptionCode ec = 0;\n";
-        $extraArguments = ", ec";
+        $code .= "    ExceptionState es(info.GetIsolate());\n";
+        $extraArguments = ", es";
     }
 
     my @conditions = ();
     my @statements = ();
     if ($treatNullAs && $treatNullAs ne "NullString") {
         push @conditions, "value->IsNull()";
         push @statements, "collection->${treatNullAs}(propertyName$extraArguments);";
     }
     if ($treatUndefinedAs && $treatUndefinedAs ne "NullString") {
         push @conditions, "value->IsUndefined()";
         push @statements, "collection->${treatUndefinedAs}(propertyName$extraArguments);";
     }
     push @conditions, "";
     push @statements, "collection->${methodName}(propertyName, propertyValue$extraArguments);";
     $code .= GenerateIfElseStatement("bool", "result", \@conditions, \@statements);
 
     $code .= "    if (!result)\n";
     $code .= "        return;\n";
     if ($raisesExceptions) {
-        $code .= "    if (ec) {\n";
-        $code .= "        setDOMException(ec, info.GetIsolate());\n";
+        $code .= "    if (es.throwIfNeeded())\n";
         $code .= "        return;\n";
-        $code .= "    }\n";
     }
     $code .= "    v8SetReturnValue(info, value);\n";
     $code .= "}\n\n";
     $implementation{nameSpaceInternal}->add($code);
 }
 
 sub GenerateImplementationIndexedPropertyDeleter
 {
     my $interface = shift;
     my $indexedDeleterFunction = shift;
     my $implClassName = GetImplName($interface);
     my $v8ClassName = GetV8ClassName($interface);
     my $methodName = GetImplName($indexedDeleterFunction);
 
     my $raisesExceptions = $indexedDeleterFunction->extendedAttributes->{"RaisesException"};
 
     my $code = "static void indexedPropertyDeleter(unsigned index, const v8::PropertyCallbackInfo<v8::Boolean>& info)\n";
     $code .= "{\n";
     $code .= "    ${implClassName}* collection = ${v8ClassName}::toNative(info.Holder());\n";
     my $extraArguments = "";
     if ($raisesExceptions) {
-        $code .= "    ExceptionCode ec = 0;\n";
-        $extraArguments = ", ec";
+        $code .= "    ExceptionState es(info.GetIsolate());\n";
+        $extraArguments = ", es";
     }
     $code .= "    bool result = collection->${methodName}(index$extraArguments);\n";
     if ($raisesExceptions) {
-        $code .= "    if (ec) {\n";
-        $code .= "        setDOMException(ec, info.GetIsolate());\n";
+        $code .= "    if (es.throwIfNeeded())\n";
         $code .= "        return;\n";
-        $code .= "    }\n";
     }
     $code .= "    return v8SetReturnValueBool(info, result);\n";
     $code .= "}\n\n";
     $implementation{nameSpaceInternal}->add($code);
 }
 
 sub GenerateImplementationNamedPropertyDeleter
 {
     my $interface = shift;
     my $namedDeleterFunction = shift;
     my $implClassName = GetImplName($interface);
     my $v8ClassName = GetV8ClassName($interface);
     my $methodName = GetImplName($namedDeleterFunction);
 
     my $raisesExceptions = $namedDeleterFunction->extendedAttributes->{"RaisesException"};
 
     my $code = "static void namedPropertyDeleter(v8::Local<v8::String> name, const v8::PropertyCallbackInfo<v8::Boolean>& info)\n";
     $code .= "{\n";
     $code .= "    ${implClassName}* collection = ${v8ClassName}::toNative(info.Holder());\n";
     $code .= "    AtomicString propertyName = toWebCoreAtomicString(name);\n";
     my $extraArguments = "";
     if ($raisesExceptions) {
-        $code .= "    ExceptionCode ec = 0;\n";
-        $extraArguments = ", ec";
+        $code .= "    ExceptionState es(info.GetIsolate());\n";
+        $extraArguments = ", es";
     }
     $code .= "    bool result = collection->${methodName}(propertyName$extraArguments);\n";
     if ($raisesExceptions) {
-        $code .= "    if (ec) {\n";
-        $code .= "        setDOMException(ec, info.GetIsolate());\n";
+        $code .= "    if (es.throwIfNeeded())\n";
         $code .= "        return;\n";
-        $code .= "    }\n";
     }
     $code .= "    return v8SetReturnValueBool(info, result);\n";
     $code .= "}\n\n";
     $implementation{nameSpaceInternal}->add($code);
 }
 
 sub GenerateImplementationNamedPropertyEnumerator
 {
     my $interface = shift;
     my $implClassName = GetImplName($interface);
     my $v8ClassName = GetV8ClassName($interface);
 
     $implementation{nameSpaceInternal}->add(<<END);
 static void namedPropertyEnumerator(const v8::PropertyCallbackInfo<v8::Array>& info)
 {
-    ExceptionCode ec = 0;
+    ExceptionState es(info.GetIsolate());
     ${implClassName}* collection = ${v8ClassName}::toNative(info.Holder());
     Vector<String> names;
-    collection->namedPropertyEnumerator(names, ec);
-    if (ec) {
-        setDOMException(ec, info.GetIsolate());
+    collection->namedPropertyEnumerator(names, es);
+    if (es.throwIfNeeded())
         return;
-    }
     v8::Handle<v8::Array> v8names = v8::Array::New(names.size());
     for (size_t i = 0; i < names.size(); ++i)
         v8names->Set(v8::Integer::New(i, info.GetIsolate()), v8String(names[i], info.GetIsolate()));
     v8SetReturnValue(info, v8names);
 }
 
 END
 }
 
 sub GenerateImplementationNamedPropertyQuery
 {
     my $interface = shift;
     my $implClassName = GetImplName($interface);
     my $v8ClassName = GetV8ClassName($interface);
 
     $implementation{nameSpaceInternal}->add(<<END);
 static void namedPropertyQuery(v8::Local<v8::String> name, const v8::PropertyCallbackInfo<v8::Integer>& info)
 {
     ${implClassName}* collection = ${v8ClassName}::toNative(info.Holder());
     AtomicString propertyName = toWebCoreAtomicString(name);
-    ExceptionCode ec = 0;
-    bool result = collection->namedPropertyQuery(propertyName, ec);
-    if (ec) {
-        setDOMException(ec, info.GetIsolate());
+    ExceptionState es(info.GetIsolate());
+    bool result = collection->namedPropertyQuery(propertyName, es);
+    if (es.throwIfNeeded())
         return;
-    }
     if (!result)
         return;
     v8SetReturnValueInt(info, v8::None);
 }
 
 END
 }
 
 sub GenerateImplementationLegacyCall
 {
@@ skipping 1077 matching lines @@
             $code .= $indent . "}\n";
         } elsif ($parameter->type eq "SVGMatrix" and $interfaceName eq "SVGTransformList") {
             push @arguments, "$paramName.get()";
         } else {
             push @arguments, $paramName;
         }
         $index++;
     }
 
     if ($function->extendedAttributes->{"RaisesException"}) {
-        push @arguments, "ec";
+        push @arguments, "es";
     }
 
     my $functionString = "$functionName(" . join(", ", @arguments) . ")";
 
     my $return = "result";
     my $returnIsRef = IsRefPtrType($returnType);
 
     if ($returnType eq "void") {
         $code .= $indent . "$functionString;\n";
     } elsif (ExtendedAttributeContains($callWith, "ScriptState") or $function->extendedAttributes->{"RaisesException"}) {
         $code .= $indent . $nativeReturnType . " result = $functionString;\n";
     } else {
         # Can inline the function call into the return statement to avoid overhead of using a Ref<> temporary
         $return = $functionString;
         $returnIsRef = 0;
 
         if ($interfaceName eq "SVGTransformList" and IsRefPtrType($returnType)) {
             $return = "WTF::getPtr(" . $return . ")";
         }
     }
 
     if ($function->extendedAttributes->{"RaisesException"}) {
-        $code .= $indent . "if (UNLIKELY(ec)) {\n";
-        $code .= $indent . "    setDOMException(ec, args.GetIsolate());\n";
+        $code .= $indent . "if (es.throwIfNeeded())\n";
         $code .= $indent . "    return;\n";
-        $code .= $indent . "}\n";
     }
 
     if (ExtendedAttributeContains($callWith, "ScriptState")) {
         $code .= $indent . "if (state.hadException()) {\n";
         $code .= $indent . "    v8::Local<v8::Value> exception = state.exception();\n";
         $code .= $indent . "    state.clearException();\n";
         $code .= $indent . "    throwError(exception, args.GetIsolate());\n";
         $code .= $indent . "    return;\n";
         $code .= $indent . "}\n";
     }
@@ skipping 1107 matching lines @@
         if ($currentInterface->extendedAttributes->{$extendedAttribute}) {
             $found = 1;
         }
         return 1 if $found;
     }, 0);
 
     return $found;
 }
 
 1;