Changeset 61384 in webkit


Ignore:
Timestamp:
Jun 17, 2010 11:58:58 PM (14 years ago)
Author:
eric@webkit.org
Message:

2010-06-17 Sheriff Bot <​webkit.review.bot@gmail.com>

Unreviewed, rolling out r61379.
​http://trac.webkit.org/changeset/61379
​https://bugs.webkit.org/show_bug.cgi?id=40813

Broke multiple tests on all platforms (Requested by tkent on
#webkit).

  • bindings/scripts/CodeGenerator.pm:
  • bindings/scripts/CodeGeneratorCPP.pm:
  • bindings/scripts/CodeGeneratorGObject.pm:
  • bindings/scripts/CodeGeneratorJS.pm:
  • bindings/scripts/CodeGeneratorObjC.pm:
  • bindings/scripts/CodeGeneratorV8.pm:
  • bindings/scripts/test/CPP/WebDOMTestObj.cpp: (WebDOMTestObj::attrWithException): (WebDOMTestObj::setAttrWithException): (WebDOMTestObj::attrWithSetterException): (WebDOMTestObj::attrWithGetterException): (WebDOMTestObj::setAttrWithGetterException):
  • bindings/scripts/test/CPP/WebDOMTestObj.h:
  • bindings/scripts/test/GObject/WebKitDOMTestCallback.cpp: (webkit_dom_test_callback_callback_with_class1param): (webkit_dom_test_callback_callback_with_class2param): (webkit_dom_test_callback_callback_with_non_bool_return_type):
  • bindings/scripts/test/GObject/WebKitDOMTestObj.cpp: (webkit_dom_test_obj_void_method): (webkit_dom_test_obj_void_method_with_args): (webkit_dom_test_obj_int_method): (webkit_dom_test_obj_int_method_with_args): (webkit_dom_test_obj_obj_method): (webkit_dom_test_obj_obj_method_with_args): (webkit_dom_test_obj_method_that_requires_all_args): (webkit_dom_test_obj_method_that_requires_all_args_and_throws): (webkit_dom_test_obj_serialized_value): (webkit_dom_test_obj_method_with_exception): (webkit_dom_test_obj_with_dynamic_frame): (webkit_dom_test_obj_with_dynamic_frame_and_arg): (webkit_dom_test_obj_with_dynamic_frame_and_optional_arg): (webkit_dom_test_obj_with_dynamic_frame_and_user_gesture): (webkit_dom_test_obj_with_dynamic_frame_and_user_gesture_asad): (webkit_dom_test_obj_with_script_state_void): (webkit_dom_test_obj_with_script_state_obj): (webkit_dom_test_obj_with_script_state_void_exception): (webkit_dom_test_obj_with_script_state_obj_exception): (webkit_dom_test_obj_with_script_execution_context): (webkit_dom_test_obj_method_with_optional_arg): (webkit_dom_test_obj_method_with_non_optional_arg_and_optional_arg): (webkit_dom_test_obj_method_with_non_optional_arg_and_two_optional_args): (webkit_dom_test_obj_get_read_only_int_attr): (webkit_dom_test_obj_get_read_only_string_attr): (webkit_dom_test_obj_get_read_only_test_obj_attr): (webkit_dom_test_obj_get_int_attr): (webkit_dom_test_obj_set_int_attr): (webkit_dom_test_obj_get_long_long_attr): (webkit_dom_test_obj_set_long_long_attr): (webkit_dom_test_obj_get_unsigned_long_long_attr): (webkit_dom_test_obj_set_unsigned_long_long_attr): (webkit_dom_test_obj_get_string_attr): (webkit_dom_test_obj_set_string_attr): (webkit_dom_test_obj_get_test_obj_attr): (webkit_dom_test_obj_set_test_obj_attr): (webkit_dom_test_obj_get_attr_with_exception): (webkit_dom_test_obj_set_attr_with_exception): (webkit_dom_test_obj_get_attr_with_setter_exception): (webkit_dom_test_obj_set_attr_with_setter_exception): (webkit_dom_test_obj_get_attr_with_getter_exception): (webkit_dom_test_obj_set_attr_with_getter_exception): (webkit_dom_test_obj_get_script_string_attr): (webkit_dom_test_obj_get_conditional_attr1): (webkit_dom_test_obj_set_conditional_attr1): (webkit_dom_test_obj_get_conditional_attr2): (webkit_dom_test_obj_set_conditional_attr2): (webkit_dom_test_obj_get_conditional_attr3): (webkit_dom_test_obj_set_conditional_attr3): (webkit_dom_test_obj_get_description): (webkit_dom_test_obj_get_id): (webkit_dom_test_obj_set_id): (webkit_dom_test_obj_get_hash): (webkit_dom_test_obj_set_property): (webkit_dom_test_obj_get_property): (webkit_dom_test_obj_class_init):
  • bindings/scripts/test/GObject/WebKitDOMTestObj.h:
  • bindings/scripts/test/JS/JSTestObj.cpp: (WebCore::): (WebCore::jsTestObjAttrWithException): (WebCore::jsTestObjAttrWithSetterException): (WebCore::jsTestObjAttrWithGetterException): (WebCore::setJSTestObjAttrWithException): (WebCore::setJSTestObjAttrWithGetterException): (WebCore::jsTestObjPrototypeFunctionOverloadedMethod):
  • bindings/scripts/test/JS/JSTestObj.h:
  • bindings/scripts/test/ObjC/DOMTestObj.h:
  • bindings/scripts/test/ObjC/DOMTestObj.mm: (-[DOMTestObj attrWithException]): (-[DOMTestObj setAttrWithException:]): (-[DOMTestObj attrWithSetterException]): (-[DOMTestObj attrWithGetterException]): (-[DOMTestObj setAttrWithGetterException:]):
  • bindings/scripts/test/TestObj.idl:
  • bindings/scripts/test/V8/V8TestObj.cpp: (WebCore::TestObjInternal::attrWithExceptionAttrGetter): (WebCore::TestObjInternal::attrWithExceptionAttrSetter): (WebCore::TestObjInternal::attrWithSetterExceptionAttrGetter): (WebCore::TestObjInternal::attrWithGetterExceptionAttrGetter): (WebCore::TestObjInternal::attrWithGetterExceptionAttrSetter): (WebCore::TestObjInternal::overloadedMethodCallback): (WebCore::):
  • dom/Element.cpp:
  • dom/Element.h:
  • html/HTMLAnchorElement.idl:
  • html/HTMLAppletElement.idl:
  • html/HTMLAreaElement.idl:
  • html/HTMLBRElement.idl:
  • html/HTMLBaseElement.idl:
  • html/HTMLBaseFontElement.idl:
  • html/HTMLBlockquoteElement.idl:
  • html/HTMLBodyElement.idl:
  • html/HTMLButtonElement.idl:
  • html/HTMLDListElement.idl:
  • html/HTMLDirectoryElement.idl:
  • html/HTMLDivElement.idl:
  • html/HTMLElement.idl:
  • html/HTMLEmbedElement.idl:
  • html/HTMLFontElement.idl:
  • html/HTMLFormElement.idl:
  • html/HTMLFrameElement.idl:
  • html/HTMLFrameSetElement.idl:
  • html/HTMLHRElement.idl:
  • html/HTMLHeadElement.idl:
  • html/HTMLHeadingElement.idl:
  • html/HTMLHtmlElement.idl:
  • html/HTMLIFrameElement.idl:
  • html/HTMLImageElement.idl:
  • html/HTMLInputElement.idl:
  • html/HTMLIsIndexElement.idl:
  • html/HTMLLIElement.idl:
  • html/HTMLLabelElement.idl:
  • html/HTMLLegendElement.idl:
  • html/HTMLLinkElement.idl:
  • html/HTMLMapElement.idl:
  • html/HTMLMediaElement.idl:
  • html/HTMLMenuElement.idl:
  • html/HTMLMetaElement.idl:
  • html/HTMLModElement.idl:
  • html/HTMLOListElement.idl:
  • html/HTMLObjectElement.idl:
  • html/HTMLOptGroupElement.idl:
  • html/HTMLOptionElement.idl:
  • html/HTMLParagraphElement.idl:
  • html/HTMLParamElement.idl:
  • html/HTMLPreElement.idl:
  • html/HTMLQuoteElement.idl:
  • html/HTMLScriptElement.idl:
  • html/HTMLStyleElement.idl:
  • html/HTMLTableCaptionElement.idl:
  • html/HTMLTableCellElement.idl:
  • html/HTMLTableColElement.idl:
  • html/HTMLTableElement.idl:
  • html/HTMLTableRowElement.idl:
  • html/HTMLTableSectionElement.idl:
  • html/HTMLTextAreaElement.idl:
  • html/HTMLUListElement.idl:
  • html/HTMLVideoElement.idl:
  • svg/SVGElement.idl:
Location:
trunk/WebCore
Files:
75 edited

Legend:

Unmodified
Added
Removed

  • trunk/WebCore/ChangeLog

    r61383 r61384  
     12010-06-17  Sheriff Bot  <webkit.review.bot@gmail.com>
     2
     3        Unreviewed, rolling out r61379.
     4        http://trac.webkit.org/changeset/61379
     5        https://bugs.webkit.org/show_bug.cgi?id=40813
     6
     7        Broke multiple tests on all platforms (Requested by tkent on
     8        #webkit).
     9
     10        * bindings/scripts/CodeGenerator.pm:
     11        * bindings/scripts/CodeGeneratorCPP.pm:
     12        * bindings/scripts/CodeGeneratorGObject.pm:
     13        * bindings/scripts/CodeGeneratorJS.pm:
     14        * bindings/scripts/CodeGeneratorObjC.pm:
     15        * bindings/scripts/CodeGeneratorV8.pm:
     16        * bindings/scripts/test/CPP/WebDOMTestObj.cpp:
     17        (WebDOMTestObj::attrWithException):
     18        (WebDOMTestObj::setAttrWithException):
     19        (WebDOMTestObj::attrWithSetterException):
     20        (WebDOMTestObj::attrWithGetterException):
     21        (WebDOMTestObj::setAttrWithGetterException):
     22        * bindings/scripts/test/CPP/WebDOMTestObj.h:
     23        * bindings/scripts/test/GObject/WebKitDOMTestCallback.cpp:
     24        (webkit_dom_test_callback_callback_with_class1param):
     25        (webkit_dom_test_callback_callback_with_class2param):
     26        (webkit_dom_test_callback_callback_with_non_bool_return_type):
     27        * bindings/scripts/test/GObject/WebKitDOMTestObj.cpp:
     28        (webkit_dom_test_obj_void_method):
     29        (webkit_dom_test_obj_void_method_with_args):
     30        (webkit_dom_test_obj_int_method):
     31        (webkit_dom_test_obj_int_method_with_args):
     32        (webkit_dom_test_obj_obj_method):
     33        (webkit_dom_test_obj_obj_method_with_args):
     34        (webkit_dom_test_obj_method_that_requires_all_args):
     35        (webkit_dom_test_obj_method_that_requires_all_args_and_throws):
     36        (webkit_dom_test_obj_serialized_value):
     37        (webkit_dom_test_obj_method_with_exception):
     38        (webkit_dom_test_obj_with_dynamic_frame):
     39        (webkit_dom_test_obj_with_dynamic_frame_and_arg):
     40        (webkit_dom_test_obj_with_dynamic_frame_and_optional_arg):
     41        (webkit_dom_test_obj_with_dynamic_frame_and_user_gesture):
     42        (webkit_dom_test_obj_with_dynamic_frame_and_user_gesture_asad):
     43        (webkit_dom_test_obj_with_script_state_void):
     44        (webkit_dom_test_obj_with_script_state_obj):
     45        (webkit_dom_test_obj_with_script_state_void_exception):
     46        (webkit_dom_test_obj_with_script_state_obj_exception):
     47        (webkit_dom_test_obj_with_script_execution_context):
     48        (webkit_dom_test_obj_method_with_optional_arg):
     49        (webkit_dom_test_obj_method_with_non_optional_arg_and_optional_arg):
     50        (webkit_dom_test_obj_method_with_non_optional_arg_and_two_optional_args):
     51        (webkit_dom_test_obj_get_read_only_int_attr):
     52        (webkit_dom_test_obj_get_read_only_string_attr):
     53        (webkit_dom_test_obj_get_read_only_test_obj_attr):
     54        (webkit_dom_test_obj_get_int_attr):
     55        (webkit_dom_test_obj_set_int_attr):
     56        (webkit_dom_test_obj_get_long_long_attr):
     57        (webkit_dom_test_obj_set_long_long_attr):
     58        (webkit_dom_test_obj_get_unsigned_long_long_attr):
     59        (webkit_dom_test_obj_set_unsigned_long_long_attr):
     60        (webkit_dom_test_obj_get_string_attr):
     61        (webkit_dom_test_obj_set_string_attr):
     62        (webkit_dom_test_obj_get_test_obj_attr):
     63        (webkit_dom_test_obj_set_test_obj_attr):
     64        (webkit_dom_test_obj_get_attr_with_exception):
     65        (webkit_dom_test_obj_set_attr_with_exception):
     66        (webkit_dom_test_obj_get_attr_with_setter_exception):
     67        (webkit_dom_test_obj_set_attr_with_setter_exception):
     68        (webkit_dom_test_obj_get_attr_with_getter_exception):
     69        (webkit_dom_test_obj_set_attr_with_getter_exception):
     70        (webkit_dom_test_obj_get_script_string_attr):
     71        (webkit_dom_test_obj_get_conditional_attr1):
     72        (webkit_dom_test_obj_set_conditional_attr1):
     73        (webkit_dom_test_obj_get_conditional_attr2):
     74        (webkit_dom_test_obj_set_conditional_attr2):
     75        (webkit_dom_test_obj_get_conditional_attr3):
     76        (webkit_dom_test_obj_set_conditional_attr3):
     77        (webkit_dom_test_obj_get_description):
     78        (webkit_dom_test_obj_get_id):
     79        (webkit_dom_test_obj_set_id):
     80        (webkit_dom_test_obj_get_hash):
     81        (webkit_dom_test_obj_set_property):
     82        (webkit_dom_test_obj_get_property):
     83        (webkit_dom_test_obj_class_init):
     84        * bindings/scripts/test/GObject/WebKitDOMTestObj.h:
     85        * bindings/scripts/test/JS/JSTestObj.cpp:
     86        (WebCore::):
     87        (WebCore::jsTestObjAttrWithException):
     88        (WebCore::jsTestObjAttrWithSetterException):
     89        (WebCore::jsTestObjAttrWithGetterException):
     90        (WebCore::setJSTestObjAttrWithException):
     91        (WebCore::setJSTestObjAttrWithGetterException):
     92        (WebCore::jsTestObjPrototypeFunctionOverloadedMethod):
     93        * bindings/scripts/test/JS/JSTestObj.h:
     94        * bindings/scripts/test/ObjC/DOMTestObj.h:
     95        * bindings/scripts/test/ObjC/DOMTestObj.mm:
     96        (-[DOMTestObj attrWithException]):
     97        (-[DOMTestObj setAttrWithException:]):
     98        (-[DOMTestObj attrWithSetterException]):
     99        (-[DOMTestObj attrWithGetterException]):
     100        (-[DOMTestObj setAttrWithGetterException:]):
     101        * bindings/scripts/test/TestObj.idl:
     102        * bindings/scripts/test/V8/V8TestObj.cpp:
     103        (WebCore::TestObjInternal::attrWithExceptionAttrGetter):
     104        (WebCore::TestObjInternal::attrWithExceptionAttrSetter):
     105        (WebCore::TestObjInternal::attrWithSetterExceptionAttrGetter):
     106        (WebCore::TestObjInternal::attrWithGetterExceptionAttrGetter):
     107        (WebCore::TestObjInternal::attrWithGetterExceptionAttrSetter):
     108        (WebCore::TestObjInternal::overloadedMethodCallback):
     109        (WebCore::):
     110        * dom/Element.cpp:
     111        * dom/Element.h:
     112        * html/HTMLAnchorElement.idl:
     113        * html/HTMLAppletElement.idl:
     114        * html/HTMLAreaElement.idl:
     115        * html/HTMLBRElement.idl:
     116        * html/HTMLBaseElement.idl:
     117        * html/HTMLBaseFontElement.idl:
     118        * html/HTMLBlockquoteElement.idl:
     119        * html/HTMLBodyElement.idl:
     120        * html/HTMLButtonElement.idl:
     121        * html/HTMLDListElement.idl:
     122        * html/HTMLDirectoryElement.idl:
     123        * html/HTMLDivElement.idl:
     124        * html/HTMLElement.idl:
     125        * html/HTMLEmbedElement.idl:
     126        * html/HTMLFontElement.idl:
     127        * html/HTMLFormElement.idl:
     128        * html/HTMLFrameElement.idl:
     129        * html/HTMLFrameSetElement.idl:
     130        * html/HTMLHRElement.idl:
     131        * html/HTMLHeadElement.idl:
     132        * html/HTMLHeadingElement.idl:
     133        * html/HTMLHtmlElement.idl:
     134        * html/HTMLIFrameElement.idl:
     135        * html/HTMLImageElement.idl:
     136        * html/HTMLInputElement.idl:
     137        * html/HTMLIsIndexElement.idl:
     138        * html/HTMLLIElement.idl:
     139        * html/HTMLLabelElement.idl:
     140        * html/HTMLLegendElement.idl:
     141        * html/HTMLLinkElement.idl:
     142        * html/HTMLMapElement.idl:
     143        * html/HTMLMediaElement.idl:
     144        * html/HTMLMenuElement.idl:
     145        * html/HTMLMetaElement.idl:
     146        * html/HTMLModElement.idl:
     147        * html/HTMLOListElement.idl:
     148        * html/HTMLObjectElement.idl:
     149        * html/HTMLOptGroupElement.idl:
     150        * html/HTMLOptionElement.idl:
     151        * html/HTMLParagraphElement.idl:
     152        * html/HTMLParamElement.idl:
     153        * html/HTMLPreElement.idl:
     154        * html/HTMLQuoteElement.idl:
     155        * html/HTMLScriptElement.idl:
     156        * html/HTMLStyleElement.idl:
     157        * html/HTMLTableCaptionElement.idl:
     158        * html/HTMLTableCellElement.idl:
     159        * html/HTMLTableColElement.idl:
     160        * html/HTMLTableElement.idl:
     161        * html/HTMLTableRowElement.idl:
     162        * html/HTMLTableSectionElement.idl:
     163        * html/HTMLTextAreaElement.idl:
     164        * html/HTMLUListElement.idl:
     165        * html/HTMLVideoElement.idl:
     166        * svg/SVGElement.idl:
     167
    11682010-06-17  Rob Buis  <rwlbuis@gmail.com>
    2169

  • trunk/WebCore/bindings/scripts/CodeGenerator.pm

    r61379 r61384  
    382382}
    383383
    384 sub AttributeNameForGetterAndSetter
    385 {
    386     my ($generator, $attribute) = @_;
    387 
    388     my $attributeName = $attribute->signature->name;
    389 
    390     # Avoid clash with C++ keyword.
    391     $attributeName = "_operator" if $attributeName eq "operator";
    392 
    393     # SVG animated types need to use a special attribute name.
    394     # The rest of the special casing for SVG animated types is handled in the language-specific code generators.
    395     $attributeName .= "Animated" if $generator->IsSVGAnimatedType($generator->StripModule($attribute->signature->type));
    396 
    397     return $attributeName;
    398 }
    399 
    400 sub ContentAttributeName
    401 {
    402     my ($generator, $implIncludes, $interfaceName, $attribute) = @_;
    403 
    404     my $contentAttributeName = $attribute->signature->extendedAttributes->{"Reflect"}
    405         || $attribute->signature->extendedAttributes->{"ReflectURL"};
    406     return undef if !$contentAttributeName;
    407 
    408     $contentAttributeName = lc $generator->AttributeNameForGetterAndSetter($attribute) if $contentAttributeName eq "1";
    409 
    410     my $namespace = $generator->NamespaceForAttributeName($interfaceName, $contentAttributeName);
    411 
    412     $implIncludes->{"${namespace}.h"} = 1;
    413     return "WebCore::${namespace}::${contentAttributeName}Attr";
    414 }
    415 
    416 sub GetterExpressionPrefix
    417 {
    418     my ($generator, $implIncludes, $interfaceName, $attribute) = @_;
    419 
    420     my $contentAttributeName = $generator->ContentAttributeName($implIncludes, $interfaceName, $attribute);
    421 
    422     if (!$contentAttributeName) {
    423         return $generator->WK_lcfirst($generator->AttributeNameForGetterAndSetter($attribute)) . "(";
    424     }
    425 
    426     my $functionName;
    427     if ($attribute->signature->extendedAttributes->{"ReflectURL"}) {
    428         $functionName = "getURLAttribute";
    429     } elsif ($attribute->signature->type eq "boolean") {
    430         $functionName = "hasAttribute";
    431     } elsif ($attribute->signature->type eq "long") {
    432         $functionName = "getIntegralAttribute";
    433     } elsif ($attribute->signature->type eq "unsigned long") {
    434         $functionName = "getUnsignedIntegralAttribute";
    435     } else {
    436         $functionName = "getAttribute";
    437     }
    438 
    439     return "$functionName($contentAttributeName"
    440 }
    441 
    442 sub SetterExpressionPrefix
    443 {
    444     my ($generator, $implIncludes, $interfaceName, $attribute) = @_;
    445 
    446     my $contentAttributeName = $generator->ContentAttributeName($implIncludes, $interfaceName, $attribute);
    447 
    448     if (!$contentAttributeName) {
    449         return "set" . $generator->WK_ucfirst($generator->AttributeNameForGetterAndSetter($attribute)) . "(";
    450     }
    451 
    452     my $functionName;
    453     if ($attribute->signature->type eq "boolean") {
    454         $functionName = "setBooleanAttribute";
    455     } elsif ($attribute->signature->type eq "long") {
    456         $functionName = "setIntegralAttribute";
    457     } elsif ($attribute->signature->type eq "unsigned long") {
    458         $functionName = "setUnsignedIntegralAttribute";
    459     } else {
    460         $functionName = "setAttribute";
    461     }
    462 
    463     return "$functionName($contentAttributeName, "
    464 }
    465384
    4663851;

  • trunk/WebCore/bindings/scripts/CodeGeneratorCPP.pm

    r61379 r61384  
    680680            my $getterSig = "$attributeType $className\:\:$attributeName() const\n";
    681681            my $hasGetterException = @{$attribute->getterExceptions};
    682             my $getterContentHead = "impl()->" . $codeGenerator->GetterExpressionPrefix(\%implIncludes, $interfaceName, $attribute);
     682            my $getterContentHead;
     683            my $reflect = $attribute->signature->extendedAttributes->{"Reflect"};
     684            my $reflectURL = $attribute->signature->extendedAttributes->{"ReflectURL"};
     685            if ($reflect || $reflectURL) {
     686                my $contentAttributeName = (($reflect || $reflectURL) eq "1") ? $attributeName : ($reflect || $reflectURL);
     687                my $namespace = $codeGenerator->NamespaceForAttributeName($interfaceName, $contentAttributeName);
     688                $implIncludes{"${namespace}.h"} = 1;
     689                my $getAttributeFunctionName = $reflectURL ? "getURLAttribute" : "getAttribute";
     690                $getterContentHead = "impl()->${getAttributeFunctionName}(WebCore::${namespace}::${contentAttributeName}Attr";
     691            } else {
     692                $getterContentHead = "impl()->" . $codeGenerator->WK_lcfirst($attributeName) . "(";
     693            }
    683694            my $getterContentTail = ")";
    684695
    … …  
    688699                $getterContentHead = "WebCore::String::number(" . $getterContentHead;
    689700                $getterContentTail .= ")";
     701            } elsif ($attribute->signature->extendedAttributes->{"ConvertFromString"}) {
     702                $getterContentTail .= ".toInt()";
    690703            } elsif ($attribute->signature->type eq "SerializedScriptValue") {
    691704                $getterContentHead = "$getterContentHead";
    … …  
    738751                my $arg = GetCPPTypeGetter($argName, $idlType);
    739752
    740                 # The definition of ConvertToString is flipped for the setter
    741                 if ($attribute->signature->extendedAttributes->{"ConvertToString"}) {
     753                # The definition of ConvertFromString and ConvertToString is flipped for the setter
     754                if ($attribute->signature->extendedAttributes->{"ConvertFromString"}) {
     755                    $arg = "WebCore::String::number($arg)";
     756                } elsif ($attribute->signature->extendedAttributes->{"ConvertToString"}) {
    742757                    $arg = "WebCore::String($arg).toInt()";
    743758                }
    … …  
    748763                push(@implContent, AddEarlyReturnStatement());
    749764
     765                my $reflect = $attribute->signature->extendedAttributes->{"Reflect"};
     766                my $reflectURL = $attribute->signature->extendedAttributes->{"ReflectURL"};
    750767                push(@implContent, "    $exceptionInit\n") if $hasSetterException;
    751768                my $ec = $hasSetterException ? ", ec" : "";
    752                 my $setterExpressionPrefix = $codeGenerator->SetterExpressionPrefix(\%implIncludes, $interfaceName, $attribute);
    753                 push(@implContent, "    impl()->$setterExpressionPrefix$arg$ec);\n");
     769                if ($reflect || $reflectURL) {
     770                    my $contentAttributeName = (($reflect || $reflectURL) eq "1") ? $attributeName : ($reflect || $reflectURL);
     771                    my $namespace = $codeGenerator->NamespaceForAttributeName($interfaceName, $contentAttributeName);
     772                    $implIncludes{"${namespace}.h"} = 1;
     773                    push(@implContent, "    impl()->setAttribute(WebCore::${namespace}::${contentAttributeName}Attr, $arg$ec);\n");
     774                } else {
     775                    push(@implContent, "    impl()->$coreSetterName($arg$ec);\n");
     776                }
    754777                push(@implContent, "    $exceptionRaiseOnError\n") if $hasSetterException;
    755778                push(@implContent, "}\n\n");

  • trunk/WebCore/bindings/scripts/CodeGeneratorGObject.pm

    r61379 r61384  
    362362    if ($gtype eq "string") {
    363363        $convertFunction = "WebCore::String::fromUTF8";
    364     }
    365 
    366     my $getterExpressionPrefix = $codeGenerator->GetterExpressionPrefix(\%implIncludes, $interfaceName, $attribute);
    367     my $setterExpressionPrefix = $codeGenerator->SetterExpressionPrefix(\%implIncludes, $interfaceName, $attribute);
    368 
    369     my $getterContentHead = "coreSelf->$getterExpressionPrefix";
    370     my $setterContentHead = "coreSelf->$setterExpressionPrefix${convertFunction}(g_value_get_$gtype(value))";
     364    } elsif ($attribute->signature->extendedAttributes->{"ConvertFromString"}) {
     365        $convertFunction = "WebCore::String::number";
     366    }
     367
     368    my $setterContentHead;
     369    my $getterContentHead;
     370    my $reflect = $attribute->signature->extendedAttributes->{"Reflect"};
     371    my $reflectURL = $attribute->signature->extendedAttributes->{"ReflectURL"};
     372    if ($reflect || $reflectURL) {
     373        my $contentAttributeName = (($reflect || $reflectURL) eq "1") ? $camelPropName : ($reflect || $reflectURL);
     374        my $namespace = $codeGenerator->NamespaceForAttributeName($interfaceName, $contentAttributeName);
     375        $implIncludes{"${namespace}.h"} = 1;
     376        my $getAttributeFunctionName = $reflectURL ? "getURLAttribute" : "getAttribute";
     377        $setterContentHead = "coreSelf->setAttribute(WebCore::${namespace}::${contentAttributeName}Attr, ${convertFunction}(g_value_get_$gtype(value))";
     378        $getterContentHead = "coreSelf->${getAttributeFunctionName}(WebCore::${namespace}::${contentAttributeName}Attr";
     379    } else {
     380        $setterContentHead = "coreSelf->set${setPropNameFunction}(${convertFunction}(g_value_get_$gtype(value))";
     381        $getterContentHead = "coreSelf->${getPropNameFunction}(";
     382    }
    371383
    372384    if (grep {$_ eq $attribute} @writeableProperties) {
    … …  
    402414        push(@txtGetProps, $txtGetProp);
    403415        $done = 1;
     416    }
     417
     418    if($attribute->signature->extendedAttributes->{"ConvertFromString"}) {
     419        # TODO: Add other conversion functions for different types.  Current
     420        # IDLs only list longs.
     421        if($gtype eq "long") {
     422            $convertFunction = "";
     423            $postConvertFunction = ".toInt()";
     424        } else {
     425            die "Can't convert to type ${gtype}.";
     426        }
    404427    }
    405428
    … …  
    793816        }
    794817        if ($paramIsGDOMType || ($paramIDLType eq "DOMString") || ($paramIDLType eq "CompareHow")) {
    795             $paramName = "converted_" . $paramName;
     818            $paramName = "_g_" . $paramName;
    796819        }
    797820        if ($callImplParams) {
    … …  
    831854    if ($returnType ne "void") {
    832855        # TODO: return proper default result
    833         push(@cBody, "    g_return_val_if_fail(self, 0);\n");
     856        push(@cBody, "    g_return_val_if_fail (self, 0);\n");
    834857    } else {
    835         push(@cBody, "    g_return_if_fail(self);\n");
     858        push(@cBody, "    g_return_if_fail (self);\n");
    836859    }
    837860
    … …  
    848871            if ($returnType ne "void") {
    849872                # TODO: return proper default result
    850                 push(@cBody, "    g_return_val_if_fail($paramName, 0);\n");
     873                push(@cBody, "    g_return_val_if_fail ($paramName, 0);\n");
    851874            } else {
    852                 push(@cBody, "    g_return_if_fail($paramName);\n");
     875                push(@cBody, "    g_return_if_fail ($paramName);\n");
    853876            }
    854877        }
    … …  
    862885        my $paramIsGDOMType = IsGDOMClassType($paramIDLType);
    863886        if ($paramIDLType eq "DOMString") {
    864             push(@cBody, "    WebCore::String converted_${paramName} = WebCore::String::fromUTF8($paramName);\n");
     887            push(@cBody, "    WebCore::String _g_${paramName} = WebCore::String::fromUTF8($paramName);\n");
    865888        } elsif ($paramIDLType eq "CompareHow") {
    866             push(@cBody, "    WebCore::Range::CompareHow converted_${paramName} = static_cast<WebCore::Range::CompareHow>($paramName);\n");
     889            push(@cBody, "    WebCore::Range::CompareHow _g_${paramName} = static_cast<WebCore::Range::CompareHow>($paramName);\n");
    867890        } elsif ($paramIsGDOMType) {
    868             push(@cBody, "    WebCore::${paramIDLType} * converted_${paramName} = WebKit::core($paramName);\n");
     891            push(@cBody, "    WebCore::${paramIDLType} * _g_${paramName} = WebKit::core($paramName);\n");
    869892            if ($returnType ne "void") {
    870893                # TODO: return proper default result
    871                 push(@cBody, "    g_return_val_if_fail(converted_${paramName}, 0);\n");
     894                push(@cBody, "    g_return_val_if_fail (_g_${paramName}, 0);\n");
    872895            } else {
    873                 push(@cBody, "    g_return_if_fail(converted_${paramName});\n");
     896                push(@cBody, "    g_return_if_fail (_g_${paramName});\n");
    874897            }
    875898        }
    876         $returnParamName = "converted_".$paramName if $param->extendedAttributes->{"Return"};
     899        $returnParamName = "_g_".$paramName if $param->extendedAttributes->{"Return"};
    877900    }
    878901
    … …  
    933956    } elsif ($functionSigType eq "DOMString") {
    934957        my $getterContentHead;
    935         if ($prefix) {
    936             my $getterExpressionPrefix = $codeGenerator->GetterExpressionPrefix(\%implIncludes, $interfaceName, $function);
    937             $getterContentHead = "${assign}convertToUTF8String(item->$getterExpressionPrefix${exceptions}));\n";
     958        my $reflect = $function->signature->extendedAttributes->{"Reflect"};
     959        my $reflectURL = $function->signature->extendedAttributes->{"ReflectURL"};
     960        if ($reflect || $reflectURL) {
     961            my $contentAttributeName = (($reflect || $reflectURL) eq "1") ? $functionSigName : ($reflect || $reflectURL);
     962            my $namespace = $codeGenerator->NamespaceForAttributeName($interfaceName, $contentAttributeName);
     963            $implIncludes{"${namespace}.h"} = 1;
     964            my $getAttributeFunctionName = $reflectURL ? "getURLAttribute" : "getAttribute";
     965            $getterContentHead = "${assign}convertToUTF8String(item->${getAttributeFunctionName}(WebCore::${namespace}::${contentAttributeName}Attr));\n";
    938966        } else {
    939967            $getterContentHead = "${assign}convertToUTF8String(item->${functionSigName}(${callImplParams}${exceptions}));\n";
    940968        }
     969
    941970        push(@cBody, "    ${getterContentHead}");
    942971    } else {
    943         my $contentHead;
    944         if ($prefix eq "get_") {
    945             my $getterExpressionPrefix = $codeGenerator->GetterExpressionPrefix(\%implIncludes, $interfaceName, $function);
    946             $contentHead = "${assign}${assignPre}item->$getterExpressionPrefix${callImplParams}${exceptions}${assignPost});\n";
    947         } elsif ($prefix eq "set_") {
    948             my $setterExpressionPrefix = $codeGenerator->SetterExpressionPrefix(\%implIncludes, $interfaceName, $function);
    949             $contentHead = "${assign}${assignPre}item->$setterExpressionPrefix${callImplParams}${exceptions}${assignPost});\n";
     972        my $setterContentHead;
     973        my $reflect = $function->signature->extendedAttributes->{"Reflect"};
     974        my $reflectURL = $function->signature->extendedAttributes->{"ReflectURL"};
     975        if ($reflect || $reflectURL) {
     976            my $contentAttributeName = (($reflect || $reflectURL) eq "1") ? $functionSigName : ($reflect || $reflectURL);
     977            $contentAttributeName =~ s/set//;
     978            $contentAttributeName = $codeGenerator->WK_lcfirst($contentAttributeName);
     979            my $namespace = $codeGenerator->NamespaceForAttributeName($interfaceName, $contentAttributeName);
     980            $implIncludes{"${namespace}.h"} = 1;
     981            $setterContentHead = "${assign}${assignPre}item->setAttribute(WebCore::${namespace}::${contentAttributeName}Attr, ${callImplParams}${exceptions}${assignPost});\n";
    950982        } else {
    951             $contentHead = "${assign}${assignPre}item->${functionSigName}(${callImplParams}${exceptions}${assignPost});\n";
    952         }
    953         push(@cBody, "    ${contentHead}");
     983            $setterContentHead = "${assign}${assignPre}item->${functionSigName}(${callImplParams}${exceptions}${assignPost});\n";
     984        }
     985
     986        push(@cBody, "    ${setterContentHead}");
    954987       
    955988        if(@{$function->raisesExceptions}) {
    … …  
    10161049            # according to GObject conventions.  Skip this for now.
    10171050            || $attribute->signature->name eq "URL"     # TODO: handle this
     1051            || $attribute->signature->extendedAttributes->{"ConvertFromString"}    # TODO: handle this
    10181052            ) {
    10191053            next TOP;
    … …  
    10451079       
    10461080        $function->signature(new domSignature());
    1047         $function->signature->name($attribute->signature->name);
     1081        $function->signature->name($setname);
    10481082        $function->signature->type("void");
    10491083        $function->signature->extendedAttributes($attribute->signature->extendedAttributes);
    … …  
    10591093        $function->raisesExceptions($attribute->setterExceptions);
    10601094       
    1061         $object->GenerateFunction($interfaceName, $function, "set_");
     1095        $object->GenerateFunction($interfaceName, $function, "");
    10621096    }
    10631097}

  • trunk/WebCore/bindings/scripts/CodeGeneratorJS.pm

    r61379 r61384  
    44# Copyright (C) 2006, 2007 Samuel Weinig <sam@webkit.org>
    55# Copyright (C) 2006 Alexey Proskuryakov <ap@webkit.org>
    6 # Copyright (C) 2006, 2007, 2008, 2009, 2010 Apple Inc. All rights reserved.
     6# Copyright (C) 2006, 2007, 2008, 2009 Apple Inc. All rights reserved.
    77# Copyright (C) 2009 Cameron McCormack <cam@mcc.id.au>
    88# Copyright (C) Research In Motion Limited 2010. All rights reserved.
    … …  
    15711571                        }
    15721572                    } else {
    1573                         my $getterExpression = "imp->" . $codeGenerator->GetterExpressionPrefix(\%implIncludes, $interfaceName, $attribute) . ")";
    1574                         my $jsType = NativeToJSValue($attribute->signature, 0, $implClassName, $implClassNameForValueConversion, $getterExpression, "castedThis");
    15751573                        push(@implContent, "    $implClassName* imp = static_cast<$implClassName*>(castedThis->impl());\n");
     1574                        my $value;
     1575                        my $reflect = $attribute->signature->extendedAttributes->{"Reflect"};
     1576                        my $reflectURL = $attribute->signature->extendedAttributes->{"ReflectURL"};
     1577                        if ($reflect || $reflectURL) {
     1578                            my $contentAttributeName = (($reflect || $reflectURL) eq "1") ? $name : ($reflect || $reflectURL);
     1579                            my $namespace = $codeGenerator->NamespaceForAttributeName($interfaceName, $contentAttributeName);
     1580                            $implIncludes{"${namespace}.h"} = 1;
     1581                            my $getAttributeFunctionName = $reflectURL ? "getURLAttribute" : "getAttribute";
     1582                            $value = "imp->$getAttributeFunctionName(${namespace}::${contentAttributeName}Attr)"
     1583                        } else {
     1584                            $value = "imp->$implGetterFunctionName()";
     1585                        }
     1586                        my $jsType = NativeToJSValue($attribute->signature, 0, $implClassName, $implClassNameForValueConversion, $value, "castedThis");
    15761587                        if ($codeGenerator->IsSVGAnimatedType($type)) {
    15771588                            push(@implContent, "    RefPtr<$type> obj = $jsType;\n");
    … …  
    17241735                            } else {
    17251736                                my $nativeValue = JSValueToNative($attribute->signature, "value");
    1726                                 my $setterExpressionPrefix = $codeGenerator->SetterExpressionPrefix(\%implIncludes, $interfaceName, $attribute);
    1727 
    17281737                                push(@implContent, "    ExceptionCode ec = 0;\n") if @{$attribute->setterExceptions};
    1729                                 push(@implContent, "    imp->$setterExpressionPrefix$nativeValue");
     1738                                my $reflect = $attribute->signature->extendedAttributes->{"Reflect"};
     1739                                my $reflectURL = $attribute->signature->extendedAttributes->{"ReflectURL"};
     1740                                if ($reflect || $reflectURL) {
     1741                                    my $contentAttributeName = (($reflect || $reflectURL) eq "1") ? $name : ($reflect || $reflectURL);
     1742                                    my $namespace = $codeGenerator->NamespaceForAttributeName($interfaceName, $contentAttributeName);
     1743                                    $implIncludes{"${namespace}.h"} = 1;
     1744                                    push(@implContent, "    imp->setAttribute(${namespace}::${contentAttributeName}Attr, $nativeValue");
     1745                                } else {
     1746                                    push(@implContent, "    imp->set$implSetterFunctionName($nativeValue");
     1747                                }
    17301748                                push(@implContent, ", ec") if @{$attribute->setterExceptions};
    17311749                                push(@implContent, ");\n");
    … …  
    23132331
    23142332    if ($type eq "DOMString") {
    2315         return "valueToStringWithNullCheck(exec, $value)" if $signature->extendedAttributes->{"ConvertNullToNullString"} || $signature->extendedAttributes->{"Reflect"} || $signature->extendedAttributes->{"ReflectURL"};
     2333        return "valueToStringWithNullCheck(exec, $value)" if $signature->extendedAttributes->{"ConvertNullToNullString"};
    23162334        return "valueToStringWithUndefinedOrNullCheck(exec, $value)" if $signature->extendedAttributes->{"ConvertUndefinedOrNullToNullString"};
    23172335        return "ustringToString($value.toString(exec))";
    … …  
    24052423            return "toJS(exec, $globalObject, JSSVGDynamicPODTypeWrapperCache<$nativeType, $implClassNameForValueConversion>::lookupOrCreateWrapper(imp, &${implClassNameForValueConversion}::$getter, &${implClassNameForValueConversion}::$setter).get(), JSSVGContextCache::svgContextForDOMObject(castedThis));"
    24062424        }
     2425    }
     2426
     2427    if ($codeGenerator->IsSVGAnimatedType($type)) {
     2428        # Some SVGFE*Element.idl use 'operator' as attribute name, rewrite as '_operator' to avoid clashes with C/C++
     2429        $value =~ s/operator\(\)/_operator\(\)/ if ($value =~ /operator/);
     2430        $value =~ s/\(\)//;
     2431        $value .= "Animated()";
    24072432    }
    24082433

  • trunk/WebCore/bindings/scripts/CodeGeneratorObjC.pm

    r61379 r61384  
    44# Copyright (C) 2006, 2007 Samuel Weinig <sam@webkit.org>
    55# Copyright (C) 2006 Alexey Proskuryakov <ap@webkit.org>
    6 # Copyright (C) 2006, 2007, 2008, 2009, 2010 Apple Inc. All rights reserved.
     6# Copyright (C) 2006, 2007, 2008, 2009 Apple Inc. All rights reserved.
    77# Copyright (C) 2009 Cameron McCormack <cam@mcc.id.au>
    88# Copyright (C) 2010 Google Inc.
    … …  
    11761176                # Special case attribute frame to be frameBorders.
    11771177                $attributeInterfaceName .= "Borders";
    1178             } elsif ($attributeName eq "operator") {
    1179                 # Avoid clash with C++ keyword.
    1180                 $attributeInterfaceName = "_operator";
     1178            } elsif ($attributeName eq "ownerDocument") {
     1179                # FIXME: for now special case attribute ownerDocument to call document, this is incorrect
     1180                # legacy behavior. (see http://bugs.webkit.org/show_bug.cgi?id=10889)
     1181                $attributeName = "document";
     1182            } elsif ($codeGenerator->IsSVGAnimatedType($idlType)) {
     1183                # Special case for animated types.
     1184                $attributeName .= "Animated";
    11811185            }
    11821186
    … …  
    11861190            my $getterSig = "- ($attributeType)$attributeInterfaceName\n";
    11871191
    1188             my $getterExpressionPrefix = $codeGenerator->GetterExpressionPrefix(\%implIncludes, $interfaceName, $attribute);
    1189 
    1190             # FIXME: Special case attribute ownerDocument to call document. This makes it return the
    1191             # document when called on the document itself. Legacy behavior, see <https://bugs.webkit.org/show_bug.cgi?id=10889>.
    1192             $getterExpressionPrefix =~ s/\bownerDocument\b/document/;
     1192            # Some SVGFE*Element.idl use 'operator' as attribute name, rewrite as '_operator' to avoid clashes with C/C++
     1193            $attributeName =~ s/operatorAnimated/_operatorAnimated/ if ($attributeName =~ /operatorAnimated/);
     1194            $getterSig =~ s/operator/_operator/ if ($getterSig =~ /operator/);
    11931195
    11941196            my $hasGetterException = @{$attribute->getterExceptions};
    1195             my $getterContentHead = "IMPL->$getterExpressionPrefix";
     1197            my $getterContentHead;
     1198            my $reflect = $attribute->signature->extendedAttributes->{"Reflect"};
     1199            my $reflectURL = $attribute->signature->extendedAttributes->{"ReflectURL"};
     1200            if ($reflect || $reflectURL) {
     1201                my $contentAttributeName = (($reflect || $reflectURL) eq "1") ? $attributeName : ($reflect || $reflectURL);
     1202                my $namespace = $codeGenerator->NamespaceForAttributeName($interfaceName, $contentAttributeName);
     1203                $implIncludes{"${namespace}.h"} = 1;
     1204                my $getAttributeFunctionName = $reflectURL ? "getURLAttribute" : "getAttribute";
     1205                $getterContentHead = "IMPL->${getAttributeFunctionName}(WebCore::${namespace}::${contentAttributeName}Attr";
     1206            } else {
     1207                $getterContentHead = "IMPL->" . $codeGenerator->WK_lcfirst($attributeName) . "(";
     1208            }
    11961209            my $getterContentTail = ")";
    11971210
    … …  
    12441257                $getterContentHead = "WebCore::String::number(" . $getterContentHead;
    12451258                $getterContentTail .= ")";
     1259            } elsif ($attribute->signature->extendedAttributes->{"ConvertFromString"}) {
     1260                $getterContentTail .= ".toInt()";
    12461261            } elsif ($codeGenerator->IsPodType($idlType) or $idlType eq "Date") {
    12471262                $getterContentHead = "kit($getterContentHead";
    … …  
    13021317                my $arg = GetObjCTypeGetter($argName, $idlType);
    13031318
    1304                 # The definition of ConvertToString is flipped for the setter
    1305                 if ($attribute->signature->extendedAttributes->{"ConvertToString"}) {
     1319                # The definition of ConvertFromString and ConvertToString is flipped for the setter
     1320                if ($attribute->signature->extendedAttributes->{"ConvertFromString"}) {
     1321                    $arg = "WebCore::String::number($arg)";
     1322                } elsif ($attribute->signature->extendedAttributes->{"ConvertToString"}) {
    13061323                    $arg = "WebCore::String($arg).toInt()";
    13071324                }
    … …  
    13301347                    }
    13311348                } else {
    1332                     my $setterExpressionPrefix = $codeGenerator->SetterExpressionPrefix(\%implIncludes, $interfaceName, $attribute);
     1349                    my $reflect = $attribute->signature->extendedAttributes->{"Reflect"};
     1350                    my $reflectURL = $attribute->signature->extendedAttributes->{"ReflectURL"};
     1351                    push(@implContent, "    $exceptionInit\n") if $hasSetterException;
    13331352                    my $ec = $hasSetterException ? ", ec" : "";
    1334                     push(@implContent, "    $exceptionInit\n") if $hasSetterException;
    1335                     push(@implContent, "    IMPL->$setterExpressionPrefix$arg$ec);\n");
     1353                    if ($reflect || $reflectURL) {
     1354                        my $contentAttributeName = (($reflect || $reflectURL) eq "1") ? $attributeName : ($reflect || $reflectURL);
     1355                        my $namespace = $codeGenerator->NamespaceForAttributeName($interfaceName, $contentAttributeName);
     1356                        $implIncludes{"${namespace}.h"} = 1;
     1357                        push(@implContent, "    IMPL->setAttribute(WebCore::${namespace}::${contentAttributeName}Attr, $arg$ec);\n");
     1358                    } else {
     1359                        push(@implContent, "    IMPL->$coreSetterName($arg$ec);\n");
     1360                    }
    13361361                    push(@implContent, "    $exceptionRaiseOnError\n") if $hasSetterException;
    13371362                }

  • trunk/WebCore/bindings/scripts/CodeGeneratorV8.pm

    r61379 r61384  
    678678        if ($getterStringUsesImp && $reflect && IsNodeSubType($dataNode) && $codeGenerator->IsStringType($attrType)) {
    679679            # Generate super-compact call for regular attribute getter:
    680             my $contentAttributeName = $reflect eq "1" ? lc $attrName : $reflect;
     680            my $contentAttributeName = $reflect eq "1" ? $attrName : $reflect;
    681681            my $namespace = $codeGenerator->NamespaceForAttributeName($interfaceName, $contentAttributeName);
    682682            $implIncludes{"${namespace}.h"} = 1;
    … …  
    709709    }
    710710
     711    my $getterFunc = $codeGenerator->WK_lcfirst($attrName);
     712
     713    if ($codeGenerator->IsSVGAnimatedType($attribute->signature->type)) {
     714        # Some SVGFE*Element.idl use 'operator' as attribute name; rewrite as '_operator' to avoid clashes with C/C++
     715        $getterFunc = "_" . $getterFunc if ($attrName =~ /operator/);
     716        $getterFunc .= "Animated";
     717    }
     718
    711719    my $returnType = GetTypeFromSignature($attribute->signature);
    712720
    713721    my $getterString;
    714722    if ($getterStringUsesImp) {
    715         $getterString = "imp->" . $codeGenerator->GetterExpressionPrefix(\%implIncludes, $interfaceName, $attribute);
     723        my $reflect = $attribute->signature->extendedAttributes->{"Reflect"};
     724        my $reflectURL = $attribute->signature->extendedAttributes->{"ReflectURL"};
     725        if ($reflect || $reflectURL) {
     726            my $contentAttributeName = ($reflect || $reflectURL) eq "1" ? $attrName : ($reflect || $reflectURL);
     727            my $namespace = $codeGenerator->NamespaceForAttributeName($interfaceName, $contentAttributeName);
     728            $implIncludes{"${namespace}.h"} = 1;
     729            my $getAttributeFunctionName = $reflectURL ? "getURLAttribute" : "getAttribute";
     730            $getterString = "imp->$getAttributeFunctionName(${namespace}::${contentAttributeName}Attr";
     731        } else {
     732            $getterString = "imp->$getterFunc(";
     733        }
    716734        $getterString .= "ec" if $useExceptions;
    717735        $getterString .= ")";
     736        if ($nativeType eq "int" and $attribute->signature->extendedAttributes->{"ConvertFromString"}) {
     737            $getterString .= ".toInt()";
     738        }
    718739    } else {
    719740        $getterString = "impInstance";
    … …  
    867888        if (($reflect || $reflectURL) && IsNodeSubType($dataNode) && $codeGenerator->IsStringType($attrType)) {
    868889            # Generate super-compact call for regular attribute setter:
    869             my $contentAttributeName = ($reflect || $reflectURL) eq "1" ? lc $attrName : ($reflect || $reflectURL);
     890            my $contentAttributeName = ($reflect || $reflectURL) eq "1" ? $attrName : ($reflect || $reflectURL);
    870891            my $namespace = $codeGenerator->NamespaceForAttributeName($interfaceName, $contentAttributeName);
    871892            $implIncludes{"${namespace}.h"} = 1;
    … …  
    892913    }
    893914
    894     my $result = "v";
     915    my $result = "";
     916    if ($nativeType eq "int" and $attribute->signature->extendedAttributes->{"ConvertFromString"}) {
     917        $result .= "WebCore::String::number(";
     918    }
     919    $result .= "v";
     920    if ($nativeType eq "int" and $attribute->signature->extendedAttributes->{"ConvertFromString"}) {
     921        $result .= ")";
     922    }
    895923    my $returnType = GetTypeFromSignature($attribute->signature);
    896924    if (IsRefPtrType($returnType)) {
    … …  
    908936        push(@implContentDecls, "    *imp = $result;\n");
    909937    } else {
    910         if ($attribute->signature->type eq "EventListener") {
    911             my $implSetterFunctionName = $codeGenerator->WK_ucfirst($attrName);
     938        my $implSetterFunctionName = $codeGenerator->WK_ucfirst($attrName);
     939        my $reflect = $attribute->signature->extendedAttributes->{"Reflect"};
     940        my $reflectURL = $attribute->signature->extendedAttributes->{"ReflectURL"};
     941        if ($reflect || $reflectURL) {
     942            my $contentAttributeName = ($reflect || $reflectURL) eq "1" ? $attrName : ($reflect || $reflectURL);
     943            my $namespace = $codeGenerator->NamespaceForAttributeName($interfaceName, $contentAttributeName);
     944            $implIncludes{"${namespace}.h"} = 1;
     945            push(@implContentDecls, "    imp->setAttribute(${namespace}::${contentAttributeName}Attr, $result");
     946        } elsif ($attribute->signature->type eq "EventListener") {
    912947            $implIncludes{"V8AbstractEventListener.h"} = 1;
    913948            push(@implContentDecls, "    transferHiddenDependency(info.Holder(), imp->$attrName(), value, V8${interfaceName}::eventListenerCacheIndex);\n");
    … …  
    920955            }
    921956        } else {
    922             my $setterExpressionPrefix = $codeGenerator->SetterExpressionPrefix(\%implIncludes, $interfaceName, $attribute);
    923             push(@implContentDecls, "    imp->$setterExpressionPrefix$result");
     957            push(@implContentDecls, "    imp->set$implSetterFunctionName($result");
    924958        }
    925959        push(@implContentDecls, ", ec") if $useExceptions;
    … …  
    26792713        if ($signature->extendedAttributes->{"ConvertUndefinedOrNullToNullString"}) {
    26802714            $mode = "WithUndefinedOrNullCheck";
    2681         } elsif ($signature->extendedAttributes->{"ConvertNullToNullString"} || $signature->extendedAttributes->{"Reflect"} || $signature->extendedAttributes->{"ReflectURL"}) {
     2715        } elsif ($signature->extendedAttributes->{"ConvertNullToNullString"}) {
    26822716            $mode = "WithNullCheck";
    26832717        }

  • trunk/WebCore/bindings/scripts/test/CPP/WebDOMTestObj.cpp

    r61379 r61384  
    2323
    2424#include "AtomicString.h"
    25 #include "HTMLNames.h"
    2625#include "KURL.h"
    2726#include "SerializedScriptValue.h"
    … …  
    175174}
    176175
    177 WebDOMString WebDOMTestObj::reflectedStringAttr() const
    178 {
    179     if (!impl())
    180         return WebDOMString();
    181 
    182     return static_cast<const WebCore::String&>(impl()->getAttribute(WebCore::HTMLNames::reflectedstringattrAttr));
    183 }
    184 
    185 void WebDOMTestObj::setReflectedStringAttr(const WebDOMString& newReflectedStringAttr)
    186 {
    187     if (!impl())
    188         return;
    189 
    190     impl()->setAttribute(WebCore::HTMLNames::reflectedstringattrAttr, newReflectedStringAttr);
    191 }
    192 
    193 int WebDOMTestObj::reflectedIntegralAttr() const
    194 {
    195     if (!impl())
    196         return 0;
    197 
    198     return impl()->getIntegralAttribute(WebCore::HTMLNames::reflectedintegralattrAttr);
    199 }
    200 
    201 void WebDOMTestObj::setReflectedIntegralAttr(int newReflectedIntegralAttr)
    202 {
    203     if (!impl())
    204         return;
    205 
    206     impl()->setIntegralAttribute(WebCore::HTMLNames::reflectedintegralattrAttr, newReflectedIntegralAttr);
    207 }
    208 
    209 bool WebDOMTestObj::reflectedBooleanAttr() const
    210 {
    211     if (!impl())
    212         return false;
    213 
    214     return impl()->hasAttribute(WebCore::HTMLNames::reflectedbooleanattrAttr);
    215 }
    216 
    217 void WebDOMTestObj::setReflectedBooleanAttr(bool newReflectedBooleanAttr)
    218 {
    219     if (!impl())
    220         return;
    221 
    222     impl()->setBooleanAttribute(WebCore::HTMLNames::reflectedbooleanattrAttr, newReflectedBooleanAttr);
    223 }
    224 
    225 WebDOMString WebDOMTestObj::reflectedURLAttr() const
    226 {
    227     if (!impl())
    228         return WebDOMString();
    229 
    230     return static_cast<const WebCore::String&>(impl()->getURLAttribute(WebCore::HTMLNames::reflectedurlattrAttr));
    231 }
    232 
    233 void WebDOMTestObj::setReflectedURLAttr(const WebDOMString& newReflectedURLAttr)
    234 {
    235     if (!impl())
    236         return;
    237 
    238     impl()->setAttribute(WebCore::HTMLNames::reflectedurlattrAttr, newReflectedURLAttr);
    239 }
    240 
    241 WebDOMString WebDOMTestObj::reflectedStringAttr() const
    242 {
    243     if (!impl())
    244         return WebDOMString();
    245 
    246     return static_cast<const WebCore::String&>(impl()->getAttribute(WebCore::HTMLNames::customContentStringAttrAttr));
    247 }
    248 
    249 void WebDOMTestObj::setReflectedStringAttr(const WebDOMString& newReflectedStringAttr)
    250 {
    251     if (!impl())
    252         return;
    253 
    254     impl()->setAttribute(WebCore::HTMLNames::customContentStringAttrAttr, newReflectedStringAttr);
    255 }
    256 
    257 int WebDOMTestObj::reflectedCustomIntegralAttr() const
    258 {
    259     if (!impl())
    260         return 0;
    261 
    262     return impl()->getIntegralAttribute(WebCore::HTMLNames::customContentIntegralAttrAttr);
    263 }
    264 
    265 void WebDOMTestObj::setReflectedCustomIntegralAttr(int newReflectedCustomIntegralAttr)
    266 {
    267     if (!impl())
    268         return;
    269 
    270     impl()->setIntegralAttribute(WebCore::HTMLNames::customContentIntegralAttrAttr, newReflectedCustomIntegralAttr);
    271 }
    272 
    273 bool WebDOMTestObj::reflectedCustomBooleanAttr() const
    274 {
    275     if (!impl())
    276         return false;
    277 
    278     return impl()->hasAttribute(WebCore::HTMLNames::customContentBooleanAttrAttr);
    279 }
    280 
    281 void WebDOMTestObj::setReflectedCustomBooleanAttr(bool newReflectedCustomBooleanAttr)
    282 {
    283     if (!impl())
    284         return;
    285 
    286     impl()->setBooleanAttribute(WebCore::HTMLNames::customContentBooleanAttrAttr, newReflectedCustomBooleanAttr);
    287 }
    288 
    289 WebDOMString WebDOMTestObj::reflectedURLAttr() const
    290 {
    291     if (!impl())
    292         return WebDOMString();
    293 
    294     return static_cast<const WebCore::String&>(impl()->getURLAttribute(WebCore::HTMLNames::customContentURLAttrAttr));
    295 }
    296 
    297 void WebDOMTestObj::setReflectedURLAttr(const WebDOMString& newReflectedURLAttr)
    298 {
    299     if (!impl())
    300         return;
    301 
    302     impl()->setAttribute(WebCore::HTMLNames::customContentURLAttrAttr, newReflectedURLAttr);
     176int WebDOMTestObj::attrWithException() const
     177{
     178    if (!impl())
     179        return 0;
     180
     181    return impl()->attrWithException();
     182}
     183
     184void WebDOMTestObj::setAttrWithException(int newAttrWithException)
     185{
     186    if (!impl())
     187        return;
     188
     189    impl()->setAttrWithException(newAttrWithException);
     190}
     191
     192int WebDOMTestObj::attrWithSetterException() const
     193{
     194    if (!impl())
     195        return 0;
     196
     197    WebCore::ExceptionCode ec = 0;
     198    int result = impl()->attrWithSetterException(ec);
     199    webDOMRaiseError(static_cast<WebDOMExceptionCode>(ec));
     200    return result;
     201}
     202
     203void WebDOMTestObj::setAttrWithSetterException(int newAttrWithSetterException)
     204{
     205    if (!impl())
     206        return;
     207
     208    WebCore::ExceptionCode ec = 0;
     209    impl()->setAttrWithSetterException(newAttrWithSetterException, ec);
     210    webDOMRaiseError(static_cast<WebDOMExceptionCode>(ec));
    303211}
    304212
    … …  
    308216        return 0;
    309217
    310     WebCore::ExceptionCode ec = 0;
    311     int result = impl()->attrWithGetterException(ec);
    312     webDOMRaiseError(static_cast<WebDOMExceptionCode>(ec));
    313     return result;
     218    return impl()->attrWithGetterException();
    314219}
    315220
    … …  
    321226    WebCore::ExceptionCode ec = 0;
    322227    impl()->setAttrWithGetterException(newAttrWithGetterException, ec);
    323     webDOMRaiseError(static_cast<WebDOMExceptionCode>(ec));
    324 }
    325 
    326 int WebDOMTestObj::attrWithSetterException() const
    327 {
    328     if (!impl())
    329         return 0;
    330 
    331     return impl()->attrWithSetterException();
    332 }
    333 
    334 void WebDOMTestObj::setAttrWithSetterException(int newAttrWithSetterException)
    335 {
    336     if (!impl())
    337         return;
    338 
    339     WebCore::ExceptionCode ec = 0;
    340     impl()->setAttrWithSetterException(newAttrWithSetterException, ec);
    341     webDOMRaiseError(static_cast<WebDOMExceptionCode>(ec));
    342 }
    343 
    344 WebDOMString WebDOMTestObj::stringAttrWithGetterException() const
    345 {
    346     if (!impl())
    347         return WebDOMString();
    348 
    349     WebCore::ExceptionCode ec = 0;
    350     WebDOMString result = impl()->stringAttrWithGetterException(ec);
    351     webDOMRaiseError(static_cast<WebDOMExceptionCode>(ec));
    352     return static_cast<const WebCore::String&>(result);
    353 }
    354 
    355 void WebDOMTestObj::setStringAttrWithGetterException(const WebDOMString& newStringAttrWithGetterException)
    356 {
    357     if (!impl())
    358         return;
    359 
    360     WebCore::ExceptionCode ec = 0;
    361     impl()->setStringAttrWithGetterException(newStringAttrWithGetterException, ec);
    362     webDOMRaiseError(static_cast<WebDOMExceptionCode>(ec));
    363 }
    364 
    365 WebDOMString WebDOMTestObj::stringAttrWithSetterException() const
    366 {
    367     if (!impl())
    368         return WebDOMString();
    369 
    370     return static_cast<const WebCore::String&>(impl()->stringAttrWithSetterException());
    371 }
    372 
    373 void WebDOMTestObj::setStringAttrWithSetterException(const WebDOMString& newStringAttrWithSetterException)
    374 {
    375     if (!impl())
    376         return;
    377 
    378     WebCore::ExceptionCode ec = 0;
    379     impl()->setStringAttrWithSetterException(newStringAttrWithSetterException, ec);
    380228    webDOMRaiseError(static_cast<WebDOMExceptionCode>(ec));
    381229}

  • trunk/WebCore/bindings/scripts/test/CPP/WebDOMTestObj.h

    r61379 r61384  
    5555    WebDOMTestObj testObjAttr() const;
    5656    void setTestObjAttr(const WebDOMTestObj&);
    57     WebDOMString reflectedStringAttr() const;
    58     void setReflectedStringAttr(const WebDOMString&);
    59     int reflectedIntegralAttr() const;
    60     void setReflectedIntegralAttr(int);
    61     bool reflectedBooleanAttr() const;
    62     void setReflectedBooleanAttr(bool);
    63     WebDOMString reflectedURLAttr() const;
    64     void setReflectedURLAttr(const WebDOMString&);
    65     WebDOMString reflectedStringAttr() const;
    66     void setReflectedStringAttr(const WebDOMString&);
    67     int reflectedCustomIntegralAttr() const;
    68     void setReflectedCustomIntegralAttr(int);
    69     bool reflectedCustomBooleanAttr() const;
    70     void setReflectedCustomBooleanAttr(bool);
    71     WebDOMString reflectedURLAttr() const;
    72     void setReflectedURLAttr(const WebDOMString&);
     57    int attrWithException() const;
     58    void setAttrWithException(int);
     59    int attrWithSetterException() const;
     60    void setAttrWithSetterException(int);
    7361    int attrWithGetterException() const;
    7462    void setAttrWithGetterException(int);
    75     int attrWithSetterException() const;
    76     void setAttrWithSetterException(int);
    77     WebDOMString stringAttrWithGetterException() const;
    78     void setStringAttrWithGetterException(const WebDOMString&);
    79     WebDOMString stringAttrWithSetterException() const;
    80     void setStringAttrWithSetterException(const WebDOMString&);
    8163    int customAttr() const;
    8264    void setCustomAttr(int);

  • trunk/WebCore/bindings/scripts/test/GObject/WebKitDOMTestCallback.cpp

    r61379 r61384  
    5858webkit_dom_test_callback_callback_with_class1param(WebKitDOMTestCallback* self, WebKitDOMClass1*  class1param)
    5959{
    60     g_return_val_if_fail(self, 0);
     60    g_return_val_if_fail (self, 0);
    6161    WebCore::TestCallback * item = WebKit::core(self);
    62     g_return_val_if_fail(class1param, 0);
    63     WebCore::Class1 * converted_class1param = WebKit::core(class1param);
    64     g_return_val_if_fail(converted_class1param, 0);
    65     gboolean res = item->callbackWithClass1Param(converted_class1param);
     62    g_return_val_if_fail (class1param, 0);
     63    WebCore::Class1 * _g_class1param = WebKit::core(class1param);
     64    g_return_val_if_fail (_g_class1param, 0);
     65    gboolean res = item->callbackWithClass1Param(_g_class1param);
    6666    return res;
    6767}
    … …  
    7070webkit_dom_test_callback_callback_with_class2param(WebKitDOMTestCallback* self, WebKitDOMClass2*  class2param, gchar*  str_arg)
    7171{
    72     g_return_val_if_fail(self, 0);
     72    g_return_val_if_fail (self, 0);
    7373    WebCore::TestCallback * item = WebKit::core(self);
    74     g_return_val_if_fail(class2param, 0);
    75     g_return_val_if_fail(str_arg, 0);
    76     WebCore::Class2 * converted_class2param = WebKit::core(class2param);
    77     g_return_val_if_fail(converted_class2param, 0);
    78     WebCore::String converted_str_arg = WebCore::String::fromUTF8(str_arg);
    79     gboolean res = item->callbackWithClass2Param(converted_class2param, converted_str_arg);
     74    g_return_val_if_fail (class2param, 0);
     75    g_return_val_if_fail (str_arg, 0);
     76    WebCore::Class2 * _g_class2param = WebKit::core(class2param);
     77    g_return_val_if_fail (_g_class2param, 0);
     78    WebCore::String _g_str_arg = WebCore::String::fromUTF8(str_arg);
     79    gboolean res = item->callbackWithClass2Param(_g_class2param, _g_str_arg);
    8080    return res;
    8181}
    … …  
    8484webkit_dom_test_callback_callback_with_non_bool_return_type(WebKitDOMTestCallback* self, WebKitDOMClass3*  class3param)
    8585{
    86     g_return_val_if_fail(self, 0);
     86    g_return_val_if_fail (self, 0);
    8787    WebCore::TestCallback * item = WebKit::core(self);
    88     g_return_val_if_fail(class3param, 0);
    89     WebCore::Class3 * converted_class3param = WebKit::core(class3param);
    90     g_return_val_if_fail(converted_class3param, 0);
    91     glong res = item->callbackWithNonBoolReturnType(converted_class3param);
     88    g_return_val_if_fail (class3param, 0);
     89    WebCore::Class3 * _g_class3param = WebKit::core(class3param);
     90    g_return_val_if_fail (_g_class3param, 0);
     91    glong res = item->callbackWithNonBoolReturnType(_g_class3param);
    9292    return res;
    9393}

  • trunk/WebCore/bindings/scripts/test/GObject/WebKitDOMTestObj.cpp

    r61379 r61384  
    2525#include <wtf/RefPtr.h>
    2626#include "ExceptionCode.h"
    27 #include "HTMLNames.h"
    2827#include "TestObj.h"
    2928#include "WebKitDOMBinding.h"
    … …  
    5352webkit_dom_test_obj_void_method(WebKitDOMTestObj* self)
    5453{
    55     g_return_if_fail(self);
     54    g_return_if_fail (self);
    5655    WebCore::TestObj * item = WebKit::core(self);
    5756    item->voidMethod();
    … …  
    6160webkit_dom_test_obj_void_method_with_args(WebKitDOMTestObj* self, glong int_arg, gchar*  str_arg, WebKitDOMTestObj*  obj_arg)
    6261{
    63     g_return_if_fail(self);
    64     WebCore::TestObj * item = WebKit::core(self);
    65     g_return_if_fail(str_arg);
    66     g_return_if_fail(obj_arg);
    67     WebCore::String converted_str_arg = WebCore::String::fromUTF8(str_arg);
    68     WebCore::TestObj * converted_obj_arg = WebKit::core(obj_arg);
    69     g_return_if_fail(converted_obj_arg);
    70     item->voidMethodWithArgs(int_arg, converted_str_arg, converted_obj_arg);
     62    g_return_if_fail (self);
     63    WebCore::TestObj * item = WebKit::core(self);
     64    g_return_if_fail (str_arg);
     65    g_return_if_fail (obj_arg);
     66    WebCore::String _g_str_arg = WebCore::String::fromUTF8(str_arg);
     67    WebCore::TestObj * _g_obj_arg = WebKit::core(obj_arg);
     68    g_return_if_fail (_g_obj_arg);
     69    item->voidMethodWithArgs(int_arg, _g_str_arg, _g_obj_arg);
    7170}
    7271
    … …  
    7473webkit_dom_test_obj_int_method(WebKitDOMTestObj* self)
    7574{
    76     g_return_val_if_fail(self, 0);
     75    g_return_val_if_fail (self, 0);
    7776    WebCore::TestObj * item = WebKit::core(self);
    7877    glong res = item->intMethod();
    … …  
    8382webkit_dom_test_obj_int_method_with_args(WebKitDOMTestObj* self, glong int_arg, gchar*  str_arg, WebKitDOMTestObj*  obj_arg)
    8483{
    85     g_return_val_if_fail(self, 0);
    86     WebCore::TestObj * item = WebKit::core(self);
    87     g_return_val_if_fail(str_arg, 0);
    88     g_return_val_if_fail(obj_arg, 0);
    89     WebCore::String converted_str_arg = WebCore::String::fromUTF8(str_arg);
    90     WebCore::TestObj * converted_obj_arg = WebKit::core(obj_arg);
    91     g_return_val_if_fail(converted_obj_arg, 0);
    92     glong res = item->intMethodWithArgs(int_arg, converted_str_arg, converted_obj_arg);
     84    g_return_val_if_fail (self, 0);
     85    WebCore::TestObj * item = WebKit::core(self);
     86    g_return_val_if_fail (str_arg, 0);
     87    g_return_val_if_fail (obj_arg, 0);
     88    WebCore::String _g_str_arg = WebCore::String::fromUTF8(str_arg);
     89    WebCore::TestObj * _g_obj_arg = WebKit::core(obj_arg);
     90    g_return_val_if_fail (_g_obj_arg, 0);
     91    glong res = item->intMethodWithArgs(int_arg, _g_str_arg, _g_obj_arg);
    9392    return res;
    9493}
    … …  
    9796webkit_dom_test_obj_obj_method(WebKitDOMTestObj* self)
    9897{
    99     g_return_val_if_fail(self, 0);
     98    g_return_val_if_fail (self, 0);
    10099    WebCore::TestObj * item = WebKit::core(self);
    101100    PassRefPtr<WebCore::TestObj> g_res = WTF::getPtr(item->objMethod());
    … …  
    107106webkit_dom_test_obj_obj_method_with_args(WebKitDOMTestObj* self, glong int_arg, gchar*  str_arg, WebKitDOMTestObj*  obj_arg)
    108107{
    109     g_return_val_if_fail(self, 0);
    110     WebCore::TestObj * item = WebKit::core(self);
    111     g_return_val_if_fail(str_arg, 0);
    112     g_return_val_if_fail(obj_arg, 0);
    113     WebCore::String converted_str_arg = WebCore::String::fromUTF8(str_arg);
    114     WebCore::TestObj * converted_obj_arg = WebKit::core(obj_arg);
    115     g_return_val_if_fail(converted_obj_arg, 0);
    116     PassRefPtr<WebCore::TestObj> g_res = WTF::getPtr(item->objMethodWithArgs(int_arg, converted_str_arg, converted_obj_arg));
     108    g_return_val_if_fail (self, 0);
     109    WebCore::TestObj * item = WebKit::core(self);
     110    g_return_val_if_fail (str_arg, 0);
     111    g_return_val_if_fail (obj_arg, 0);
     112    WebCore::String _g_str_arg = WebCore::String::fromUTF8(str_arg);
     113    WebCore::TestObj * _g_obj_arg = WebKit::core(obj_arg);
     114    g_return_val_if_fail (_g_obj_arg, 0);
     115    PassRefPtr<WebCore::TestObj> g_res = WTF::getPtr(item->objMethodWithArgs(int_arg, _g_str_arg, _g_obj_arg));
    117116    WebKitDOMTestObj*  res = static_cast<WebKitDOMTestObj* >(WebKit::kit(g_res.get()));
    118117    return res;
    … …  
    122121webkit_dom_test_obj_method_that_requires_all_args(WebKitDOMTestObj* self, gchar*  str_arg, WebKitDOMTestObj*  obj_arg)
    123122{
    124     g_return_val_if_fail(self, 0);
    125     WebCore::TestObj * item = WebKit::core(self);
    126     g_return_val_if_fail(str_arg, 0);
    127     g_return_val_if_fail(obj_arg, 0);
    128     WebCore::String converted_str_arg = WebCore::String::fromUTF8(str_arg);
    129     WebCore::TestObj * converted_obj_arg = WebKit::core(obj_arg);
    130     g_return_val_if_fail(converted_obj_arg, 0);
    131     PassRefPtr<WebCore::TestObj> g_res = WTF::getPtr(item->methodThatRequiresAllArgs(converted_str_arg, converted_obj_arg));
     123    g_return_val_if_fail (self, 0);
     124    WebCore::TestObj * item = WebKit::core(self);
     125    g_return_val_if_fail (str_arg, 0);
     126    g_return_val_if_fail (obj_arg, 0);
     127    WebCore::String _g_str_arg = WebCore::String::fromUTF8(str_arg);
     128    WebCore::TestObj * _g_obj_arg = WebKit::core(obj_arg);
     129    g_return_val_if_fail (_g_obj_arg, 0);
     130    PassRefPtr<WebCore::TestObj> g_res = WTF::getPtr(item->methodThatRequiresAllArgs(_g_str_arg, _g_obj_arg));
    132131    WebKitDOMTestObj*  res = static_cast<WebKitDOMTestObj* >(WebKit::kit(g_res.get()));
    133132    return res;
    … …  
    137136webkit_dom_test_obj_method_that_requires_all_args_and_throws(WebKitDOMTestObj* self, gchar*  str_arg, WebKitDOMTestObj*  obj_arg, GError **error)
    138137{
    139     g_return_val_if_fail(self, 0);
    140     WebCore::TestObj * item = WebKit::core(self);
    141     g_return_val_if_fail(str_arg, 0);
    142     g_return_val_if_fail(obj_arg, 0);
    143     WebCore::String converted_str_arg = WebCore::String::fromUTF8(str_arg);
    144     WebCore::TestObj * converted_obj_arg = WebKit::core(obj_arg);
    145     g_return_val_if_fail(converted_obj_arg, 0);
     138    g_return_val_if_fail (self, 0);
     139    WebCore::TestObj * item = WebKit::core(self);
     140    g_return_val_if_fail (str_arg, 0);
     141    g_return_val_if_fail (obj_arg, 0);
     142    WebCore::String _g_str_arg = WebCore::String::fromUTF8(str_arg);
     143    WebCore::TestObj * _g_obj_arg = WebKit::core(obj_arg);
     144    g_return_val_if_fail (_g_obj_arg, 0);
    146145    WebCore::ExceptionCode ec = 0;
    147     PassRefPtr<WebCore::TestObj> g_res = WTF::getPtr(item->methodThatRequiresAllArgsAndThrows(converted_str_arg, converted_obj_arg, ec));
     146    PassRefPtr<WebCore::TestObj> g_res = WTF::getPtr(item->methodThatRequiresAllArgsAndThrows(_g_str_arg, _g_obj_arg, ec));
    148147    if (ec) {
    149148        WebCore::ExceptionCodeDescription ecdesc;
    … …  
    158157webkit_dom_test_obj_serialized_value(WebKitDOMTestObj* self, WebKitDOMSerializedScriptValue*  serialized_arg)
    159158{
    160     g_return_if_fail(self);
    161     WebCore::TestObj * item = WebKit::core(self);
    162     g_return_if_fail(serialized_arg);
    163     WebCore::SerializedScriptValue * converted_serialized_arg = WebKit::core(serialized_arg);
    164     g_return_if_fail(converted_serialized_arg);
    165     item->serializedValue(converted_serialized_arg);
     159    g_return_if_fail (self);
     160    WebCore::TestObj * item = WebKit::core(self);
     161    g_return_if_fail (serialized_arg);
     162    WebCore::SerializedScriptValue * _g_serialized_arg = WebKit::core(serialized_arg);
     163    g_return_if_fail (_g_serialized_arg);
     164    item->serializedValue(_g_serialized_arg);
    166165}
    167166
    … …  
    169168webkit_dom_test_obj_method_with_exception(WebKitDOMTestObj* self, GError **error)
    170169{
    171     g_return_if_fail(self);
     170    g_return_if_fail (self);
    172171    WebCore::TestObj * item = WebKit::core(self);
    173172    WebCore::ExceptionCode ec = 0;
    … …  
    189188webkit_dom_test_obj_with_dynamic_frame(WebKitDOMTestObj* self)
    190189{
    191     g_return_if_fail(self);
     190    g_return_if_fail (self);
    192191    WebCore::TestObj * item = WebKit::core(self);
    193192    item->withDynamicFrame();
    … …  
    197196webkit_dom_test_obj_with_dynamic_frame_and_arg(WebKitDOMTestObj* self, glong int_arg)
    198197{
    199     g_return_if_fail(self);
     198    g_return_if_fail (self);
    200199    WebCore::TestObj * item = WebKit::core(self);
    201200    item->withDynamicFrameAndArg(int_arg);
    … …  
    205204webkit_dom_test_obj_with_dynamic_frame_and_optional_arg(WebKitDOMTestObj* self, glong int_arg, glong optional_arg)
    206205{
    207     g_return_if_fail(self);
     206    g_return_if_fail (self);
    208207    WebCore::TestObj * item = WebKit::core(self);
    209208    item->withDynamicFrameAndOptionalArg(int_arg, optional_arg);
    … …  
    213212webkit_dom_test_obj_with_dynamic_frame_and_user_gesture(WebKitDOMTestObj* self, glong int_arg)
    214213{
    215     g_return_if_fail(self);
     214    g_return_if_fail (self);
    216215    WebCore::TestObj * item = WebKit::core(self);
    217216    item->withDynamicFrameAndUserGesture(int_arg);
    … …  
    221220webkit_dom_test_obj_with_dynamic_frame_and_user_gesture_asad(WebKitDOMTestObj* self, glong int_arg, glong optional_arg)
    222221{
    223     g_return_if_fail(self);
     222    g_return_if_fail (self);
    224223    WebCore::TestObj * item = WebKit::core(self);
    225224    item->withDynamicFrameAndUserGestureASAD(int_arg, optional_arg);
    … …  
    229228webkit_dom_test_obj_with_script_state_void(WebKitDOMTestObj* self)
    230229{
    231     g_return_if_fail(self);
     230    g_return_if_fail (self);
    232231    WebCore::TestObj * item = WebKit::core(self);
    233232    item->withScriptStateVoid();
    … …  
    237236webkit_dom_test_obj_with_script_state_obj(WebKitDOMTestObj* self)
    238237{
    239     g_return_val_if_fail(self, 0);
     238    g_return_val_if_fail (self, 0);
    240239    WebCore::TestObj * item = WebKit::core(self);
    241240    PassRefPtr<WebCore::TestObj> g_res = WTF::getPtr(item->withScriptStateObj());
    … …  
    247246webkit_dom_test_obj_with_script_state_void_exception(WebKitDOMTestObj* self, GError **error)
    248247{
    249     g_return_if_fail(self);
     248    g_return_if_fail (self);
    250249    WebCore::TestObj * item = WebKit::core(self);
    251250    WebCore::ExceptionCode ec = 0;
    … …  
    261260webkit_dom_test_obj_with_script_state_obj_exception(WebKitDOMTestObj* self, GError **error)
    262261{
    263     g_return_val_if_fail(self, 0);
     262    g_return_val_if_fail (self, 0);
    264263    WebCore::TestObj * item = WebKit::core(self);
    265264    WebCore::ExceptionCode ec = 0;
    … …  
    277276webkit_dom_test_obj_with_script_execution_context(WebKitDOMTestObj* self)
    278277{
    279     g_return_if_fail(self);
     278    g_return_if_fail (self);
    280279    WebCore::TestObj * item = WebKit::core(self);
    281280    item->withScriptExecutionContext();
    … …  
    285284webkit_dom_test_obj_method_with_optional_arg(WebKitDOMTestObj* self, glong opt)
    286285{
    287     g_return_if_fail(self);
     286    g_return_if_fail (self);
    288287    WebCore::TestObj * item = WebKit::core(self);
    289288    item->methodWithOptionalArg(opt);
    … …  
    293292webkit_dom_test_obj_method_with_non_optional_arg_and_optional_arg(WebKitDOMTestObj* self, glong non_opt, glong opt)
    294293{
    295     g_return_if_fail(self);
     294    g_return_if_fail (self);
    296295    WebCore::TestObj * item = WebKit::core(self);
    297296    item->methodWithNonOptionalArgAndOptionalArg(non_opt, opt);
    … …  
    301300webkit_dom_test_obj_method_with_non_optional_arg_and_two_optional_args(WebKitDOMTestObj* self, glong non_opt, glong opt1, glong opt2)
    302301{
    303     g_return_if_fail(self);
     302    g_return_if_fail (self);
    304303    WebCore::TestObj * item = WebKit::core(self);
    305304    item->methodWithNonOptionalArgAndTwoOptionalArgs(non_opt, opt1, opt2);
    … …  
    309308webkit_dom_test_obj_get_read_only_int_attr(WebKitDOMTestObj* self)
    310309{
    311     g_return_val_if_fail(self, 0);
     310    g_return_val_if_fail (self, 0);
    312311    WebCore::TestObj * item = WebKit::core(self);
    313312    glong res = item->readOnlyIntAttr();
    … …  
    318317webkit_dom_test_obj_get_read_only_string_attr(WebKitDOMTestObj* self)
    319318{
    320     g_return_val_if_fail(self, 0);
     319    g_return_val_if_fail (self, 0);
    321320    WebCore::TestObj * item = WebKit::core(self);
    322321    gchar*  res = convertToUTF8String(item->readOnlyStringAttr());
    … …  
    327326webkit_dom_test_obj_get_read_only_test_obj_attr(WebKitDOMTestObj* self)
    328327{
    329     g_return_val_if_fail(self, 0);
     328    g_return_val_if_fail (self, 0);
    330329    WebCore::TestObj * item = WebKit::core(self);
    331330    PassRefPtr<WebCore::TestObj> g_res = WTF::getPtr(item->readOnlyTestObjAttr());
    … …  
    337336webkit_dom_test_obj_get_int_attr(WebKitDOMTestObj* self)
    338337{
    339     g_return_val_if_fail(self, 0);
     338    g_return_val_if_fail (self, 0);
    340339    WebCore::TestObj * item = WebKit::core(self);
    341340    glong res = item->intAttr();
    … …  
    346345webkit_dom_test_obj_set_int_attr(WebKitDOMTestObj* self, glong value)
    347346{
    348     g_return_if_fail(self);
     347    g_return_if_fail (self);
    349348    WebCore::TestObj * item = WebKit::core(self);
    350349    item->setIntAttr(value);
    … …  
    354353webkit_dom_test_obj_get_long_long_attr(WebKitDOMTestObj* self)
    355354{
    356     g_return_val_if_fail(self, 0);
     355    g_return_val_if_fail (self, 0);
    357356    WebCore::TestObj * item = WebKit::core(self);
    358357    gint64 res = item->longLongAttr();
    … …  
    363362webkit_dom_test_obj_set_long_long_attr(WebKitDOMTestObj* self, gint64 value)
    364363{
    365     g_return_if_fail(self);
     364    g_return_if_fail (self);
    366365    WebCore::TestObj * item = WebKit::core(self);
    367366    item->setLongLongAttr(value);
    … …  
    371370webkit_dom_test_obj_get_unsigned_long_long_attr(WebKitDOMTestObj* self)
    372371{
    373     g_return_val_if_fail(self, 0);
     372    g_return_val_if_fail (self, 0);
    374373    WebCore::TestObj * item = WebKit::core(self);
    375374    guint64 res = item->unsignedLongLongAttr();
    … …  
    380379webkit_dom_test_obj_set_unsigned_long_long_attr(WebKitDOMTestObj* self, guint64 value)
    381380{
    382     g_return_if_fail(self);
     381    g_return_if_fail (self);
    383382    WebCore::TestObj * item = WebKit::core(self);
    384383    item->setUnsignedLongLongAttr(value);
    … …  
    388387webkit_dom_test_obj_get_string_attr(WebKitDOMTestObj* self)
    389388{
    390     g_return_val_if_fail(self, 0);
     389    g_return_val_if_fail (self, 0);
    391390    WebCore::TestObj * item = WebKit::core(self);
    392391    gchar*  res = convertToUTF8String(item->stringAttr());
    … …  
    397396webkit_dom_test_obj_set_string_attr(WebKitDOMTestObj* self, gchar*  value)
    398397{
    399     g_return_if_fail(self);
    400     WebCore::TestObj * item = WebKit::core(self);
    401     g_return_if_fail(value);
    402     WebCore::String converted_value = WebCore::String::fromUTF8(value);
    403     item->setStringAttr(converted_value);
     398    g_return_if_fail (self);
     399    WebCore::TestObj * item = WebKit::core(self);
     400    g_return_if_fail (value);
     401    WebCore::String _g_value = WebCore::String::fromUTF8(value);
     402    item->setStringAttr(_g_value);
    404403}
    405404
    … …  
    407406webkit_dom_test_obj_get_test_obj_attr(WebKitDOMTestObj* self)
    408407{
    409     g_return_val_if_fail(self, 0);
     408    g_return_val_if_fail (self, 0);
    410409    WebCore::TestObj * item = WebKit::core(self);
    411410    PassRefPtr<WebCore::TestObj> g_res = WTF::getPtr(item->testObjAttr());
    … …  
    417416webkit_dom_test_obj_set_test_obj_attr(WebKitDOMTestObj* self, WebKitDOMTestObj*  value)
    418417{
    419     g_return_if_fail(self);
    420     WebCore::TestObj * item = WebKit::core(self);
    421     g_return_if_fail(value);
    422     WebCore::TestObj * converted_value = WebKit::core(value);
    423     g_return_if_fail(converted_value);
    424     item->setTestObjAttr(converted_value);
    425 }
    426 
    427 gchar*
    428 webkit_dom_test_obj_get_reflected_string_attr(WebKitDOMTestObj* self)
    429 {
    430     g_return_val_if_fail(self, 0);
    431     WebCore::TestObj * item = WebKit::core(self);
    432     gchar*  res = convertToUTF8String(item->getAttribute(WebCore::HTMLNames::reflectedstringattrAttr));
    433     return res;
    434 }
    435 
    436 void
    437 webkit_dom_test_obj_set_reflected_string_attr(WebKitDOMTestObj* self, gchar*  value)
    438 {
    439     g_return_if_fail(self);
    440     WebCore::TestObj * item = WebKit::core(self);
    441     g_return_if_fail(value);
    442     WebCore::String converted_value = WebCore::String::fromUTF8(value);
    443     item->setAttribute(WebCore::HTMLNames::reflectedstringattrAttr, converted_value);
    444 }
    445 
    446 glong
    447 webkit_dom_test_obj_get_reflected_integral_attr(WebKitDOMTestObj* self)
    448 {
    449     g_return_val_if_fail(self, 0);
    450     WebCore::TestObj * item = WebKit::core(self);
    451     glong res = item->getIntegralAttribute(WebCore::HTMLNames::reflectedintegralattrAttr);
    452     return res;
    453 }
    454 
    455 void
    456 webkit_dom_test_obj_set_reflected_integral_attr(WebKitDOMTestObj* self, glong value)
    457 {
    458     g_return_if_fail(self);
    459     WebCore::TestObj * item = WebKit::core(self);
    460     item->setAttribute(WebCore::HTMLNames::reflectedintegralattrAttr, value);
    461 }
    462 
    463 gboolean
    464 webkit_dom_test_obj_get_reflected_boolean_attr(WebKitDOMTestObj* self)
    465 {
    466     g_return_val_if_fail(self, 0);
    467     WebCore::TestObj * item = WebKit::core(self);
    468     gboolean res = item->hasAttribute(WebCore::HTMLNames::reflectedbooleanattrAttr);
    469     return res;
    470 }
    471 
    472 void
    473 webkit_dom_test_obj_set_reflected_boolean_attr(WebKitDOMTestObj* self, gboolean value)
    474 {
    475     g_return_if_fail(self);
    476     WebCore::TestObj * item = WebKit::core(self);
    477     item->setAttribute(WebCore::HTMLNames::reflectedbooleanattrAttr, value);
    478 }
    479 
    480 gchar*
    481 webkit_dom_test_obj_get_reflected_url_attr(WebKitDOMTestObj* self)
    482 {
    483     g_return_val_if_fail(self, 0);
    484     WebCore::TestObj * item = WebKit::core(self);
    485     gchar*  res = convertToUTF8String(item->getURLAttribute(WebCore::HTMLNames::reflectedurlattrAttr));
    486     return res;
    487 }
    488 
    489 void
    490 webkit_dom_test_obj_set_reflected_url_attr(WebKitDOMTestObj* self, gchar*  value)
    491 {
    492     g_return_if_fail(self);
    493     WebCore::TestObj * item = WebKit::core(self);
    494     g_return_if_fail(value);
    495     WebCore::String converted_value = WebCore::String::fromUTF8(value);
    496     item->setAttribute(WebCore::HTMLNames::reflectedurlattrAttr, converted_value);
    497 }
    498 
    499 gchar*
    500 webkit_dom_test_obj_get_reflected_string_attr(WebKitDOMTestObj* self)
    501 {
    502     g_return_val_if_fail(self, 0);
    503     WebCore::TestObj * item = WebKit::core(self);
    504     gchar*  res = convertToUTF8String(item->getAttribute(WebCore::HTMLNames::customContentStringAttrAttr));
    505     return res;
    506 }
    507 
    508 void
    509 webkit_dom_test_obj_set_reflected_string_attr(WebKitDOMTestObj* self, gchar*  value)
    510 {
    511     g_return_if_fail(self);
    512     WebCore::TestObj * item = WebKit::core(self);
    513     g_return_if_fail(value);
    514     WebCore::String converted_value = WebCore::String::fromUTF8(value);
    515     item->setAttribute(WebCore::HTMLNames::customContentStringAttrAttr, converted_value);
    516 }
    517 
    518 glong
    519 webkit_dom_test_obj_get_reflected_custom_integral_attr(WebKitDOMTestObj* self)
    520 {
    521     g_return_val_if_fail(self, 0);
    522     WebCore::TestObj * item = WebKit::core(self);
    523     glong res = item->getIntegralAttribute(WebCore::HTMLNames::customContentIntegralAttrAttr);
    524     return res;
    525 }
    526 
    527 void
    528 webkit_dom_test_obj_set_reflected_custom_integral_attr(WebKitDOMTestObj* self, glong value)
    529 {
    530     g_return_if_fail(self);
    531     WebCore::TestObj * item = WebKit::core(self);
    532     item->setAttribute(WebCore::HTMLNames::customContentIntegralAttrAttr, value);
    533 }
    534 
    535 gboolean
    536 webkit_dom_test_obj_get_reflected_custom_boolean_attr(WebKitDOMTestObj* self)
    537 {
    538     g_return_val_if_fail(self, 0);
    539     WebCore::TestObj * item = WebKit::core(self);
    540     gboolean res = item->hasAttribute(WebCore::HTMLNames::customContentBooleanAttrAttr);
    541     return res;
    542 }
    543 
    544 void
    545 webkit_dom_test_obj_set_reflected_custom_boolean_attr(WebKitDOMTestObj* self, gboolean value)
    546 {
    547     g_return_if_fail(self);
    548     WebCore::TestObj * item = WebKit::core(self);
    549     item->setAttribute(WebCore::HTMLNames::customContentBooleanAttrAttr, value);
    550 }
    551 
    552 gchar*
    553 webkit_dom_test_obj_get_reflected_url_attr(WebKitDOMTestObj* self)
    554 {
    555     g_return_val_if_fail(self, 0);
    556     WebCore::TestObj * item = WebKit::core(self);
    557     gchar*  res = convertToUTF8String(item->getURLAttribute(WebCore::HTMLNames::customContentURLAttrAttr));
    558     return res;
    559 }
    560 
    561 void
    562 webkit_dom_test_obj_set_reflected_url_attr(WebKitDOMTestObj* self, gchar*  value)
    563 {
    564     g_return_if_fail(self);
    565     WebCore::TestObj * item = WebKit::core(self);
    566     g_return_if_fail(value);
    567     WebCore::String converted_value = WebCore::String::fromUTF8(value);
    568     item->setAttribute(WebCore::HTMLNames::customContentURLAttrAttr, converted_value);
    569 }
    570 
    571 glong
    572 webkit_dom_test_obj_get_attr_with_getter_exception(WebKitDOMTestObj* self, GError **error)
    573 {
    574     g_return_val_if_fail(self, 0);
     418    g_return_if_fail (self);
     419    WebCore::TestObj * item = WebKit::core(self);
     420    g_return_if_fail (value);
     421    WebCore::TestObj * _g_value = WebKit::core(value);
     422    g_return_if_fail (_g_value);
     423    item->setTestObjAttr(_g_value);
     424}
     425
     426glong
     427webkit_dom_test_obj_get_attr_with_exception(WebKitDOMTestObj* self)
     428{
     429    g_return_val_if_fail (self, 0);
     430    WebCore::TestObj * item = WebKit::core(self);
     431    glong res = item->attrWithException();
     432    return res;
     433}
     434
     435void
     436webkit_dom_test_obj_set_attr_with_exception(WebKitDOMTestObj* self, glong value)
     437{
     438    g_return_if_fail (self);
     439    WebCore::TestObj * item = WebKit::core(self);
     440    item->setAttrWithException(value);
     441}
     442
     443glong
     444webkit_dom_test_obj_get_attr_with_setter_exception(WebKitDOMTestObj* self, GError **error)
     445{
     446    g_return_val_if_fail (self, 0);
    575447    WebCore::TestObj * item = WebKit::core(self);
    576448    WebCore::ExceptionCode ec = 0;
    577     glong res = item->attrWithGetterException(ec);
     449    glong res = item->attrWithSetterException(ec);
    578450    if (ec) {
    579451        WebCore::ExceptionCodeDescription ecdesc;
    … …  
    585457
    586458void
     459webkit_dom_test_obj_set_attr_with_setter_exception(WebKitDOMTestObj* self, glong value, GError **error)
     460{
     461    g_return_if_fail (self);
     462    WebCore::TestObj * item = WebKit::core(self);
     463    WebCore::ExceptionCode ec = 0;
     464    item->setAttrWithSetterException(value, ec);
     465    if (ec) {
     466        WebCore::ExceptionCodeDescription ecdesc;
     467        WebCore::getExceptionCodeDescription(ec, ecdesc);
     468        g_set_error_literal(error, g_quark_from_string("WEBKIT_DOM"), ecdesc.code, ecdesc.name);
     469    }
     470}
     471
     472glong
     473webkit_dom_test_obj_get_attr_with_getter_exception(WebKitDOMTestObj* self)
     474{
     475    g_return_val_if_fail (self, 0);
     476    WebCore::TestObj * item = WebKit::core(self);
     477    glong res = item->attrWithGetterException();
     478    return res;
     479}
     480
     481void
    587482webkit_dom_test_obj_set_attr_with_getter_exception(WebKitDOMTestObj* self, glong value, GError **error)
    588483{
    589     g_return_if_fail(self);
     484    g_return_if_fail (self);
    590485    WebCore::TestObj * item = WebKit::core(self);
    591486    WebCore::ExceptionCode ec = 0;
    … …  
    598493}
    599494
    600 glong
    601 webkit_dom_test_obj_get_attr_with_setter_exception(WebKitDOMTestObj* self)
    602 {
    603     g_return_val_if_fail(self, 0);
    604     WebCore::TestObj * item = WebKit::core(self);
    605     glong res = item->attrWithSetterException();
    606     return res;
    607 }
    608 
    609 void
    610 webkit_dom_test_obj_set_attr_with_setter_exception(WebKitDOMTestObj* self, glong value, GError **error)
    611 {
    612     g_return_if_fail(self);
    613     WebCore::TestObj * item = WebKit::core(self);
    614     WebCore::ExceptionCode ec = 0;
    615     item->setAttrWithSetterException(value, ec);
    616     if (ec) {
    617         WebCore::ExceptionCodeDescription ecdesc;
    618         WebCore::getExceptionCodeDescription(ec, ecdesc);
    619         g_set_error_literal(error, g_quark_from_string("WEBKIT_DOM"), ecdesc.code, ecdesc.name);
    620     }
    621 }
    622 
    623 gchar*
    624 webkit_dom_test_obj_get_string_attr_with_getter_exception(WebKitDOMTestObj* self, GError **error)
    625 {
    626     g_return_val_if_fail(self, 0);
    627     WebCore::TestObj * item = WebKit::core(self);
    628     WebCore::ExceptionCode ec = 0;
    629     gchar*  res = convertToUTF8String(item->stringAttrWithGetterException(ec));
    630     return res;
    631 }
    632 
    633 void
    634 webkit_dom_test_obj_set_string_attr_with_getter_exception(WebKitDOMTestObj* self, gchar*  value, GError **error)
    635 {
    636     g_return_if_fail(self);
    637     WebCore::TestObj * item = WebKit::core(self);
    638     g_return_if_fail(value);
    639     WebCore::String converted_value = WebCore::String::fromUTF8(value);
    640     WebCore::ExceptionCode ec = 0;
    641     item->setStringAttrWithGetterException(converted_value, ec);
    642     if (ec) {
    643         WebCore::ExceptionCodeDescription ecdesc;
    644         WebCore::getExceptionCodeDescription(ec, ecdesc);
    645         g_set_error_literal(error, g_quark_from_string("WEBKIT_DOM"), ecdesc.code, ecdesc.name);
    646     }
    647 }
    648 
    649 gchar*
    650 webkit_dom_test_obj_get_string_attr_with_setter_exception(WebKitDOMTestObj* self)
    651 {
    652     g_return_val_if_fail(self, 0);
    653     WebCore::TestObj * item = WebKit::core(self);
    654     gchar*  res = convertToUTF8String(item->stringAttrWithSetterException());
    655     return res;
    656 }
    657 
    658 void
    659 webkit_dom_test_obj_set_string_attr_with_setter_exception(WebKitDOMTestObj* self, gchar*  value, GError **error)
    660 {
    661     g_return_if_fail(self);
    662     WebCore::TestObj * item = WebKit::core(self);
    663     g_return_if_fail(value);
    664     WebCore::String converted_value = WebCore::String::fromUTF8(value);
    665     WebCore::ExceptionCode ec = 0;
    666     item->setStringAttrWithSetterException(converted_value, ec);
    667     if (ec) {
    668         WebCore::ExceptionCodeDescription ecdesc;
    669         WebCore::getExceptionCodeDescription(ec, ecdesc);
    670         g_set_error_literal(error, g_quark_from_string("WEBKIT_DOM"), ecdesc.code, ecdesc.name);
    671     }
    672 }
    673 
    674495gchar*
    675496webkit_dom_test_obj_get_script_string_attr(WebKitDOMTestObj* self)
    676497{
    677     g_return_val_if_fail(self, 0);
     498    g_return_val_if_fail (self, 0);
    678499    WebCore::TestObj * item = WebKit::core(self);
    679500    gchar*  res = convertToUTF8String(item->scriptStringAttr());
    … …  
    685506webkit_dom_test_obj_get_conditional_attr1(WebKitDOMTestObj* self)
    686507{
    687     g_return_val_if_fail(self, 0);
     508    g_return_val_if_fail (self, 0);
    688509    WebCore::TestObj * item = WebKit::core(self);
    689510    glong res = item->conditionalAttr1();
    … …  
    696517webkit_dom_test_obj_set_conditional_attr1(WebKitDOMTestObj* self, glong value)
    697518{
    698     g_return_if_fail(self);
     519    g_return_if_fail (self);
    699520    WebCore::TestObj * item = WebKit::core(self);
    700521    item->setConditionalAttr1(value);
    … …  
    706527webkit_dom_test_obj_get_conditional_attr2(WebKitDOMTestObj* self)
    707528{
    708     g_return_val_if_fail(self, 0);
     529    g_return_val_if_fail (self, 0);
    709530    WebCore::TestObj * item = WebKit::core(self);
    710531    glong res = item->conditionalAttr2();
    … …  
    717538webkit_dom_test_obj_set_conditional_attr2(WebKitDOMTestObj* self, glong value)
    718539{
    719     g_return_if_fail(self);
     540    g_return_if_fail (self);
    720541    WebCore::TestObj * item = WebKit::core(self);
    721542    item->setConditionalAttr2(value);
    … …  
    727548webkit_dom_test_obj_get_conditional_attr3(WebKitDOMTestObj* self)
    728549{
    729     g_return_val_if_fail(self, 0);
     550    g_return_val_if_fail (self, 0);
    730551    WebCore::TestObj * item = WebKit::core(self);
    731552    glong res = item->conditionalAttr3();
    … …  
    738559webkit_dom_test_obj_set_conditional_attr3(WebKitDOMTestObj* self, glong value)
    739560{
    740     g_return_if_fail(self);
     561    g_return_if_fail (self);
    741562    WebCore::TestObj * item = WebKit::core(self);
    742563    item->setConditionalAttr3(value);
    … …  
    747568webkit_dom_test_obj_get_description(WebKitDOMTestObj* self)
    748569{
    749     g_return_val_if_fail(self, 0);
     570    g_return_val_if_fail (self, 0);
    750571    WebCore::TestObj * item = WebKit::core(self);
    751572    glong res = item->description();
    … …  
    756577webkit_dom_test_obj_get_id(WebKitDOMTestObj* self)
    757578{
    758     g_return_val_if_fail(self, 0);
     579    g_return_val_if_fail (self, 0);
    759580    WebCore::TestObj * item = WebKit::core(self);
    760581    glong res = item->id();
    … …  
    765586webkit_dom_test_obj_set_id(WebKitDOMTestObj* self, glong value)
    766587{
    767     g_return_if_fail(self);
     588    g_return_if_fail (self);
    768589    WebCore::TestObj * item = WebKit::core(self);
    769590    item->setId(value);
    … …  
    773594webkit_dom_test_obj_get_hash(WebKitDOMTestObj* self)
    774595{
    775     g_return_val_if_fail(self, 0);
     596    g_return_val_if_fail (self, 0);
    776597    WebCore::TestObj * item = WebKit::core(self);
    777598    gchar*  res = convertToUTF8String(item->hash());
    … …  
    805626    PROP_STRING_ATTR,
    806627    PROP_TEST_OBJ_ATTR,
    807     PROP_REFLECTED_STRING_ATTR,
    808     PROP_REFLECTED_INTEGRAL_ATTR,
    809     PROP_REFLECTED_BOOLEAN_ATTR,
    810     PROP_REFLECTED_URL_ATTR,
    811     PROP_REFLECTED_STRING_ATTR,
    812     PROP_REFLECTED_CUSTOM_INTEGRAL_ATTR,
    813     PROP_REFLECTED_CUSTOM_BOOLEAN_ATTR,
    814     PROP_REFLECTED_URL_ATTR,
     628    PROP_ATTR_WITH_EXCEPTION,
     629    PROP_ATTR_WITH_SETTER_EXCEPTION,
    815630    PROP_ATTR_WITH_GETTER_EXCEPTION,
    816     PROP_ATTR_WITH_SETTER_EXCEPTION,
    817     PROP_STRING_ATTR_WITH_GETTER_EXCEPTION,
    818     PROP_STRING_ATTR_WITH_SETTER_EXCEPTION,
    819631    PROP_CUSTOM_ATTR,
    820632    PROP_SCRIPT_STRING_ATTR,
    … …  
    870682        break;
    871683    }
    872     case PROP_REFLECTED_STRING_ATTR:
    873     {
    874         coreSelf->setAttribute(WebCore::HTMLNames::reflectedstringattrAttr, WebCore::String::fromUTF8(g_value_get_string(value)));
    875         break;
    876     }
    877     case PROP_REFLECTED_INTEGRAL_ATTR:
    878     {
    879         coreSelf->setIntegralAttribute(WebCore::HTMLNames::reflectedintegralattrAttr, (g_value_get_long(value)));
    880         break;
    881     }
    882     case PROP_REFLECTED_BOOLEAN_ATTR:
    883     {
    884         coreSelf->setBooleanAttribute(WebCore::HTMLNames::reflectedbooleanattrAttr, (g_value_get_boolean(value)));
    885         break;
    886     }
    887     case PROP_REFLECTED_URL_ATTR:
    888     {
    889         coreSelf->setAttribute(WebCore::HTMLNames::reflectedurlattrAttr, WebCore::String::fromUTF8(g_value_get_string(value)));
    890         break;
    891     }
    892     case PROP_REFLECTED_STRING_ATTR:
    893     {
    894         coreSelf->setAttribute(WebCore::HTMLNames::customContentStringAttrAttr, WebCore::String::fromUTF8(g_value_get_string(value)));
    895         break;
    896     }
    897     case PROP_REFLECTED_CUSTOM_INTEGRAL_ATTR:
    898     {
    899         coreSelf->setIntegralAttribute(WebCore::HTMLNames::customContentIntegralAttrAttr, (g_value_get_long(value)));
    900         break;
    901     }
    902     case PROP_REFLECTED_CUSTOM_BOOLEAN_ATTR:
    903     {
    904         coreSelf->setBooleanAttribute(WebCore::HTMLNames::customContentBooleanAttrAttr, (g_value_get_boolean(value)));
    905         break;
    906     }
    907     case PROP_REFLECTED_URL_ATTR:
    908     {
    909         coreSelf->setAttribute(WebCore::HTMLNames::customContentURLAttrAttr, WebCore::String::fromUTF8(g_value_get_string(value)));
     684    case PROP_ATTR_WITH_EXCEPTION:
     685    {
     686        coreSelf->setAttrWithException((g_value_get_long(value)));
     687        break;
     688    }
     689    case PROP_ATTR_WITH_SETTER_EXCEPTION:
     690    {
     691        WebCore::ExceptionCode ec = 0;
     692        coreSelf->setAttrWithSetterException((g_value_get_long(value)), ec);
    910693        break;
    911694    }
    … …  
    914697        WebCore::ExceptionCode ec = 0;
    915698        coreSelf->setAttrWithGetterException((g_value_get_long(value)), ec);
    916         break;
    917     }
    918     case PROP_ATTR_WITH_SETTER_EXCEPTION:
    919     {
    920         WebCore::ExceptionCode ec = 0;
    921         coreSelf->setAttrWithSetterException((g_value_get_long(value)), ec);
    922         break;
    923     }
    924     case PROP_STRING_ATTR_WITH_GETTER_EXCEPTION:
    925     {
    926         WebCore::ExceptionCode ec = 0;
    927         coreSelf->setStringAttrWithGetterException(WebCore::String::fromUTF8(g_value_get_string(value)), ec);
    928         break;
    929     }
    930     case PROP_STRING_ATTR_WITH_SETTER_EXCEPTION:
    931     {
    932         WebCore::ExceptionCode ec = 0;
    933         coreSelf->setStringAttrWithSetterException(WebCore::String::fromUTF8(g_value_get_string(value)), ec);
    934699        break;
    935700    }
    … …  
    1014779        break;
    1015780    }
    1016     case PROP_REFLECTED_STRING_ATTR:
    1017     {
    1018         g_value_take_string(value, convertToUTF8String(coreSelf->getAttribute(WebCore::HTMLNames::reflectedstringattrAttr)));
    1019         break;
    1020     }
    1021     case PROP_REFLECTED_INTEGRAL_ATTR:
    1022     {
    1023         g_value_set_long(value, coreSelf->reflectedIntegralAttr());
    1024         break;
    1025     }
    1026     case PROP_REFLECTED_BOOLEAN_ATTR:
    1027     {
    1028         g_value_set_boolean(value, coreSelf->reflectedBooleanAttr());
    1029         break;
    1030     }
    1031     case PROP_REFLECTED_URL_ATTR:
    1032     {
    1033         g_value_take_string(value, convertToUTF8String(coreSelf->getURLAttribute(WebCore::HTMLNames::reflectedurlattrAttr)));
    1034         break;
    1035     }
    1036     case PROP_REFLECTED_STRING_ATTR:
    1037     {
    1038         g_value_take_string(value, convertToUTF8String(coreSelf->getAttribute(WebCore::HTMLNames::customContentStringAttrAttr)));
    1039         break;
    1040     }
    1041     case PROP_REFLECTED_CUSTOM_INTEGRAL_ATTR:
    1042     {
    1043         g_value_set_long(value, coreSelf->reflectedCustomIntegralAttr());
    1044         break;
    1045     }
    1046     case PROP_REFLECTED_CUSTOM_BOOLEAN_ATTR:
    1047     {
    1048         g_value_set_boolean(value, coreSelf->reflectedCustomBooleanAttr());
    1049         break;
    1050     }
    1051     case PROP_REFLECTED_URL_ATTR:
    1052     {
    1053         g_value_take_string(value, convertToUTF8String(coreSelf->getURLAttribute(WebCore::HTMLNames::customContentURLAttrAttr)));
     781    case PROP_ATTR_WITH_EXCEPTION:
     782    {
     783        g_value_set_long(value, coreSelf->attrWithException());
     784        break;
     785    }
     786    case PROP_ATTR_WITH_SETTER_EXCEPTION:
     787    {
     788        WebCore::ExceptionCode ec = 0;
     789        g_value_set_long(value, coreSelf->attrWithSetterException(ec));
    1054790        break;
    1055791    }
    1056792    case PROP_ATTR_WITH_GETTER_EXCEPTION:
    1057793    {
    1058         WebCore::ExceptionCode ec = 0;
    1059         g_value_set_long(value, coreSelf->attrWithGetterException(ec));
    1060         break;
    1061     }
    1062     case PROP_ATTR_WITH_SETTER_EXCEPTION:
    1063     {
    1064         g_value_set_long(value, coreSelf->attrWithSetterException());
    1065         break;
    1066     }
    1067     case PROP_STRING_ATTR_WITH_GETTER_EXCEPTION:
    1068     {
    1069         WebCore::ExceptionCode ec = 0;
    1070         g_value_take_string(value, convertToUTF8String(coreSelf->stringAttrWithGetterException(ec)));
    1071         break;
    1072     }
    1073     case PROP_STRING_ATTR_WITH_SETTER_EXCEPTION:
    1074     {
    1075         g_value_take_string(value, convertToUTF8String(coreSelf->stringAttrWithSetterException()));
     794        g_value_set_long(value, coreSelf->attrWithGetterException());
    1076795        break;
    1077796    }
    … …  
    1196915                                                           WEBKIT_PARAM_READWRITE));
    1197916    g_object_class_install_property(gobjectClass,
    1198                                     PROP_REFLECTED_STRING_ATTR,
    1199                                     g_param_spec_string("reflected-string-attr", /* name */
    1200                                                            "test_obj_reflected-string-attr", /* short description */
    1201                                                            "read-write  gchar*  TestObj.reflected-string-attr", /* longer - could do with some extra doc stuff here */
    1202                                                            "", /* default */
    1203                                                            WEBKIT_PARAM_READWRITE));
    1204     g_object_class_install_property(gobjectClass,
    1205                                     PROP_REFLECTED_INTEGRAL_ATTR,
    1206                                     g_param_spec_long("reflected-integral-attr", /* name */
    1207                                                            "test_obj_reflected-integral-attr", /* short description */
    1208                                                            "read-write  glong TestObj.reflected-integral-attr", /* longer - could do with some extra doc stuff here */
     917                                    PROP_ATTR_WITH_EXCEPTION,
     918                                    g_param_spec_long("attr-with-exception", /* name */
     919                                                           "test_obj_attr-with-exception", /* short description */
     920                                                           "read-write  glong TestObj.attr-with-exception", /* longer - could do with some extra doc stuff here */
    1209921                                                           G_MINLONG, /* min */
    1210922G_MAXLONG, /* max */
    … …  
    1212924                                                           WEBKIT_PARAM_READWRITE));
    1213925    g_object_class_install_property(gobjectClass,
    1214                                     PROP_REFLECTED_BOOLEAN_ATTR,
    1215                                     g_param_spec_boolean("reflected-boolean-attr", /* name */
    1216                                                            "test_obj_reflected-boolean-attr", /* short description */
    1217                                                            "read-write  gboolean TestObj.reflected-boolean-attr", /* longer - could do with some extra doc stuff here */
    1218                                                            FALSE, /* default */
    1219                                                            WEBKIT_PARAM_READWRITE));
    1220     g_object_class_install_property(gobjectClass,
    1221                                     PROP_REFLECTED_URL_ATTR,
    1222                                     g_param_spec_string("reflected-url-attr", /* name */
    1223                                                            "test_obj_reflected-url-attr", /* short description */
    1224                                                            "read-write  gchar*  TestObj.reflected-url-attr", /* longer - could do with some extra doc stuff here */
    1225                                                            "", /* default */
    1226                                                            WEBKIT_PARAM_READWRITE));
    1227     g_object_class_install_property(gobjectClass,
    1228                                     PROP_REFLECTED_STRING_ATTR,
    1229                                     g_param_spec_string("reflected-string-attr", /* name */
    1230                                                            "test_obj_reflected-string-attr", /* short description */
    1231                                                            "read-write  gchar*  TestObj.reflected-string-attr", /* longer - could do with some extra doc stuff here */
    1232                                                            "", /* default */
    1233                                                            WEBKIT_PARAM_READWRITE));
    1234     g_object_class_install_property(gobjectClass,
    1235                                     PROP_REFLECTED_CUSTOM_INTEGRAL_ATTR,
    1236                                     g_param_spec_long("reflected-custom-integral-attr", /* name */
    1237                                                            "test_obj_reflected-custom-integral-attr", /* short description */
    1238                                                            "read-write  glong TestObj.reflected-custom-integral-attr", /* longer - could do with some extra doc stuff here */
     926                                    PROP_ATTR_WITH_SETTER_EXCEPTION,
     927                                    g_param_spec_long("attr-with-setter-exception", /* name */
     928                                                           "test_obj_attr-with-setter-exception", /* short description */
     929                                                           "read-write  glong TestObj.attr-with-setter-exception", /* longer - could do with some extra doc stuff here */
    1239930                                                           G_MINLONG, /* min */
    1240931G_MAXLONG, /* max */
    12419320, /* default */
    1242                                                            WEBKIT_PARAM_READWRITE));
    1243     g_object_class_install_property(gobjectClass,
    1244                                     PROP_REFLECTED_CUSTOM_BOOLEAN_ATTR,
    1245                                     g_param_spec_boolean("reflected-custom-boolean-attr", /* name */
    1246                                                            "test_obj_reflected-custom-boolean-attr", /* short description */
    1247                                                            "read-write  gboolean TestObj.reflected-custom-boolean-attr", /* longer - could do with some extra doc stuff here */
    1248                                                            FALSE, /* default */
    1249                                                            WEBKIT_PARAM_READWRITE));
    1250     g_object_class_install_property(gobjectClass,
    1251                                     PROP_REFLECTED_URL_ATTR,
    1252                                     g_param_spec_string("reflected-url-attr", /* name */
    1253                                                            "test_obj_reflected-url-attr", /* short description */
    1254                                                            "read-write  gchar*  TestObj.reflected-url-attr", /* longer - could do with some extra doc stuff here */
    1255                                                            "", /* default */
    1256933                                                           WEBKIT_PARAM_READWRITE));
    1257934    g_object_class_install_property(gobjectClass,
    … …  
    1263940G_MAXLONG, /* max */
    12649410, /* default */
    1265                                                            WEBKIT_PARAM_READWRITE));
    1266     g_object_class_install_property(gobjectClass,
    1267                                     PROP_ATTR_WITH_SETTER_EXCEPTION,
    1268                                     g_param_spec_long("attr-with-setter-exception", /* name */
    1269                                                            "test_obj_attr-with-setter-exception", /* short description */
    1270                                                            "read-write  glong TestObj.attr-with-setter-exception", /* longer - could do with some extra doc stuff here */
    1271                                                            G_MINLONG, /* min */
    1272 G_MAXLONG, /* max */
    1273 0, /* default */
    1274                                                            WEBKIT_PARAM_READWRITE));
    1275     g_object_class_install_property(gobjectClass,
    1276                                     PROP_STRING_ATTR_WITH_GETTER_EXCEPTION,
    1277                                     g_param_spec_string("string-attr-with-getter-exception", /* name */
    1278                                                            "test_obj_string-attr-with-getter-exception", /* short description */
    1279                                                            "read-write  gchar*  TestObj.string-attr-with-getter-exception", /* longer - could do with some extra doc stuff here */
    1280                                                            "", /* default */
    1281                                                            WEBKIT_PARAM_READWRITE));
    1282     g_object_class_install_property(gobjectClass,
    1283                                     PROP_STRING_ATTR_WITH_SETTER_EXCEPTION,
    1284                                     g_param_spec_string("string-attr-with-setter-exception", /* name */
    1285                                                            "test_obj_string-attr-with-setter-exception", /* short description */
    1286                                                            "read-write  gchar*  TestObj.string-attr-with-setter-exception", /* longer - could do with some extra doc stuff here */
    1287                                                            "", /* default */
    1288942                                                           WEBKIT_PARAM_READWRITE));
    1289943    g_object_class_install_property(gobjectClass,

  • trunk/WebCore/bindings/scripts/test/GObject/WebKitDOMTestObj.h

    r61379 r61384  
    161161webkit_dom_test_obj_set_test_obj_attr(WebKitDOMTestObj* self, WebKitDOMTestObj*  value);
    162162
    163 WEBKIT_API gchar*
    164 webkit_dom_test_obj_get_reflected_string_attr(WebKitDOMTestObj* self);
    165 
    166 WEBKIT_API void
    167 webkit_dom_test_obj_set_reflected_string_attr(WebKitDOMTestObj* self, gchar*  value);
    168 
    169 WEBKIT_API glong
    170 webkit_dom_test_obj_get_reflected_integral_attr(WebKitDOMTestObj* self);
    171 
    172 WEBKIT_API void
    173 webkit_dom_test_obj_set_reflected_integral_attr(WebKitDOMTestObj* self, glong value);
    174 
    175 WEBKIT_API gboolean
    176 webkit_dom_test_obj_get_reflected_boolean_attr(WebKitDOMTestObj* self);
    177 
    178 WEBKIT_API void
    179 webkit_dom_test_obj_set_reflected_boolean_attr(WebKitDOMTestObj* self, gboolean value);
    180 
    181 WEBKIT_API gchar*
    182 webkit_dom_test_obj_get_reflected_url_attr(WebKitDOMTestObj* self);
    183 
    184 WEBKIT_API void
    185 webkit_dom_test_obj_set_reflected_url_attr(WebKitDOMTestObj* self, gchar*  value);
    186 
    187 WEBKIT_API gchar*
    188 webkit_dom_test_obj_get_reflected_string_attr(WebKitDOMTestObj* self);
    189 
    190 WEBKIT_API void
    191 webkit_dom_test_obj_set_reflected_string_attr(WebKitDOMTestObj* self, gchar*  value);
    192 
    193 WEBKIT_API glong
    194 webkit_dom_test_obj_get_reflected_custom_integral_attr(WebKitDOMTestObj* self);
    195 
    196 WEBKIT_API void
    197 webkit_dom_test_obj_set_reflected_custom_integral_attr(WebKitDOMTestObj* self, glong value);
    198 
    199 WEBKIT_API gboolean
    200 webkit_dom_test_obj_get_reflected_custom_boolean_attr(WebKitDOMTestObj* self);
    201 
    202 WEBKIT_API void
    203 webkit_dom_test_obj_set_reflected_custom_boolean_attr(WebKitDOMTestObj* self, gboolean value);
    204 
    205 WEBKIT_API gchar*
    206 webkit_dom_test_obj_get_reflected_url_attr(WebKitDOMTestObj* self);
    207 
    208 WEBKIT_API void
    209 webkit_dom_test_obj_set_reflected_url_attr(WebKitDOMTestObj* self, gchar*  value);
    210 
    211 WEBKIT_API glong
    212 webkit_dom_test_obj_get_attr_with_getter_exception(WebKitDOMTestObj* self, GError **error);
     163WEBKIT_API glong
     164webkit_dom_test_obj_get_attr_with_exception(WebKitDOMTestObj* self);
     165
     166WEBKIT_API void
     167webkit_dom_test_obj_set_attr_with_exception(WebKitDOMTestObj* self, glong value);
     168
     169WEBKIT_API glong
     170webkit_dom_test_obj_get_attr_with_setter_exception(WebKitDOMTestObj* self, GError **error);
     171
     172WEBKIT_API void
     173webkit_dom_test_obj_set_attr_with_setter_exception(WebKitDOMTestObj* self, glong value, GError **error);
     174
     175WEBKIT_API glong
     176webkit_dom_test_obj_get_attr_with_getter_exception(WebKitDOMTestObj* self);
    213177
    214178WEBKIT_API void
    215179webkit_dom_test_obj_set_attr_with_getter_exception(WebKitDOMTestObj* self, glong value, GError **error);
    216 
    217 WEBKIT_API glong
    218 webkit_dom_test_obj_get_attr_with_setter_exception(WebKitDOMTestObj* self);
    219 
    220 WEBKIT_API void
    221 webkit_dom_test_obj_set_attr_with_setter_exception(WebKitDOMTestObj* self, glong value, GError **error);
    222 
    223 WEBKIT_API gchar*
    224 webkit_dom_test_obj_get_string_attr_with_getter_exception(WebKitDOMTestObj* self, GError **error);
    225 
    226 WEBKIT_API void
    227 webkit_dom_test_obj_set_string_attr_with_getter_exception(WebKitDOMTestObj* self, gchar*  value, GError **error);
    228 
    229 WEBKIT_API gchar*
    230 webkit_dom_test_obj_get_string_attr_with_setter_exception(WebKitDOMTestObj* self);
    231 
    232 WEBKIT_API void
    233 webkit_dom_test_obj_set_string_attr_with_setter_exception(WebKitDOMTestObj* self, gchar*  value, GError **error);
    234180
    235181WEBKIT_API gchar*

  • trunk/WebCore/bindings/scripts/test/JS/JSTestObj.cpp

    r61379 r61384  
    2222#include "JSTestObj.h"
    2323
    24 #include "HTMLNames.h"
    2524#include "JSEventListener.h"
    2625#include "JSTestObj.h"
    … …  
    4847#endif
    4948
    50 static const HashTableValue JSTestObjTableValues[30] =
     49static const HashTableValue JSTestObjTableValues[21] =
    5150{
    5251    { "readOnlyIntAttr", DontDelete | ReadOnly, (intptr_t)static_cast<PropertySlot::GetValueFunc>(jsTestObjReadOnlyIntAttr), (intptr_t)0 THUNK_GENERATOR(0) },
    … …  
    5857    { "stringAttr", DontDelete, (intptr_t)static_cast<PropertySlot::GetValueFunc>(jsTestObjStringAttr), (intptr_t)setJSTestObjStringAttr THUNK_GENERATOR(0) },
    5958    { "testObjAttr", DontDelete, (intptr_t)static_cast<PropertySlot::GetValueFunc>(jsTestObjTestObjAttr), (intptr_t)setJSTestObjTestObjAttr THUNK_GENERATOR(0) },
    60     { "reflectedStringAttr", DontDelete, (intptr_t)static_cast<PropertySlot::GetValueFunc>(jsTestObjReflectedStringAttr), (intptr_t)setJSTestObjReflectedStringAttr THUNK_GENERATOR(0) },
    61     { "reflectedIntegralAttr", DontDelete, (intptr_t)static_cast<PropertySlot::GetValueFunc>(jsTestObjReflectedIntegralAttr), (intptr_t)setJSTestObjReflectedIntegralAttr THUNK_GENERATOR(0) },
    62     { "reflectedBooleanAttr", DontDelete, (intptr_t)static_cast<PropertySlot::GetValueFunc>(jsTestObjReflectedBooleanAttr), (intptr_t)setJSTestObjReflectedBooleanAttr THUNK_GENERATOR(0) },
    63     { "reflectedURLAttr", DontDelete, (intptr_t)static_cast<PropertySlot::GetValueFunc>(jsTestObjReflectedURLAttr), (intptr_t)setJSTestObjReflectedURLAttr THUNK_GENERATOR(0) },
    64     { "reflectedStringAttr", DontDelete, (intptr_t)static_cast<PropertySlot::GetValueFunc>(jsTestObjReflectedStringAttr), (intptr_t)setJSTestObjReflectedStringAttr THUNK_GENERATOR(0) },
    65     { "reflectedCustomIntegralAttr", DontDelete, (intptr_t)static_cast<PropertySlot::GetValueFunc>(jsTestObjReflectedCustomIntegralAttr), (intptr_t)setJSTestObjReflectedCustomIntegralAttr THUNK_GENERATOR(0) },
    66     { "reflectedCustomBooleanAttr", DontDelete, (intptr_t)static_cast<PropertySlot::GetValueFunc>(jsTestObjReflectedCustomBooleanAttr), (intptr_t)setJSTestObjReflectedCustomBooleanAttr THUNK_GENERATOR(0) },
    67     { "reflectedURLAttr", DontDelete, (intptr_t)static_cast<PropertySlot::GetValueFunc>(jsTestObjReflectedURLAttr), (intptr_t)setJSTestObjReflectedURLAttr THUNK_GENERATOR(0) },
     59    { "attrWithException", DontDelete, (intptr_t)static_cast<PropertySlot::GetValueFunc>(jsTestObjAttrWithException), (intptr_t)setJSTestObjAttrWithException THUNK_GENERATOR(0) },
     60    { "attrWithSetterException", DontDelete, (intptr_t)static_cast<PropertySlot::GetValueFunc>(jsTestObjAttrWithSetterException), (intptr_t)setJSTestObjAttrWithSetterException THUNK_GENERATOR(0) },
    6861    { "attrWithGetterException", DontDelete, (intptr_t)static_cast<PropertySlot::GetValueFunc>(jsTestObjAttrWithGetterException), (intptr_t)setJSTestObjAttrWithGetterException THUNK_GENERATOR(0) },
    69     { "attrWithSetterException", DontDelete, (intptr_t)static_cast<PropertySlot::GetValueFunc>(jsTestObjAttrWithSetterException), (intptr_t)setJSTestObjAttrWithSetterException THUNK_GENERATOR(0) },
    70     { "stringAttrWithGetterException", DontDelete, (intptr_t)static_cast<PropertySlot::GetValueFunc>(jsTestObjStringAttrWithGetterException), (intptr_t)setJSTestObjStringAttrWithGetterException THUNK_GENERATOR(0) },
    71     { "stringAttrWithSetterException", DontDelete, (intptr_t)static_cast<PropertySlot::GetValueFunc>(jsTestObjStringAttrWithSetterException), (intptr_t)setJSTestObjStringAttrWithSetterException THUNK_GENERATOR(0) },
    7262    { "customAttr", DontDelete, (intptr_t)static_cast<PropertySlot::GetValueFunc>(jsTestObjCustomAttr), (intptr_t)setJSTestObjCustomAttr THUNK_GENERATOR(0) },
    7363    { "scriptStringAttr", DontDelete | ReadOnly, (intptr_t)static_cast<PropertySlot::GetValueFunc>(jsTestObjScriptStringAttr), (intptr_t)0 THUNK_GENERATOR(0) },
    … …  
    8979
    9080#undef THUNK_GENERATOR
    91 static JSC_CONST_HASHTABLE HashTable JSTestObjTable = { 69, 63, JSTestObjTableValues, 0 };
     81static JSC_CONST_HASHTABLE HashTable JSTestObjTable = { 66, 63, JSTestObjTableValues, 0 };
    9282/* Hash table for constructor */
    9383#if ENABLE(JIT)
    … …  
    298288}
    299289
    300 JSValue jsTestObjReflectedStringAttr(ExecState* exec, JSValue slotBase, const Identifier&)
    301 {
    302     JSTestObj* castedThis = static_cast<JSTestObj*>(asObject(slotBase));
    303     UNUSED_PARAM(exec);
    304     TestObj* imp = static_cast<TestObj*>(castedThis->impl());
    305     JSValue result = jsString(exec, imp->getAttribute(WebCore::HTMLNames::reflectedstringattrAttr));
    306     return result;
    307 }
    308 
    309 JSValue jsTestObjReflectedIntegralAttr(ExecState* exec, JSValue slotBase, const Identifier&)
    310 {
    311     JSTestObj* castedThis = static_cast<JSTestObj*>(asObject(slotBase));
    312     UNUSED_PARAM(exec);
    313     TestObj* imp = static_cast<TestObj*>(castedThis->impl());
    314     JSValue result = jsNumber(exec, imp->getIntegralAttribute(WebCore::HTMLNames::reflectedintegralattrAttr));
    315     return result;
    316 }
    317 
    318 JSValue jsTestObjReflectedBooleanAttr(ExecState* exec, JSValue slotBase, const Identifier&)
    319 {
    320     JSTestObj* castedThis = static_cast<JSTestObj*>(asObject(slotBase));
    321     UNUSED_PARAM(exec);
    322     TestObj* imp = static_cast<TestObj*>(castedThis->impl());
    323     JSValue result = jsBoolean(imp->hasAttribute(WebCore::HTMLNames::reflectedbooleanattrAttr));
    324     return result;
    325 }
    326 
    327 JSValue jsTestObjReflectedURLAttr(ExecState* exec, JSValue slotBase, const Identifier&)
    328 {
    329     JSTestObj* castedThis = static_cast<JSTestObj*>(asObject(slotBase));
    330     UNUSED_PARAM(exec);
    331     TestObj* imp = static_cast<TestObj*>(castedThis->impl());
    332     JSValue result = jsString(exec, imp->getURLAttribute(WebCore::HTMLNames::reflectedurlattrAttr));
    333     return result;
    334 }
    335 
    336 JSValue jsTestObjReflectedStringAttr(ExecState* exec, JSValue slotBase, const Identifier&)
    337 {
    338     JSTestObj* castedThis = static_cast<JSTestObj*>(asObject(slotBase));
    339     UNUSED_PARAM(exec);
    340     TestObj* imp = static_cast<TestObj*>(castedThis->impl());
    341     JSValue result = jsString(exec, imp->getAttribute(WebCore::HTMLNames::customContentStringAttrAttr));
    342     return result;
    343 }
    344 
    345 JSValue jsTestObjReflectedCustomIntegralAttr(ExecState* exec, JSValue slotBase, const Identifier&)
    346 {
    347     JSTestObj* castedThis = static_cast<JSTestObj*>(asObject(slotBase));
    348     UNUSED_PARAM(exec);
    349     TestObj* imp = static_cast<TestObj*>(castedThis->impl());
    350     JSValue result = jsNumber(exec, imp->getIntegralAttribute(WebCore::HTMLNames::customContentIntegralAttrAttr));
    351     return result;
    352 }
    353 
    354 JSValue jsTestObjReflectedCustomBooleanAttr(ExecState* exec, JSValue slotBase, const Identifier&)
    355 {
    356     JSTestObj* castedThis = static_cast<JSTestObj*>(asObject(slotBase));
    357     UNUSED_PARAM(exec);
    358     TestObj* imp = static_cast<TestObj*>(castedThis->impl());
    359     JSValue result = jsBoolean(imp->hasAttribute(WebCore::HTMLNames::customContentBooleanAttrAttr));
    360     return result;
    361 }
    362 
    363 JSValue jsTestObjReflectedURLAttr(ExecState* exec, JSValue slotBase, const Identifier&)
    364 {
    365     JSTestObj* castedThis = static_cast<JSTestObj*>(asObject(slotBase));
    366     UNUSED_PARAM(exec);
    367     TestObj* imp = static_cast<TestObj*>(castedThis->impl());
    368     JSValue result = jsString(exec, imp->getURLAttribute(WebCore::HTMLNames::customContentURLAttrAttr));
     290JSValue jsTestObjAttrWithException(ExecState* exec, JSValue slotBase, const Identifier&)
     291{
     292    JSTestObj* castedThis = static_cast<JSTestObj*>(asObject(slotBase));
     293    UNUSED_PARAM(exec);
     294    TestObj* imp = static_cast<TestObj*>(castedThis->impl());
     295    JSValue result = jsNumber(exec, imp->attrWithException());
     296    return result;
     297}
     298
     299JSValue jsTestObjAttrWithSetterException(ExecState* exec, JSValue slotBase, const Identifier&)
     300{
     301    JSTestObj* castedThis = static_cast<JSTestObj*>(asObject(slotBase));
     302    ExceptionCode ec = 0;
     303    TestObj* imp = static_cast<TestObj*>(castedThis->impl());
     304    JSC::JSValue result = jsNumber(exec, imp->attrWithSetterException(ec));
     305    setDOMException(exec, ec);
    369306    return result;
    370307}
    … …  
    373310{
    374311    JSTestObj* castedThis = static_cast<JSTestObj*>(asObject(slotBase));
    375     ExceptionCode ec = 0;
    376     TestObj* imp = static_cast<TestObj*>(castedThis->impl());
    377     JSC::JSValue result = jsNumber(exec, imp->attrWithGetterException(ec));
    378     setDOMException(exec, ec);
    379     return result;
    380 }
    381 
    382 JSValue jsTestObjAttrWithSetterException(ExecState* exec, JSValue slotBase, const Identifier&)
    383 {
    384     JSTestObj* castedThis = static_cast<JSTestObj*>(asObject(slotBase));
    385     UNUSED_PARAM(exec);
    386     TestObj* imp = static_cast<TestObj*>(castedThis->impl());
    387     JSValue result = jsNumber(exec, imp->attrWithSetterException());
    388     return result;
    389 }
    390 
    391 JSValue jsTestObjStringAttrWithGetterException(ExecState* exec, JSValue slotBase, const Identifier&)
    392 {
    393     JSTestObj* castedThis = static_cast<JSTestObj*>(asObject(slotBase));
    394     ExceptionCode ec = 0;
    395     TestObj* imp = static_cast<TestObj*>(castedThis->impl());
    396     JSC::JSValue result = jsString(exec, imp->stringAttrWithGetterException(ec));
    397     setDOMException(exec, ec);
    398     return result;
    399 }
    400 
    401 JSValue jsTestObjStringAttrWithSetterException(ExecState* exec, JSValue slotBase, const Identifier&)
    402 {
    403     JSTestObj* castedThis = static_cast<JSTestObj*>(asObject(slotBase));
    404     UNUSED_PARAM(exec);
    405     TestObj* imp = static_cast<TestObj*>(castedThis->impl());
    406     JSValue result = jsString(exec, imp->stringAttrWithSetterException());
     312    UNUSED_PARAM(exec);
     313    TestObj* imp = static_cast<TestObj*>(castedThis->impl());
     314    JSValue result = jsNumber(exec, imp->attrWithGetterException());
    407315    return result;
    408316}
    … …  
    528436}
    529437
    530 void setJSTestObjReflectedStringAttr(ExecState* exec, JSObject* thisObject, JSValue value)
    531 {
    532     JSTestObj* castedThis = static_cast<JSTestObj*>(thisObject);
    533     TestObj* imp = static_cast<TestObj*>(castedThis->impl());
    534     imp->setAttribute(WebCore::HTMLNames::reflectedstringattrAttr, valueToStringWithNullCheck(exec, value));
    535 }
    536 
    537 void setJSTestObjReflectedIntegralAttr(ExecState* exec, JSObject* thisObject, JSValue value)
    538 {
    539     JSTestObj* castedThis = static_cast<JSTestObj*>(thisObject);
    540     TestObj* imp = static_cast<TestObj*>(castedThis->impl());
    541     imp->setIntegralAttribute(WebCore::HTMLNames::reflectedintegralattrAttr, value.toInt32(exec));
    542 }
    543 
    544 void setJSTestObjReflectedBooleanAttr(ExecState* exec, JSObject* thisObject, JSValue value)
    545 {
    546     JSTestObj* castedThis = static_cast<JSTestObj*>(thisObject);
    547     TestObj* imp = static_cast<TestObj*>(castedThis->impl());
    548     imp->setBooleanAttribute(WebCore::HTMLNames::reflectedbooleanattrAttr, value.toBoolean(exec));
    549 }
    550 
    551 void setJSTestObjReflectedURLAttr(ExecState* exec, JSObject* thisObject, JSValue value)
    552 {
    553     JSTestObj* castedThis = static_cast<JSTestObj*>(thisObject);
    554     TestObj* imp = static_cast<TestObj*>(castedThis->impl());
    555     imp->setAttribute(WebCore::HTMLNames::reflectedurlattrAttr, valueToStringWithNullCheck(exec, value));
    556 }
    557 
    558 void setJSTestObjReflectedStringAttr(ExecState* exec, JSObject* thisObject, JSValue value)
    559 {
    560     JSTestObj* castedThis = static_cast<JSTestObj*>(thisObject);
    561     TestObj* imp = static_cast<TestObj*>(castedThis->impl());
    562     imp->setAttribute(WebCore::HTMLNames::customContentStringAttrAttr, valueToStringWithNullCheck(exec, value));
    563 }
    564 
    565 void setJSTestObjReflectedCustomIntegralAttr(ExecState* exec, JSObject* thisObject, JSValue value)
    566 {
    567     JSTestObj* castedThis = static_cast<JSTestObj*>(thisObject);
    568     TestObj* imp = static_cast<TestObj*>(castedThis->impl());
    569     imp->setIntegralAttribute(WebCore::HTMLNames::customContentIntegralAttrAttr, value.toInt32(exec));
    570 }
    571 
    572 void setJSTestObjReflectedCustomBooleanAttr(ExecState* exec, JSObject* thisObject, JSValue value)
    573 {
    574     JSTestObj* castedThis = static_cast<JSTestObj*>(thisObject);
    575     TestObj* imp = static_cast<TestObj*>(castedThis->impl());
    576     imp->setBooleanAttribute(WebCore::HTMLNames::customContentBooleanAttrAttr, value.toBoolean(exec));
    577 }
    578 
    579 void setJSTestObjReflectedURLAttr(ExecState* exec, JSObject* thisObject, JSValue value)
    580 {
    581     JSTestObj* castedThis = static_cast<JSTestObj*>(thisObject);
    582     TestObj* imp = static_cast<TestObj*>(castedThis->impl());
    583     imp->setAttribute(WebCore::HTMLNames::customContentURLAttrAttr, valueToStringWithNullCheck(exec, value));
    584 }
    585 
    586 void setJSTestObjAttrWithGetterException(ExecState* exec, JSObject* thisObject, JSValue value)
    587 {
    588     JSTestObj* castedThis = static_cast<JSTestObj*>(thisObject);
    589     TestObj* imp = static_cast<TestObj*>(castedThis->impl());
    590     ExceptionCode ec = 0;
    591     imp->setAttrWithGetterException(value.toInt32(exec), ec);
    592     setDOMException(exec, ec);
     438void setJSTestObjAttrWithException(ExecState* exec, JSObject* thisObject, JSValue value)
     439{
     440    JSTestObj* castedThis = static_cast<JSTestObj*>(thisObject);
     441    TestObj* imp = static_cast<TestObj*>(castedThis->impl());
     442    imp->setAttrWithException(value.toInt32(exec));
    593443}
    594444
    … …  
    602452}
    603453
    604 void setJSTestObjStringAttrWithGetterException(ExecState* exec, JSObject* thisObject, JSValue value)
     454void setJSTestObjAttrWithGetterException(ExecState* exec, JSObject* thisObject, JSValue value)
    605455{
    606456    JSTestObj* castedThis = static_cast<JSTestObj*>(thisObject);
    607457    TestObj* imp = static_cast<TestObj*>(castedThis->impl());
    608458    ExceptionCode ec = 0;
    609     imp->setStringAttrWithGetterException(ustringToString(value.toString(exec)), ec);
    610     setDOMException(exec, ec);
    611 }
    612 
    613 void setJSTestObjStringAttrWithSetterException(ExecState* exec, JSObject* thisObject, JSValue value)
    614 {
    615     JSTestObj* castedThis = static_cast<JSTestObj*>(thisObject);
    616     TestObj* imp = static_cast<TestObj*>(castedThis->impl());
    617     ExceptionCode ec = 0;
    618     imp->setStringAttrWithSetterException(ustringToString(value.toString(exec)), ec);
     459    imp->setAttrWithGetterException(value.toInt32(exec), ec);
    619460    setDOMException(exec, ec);
    620461}
    … …  
    11761017    if (exec->argumentCount() == 1)
    11771018        return jsTestObjPrototypeFunctionOverloadedMethod4(exec);
    1178     return throwVMTypeError(exec);
     1019    return JSValue::encode(throwTypeError(exec));
    11791020}
    11801021

  • trunk/WebCore/bindings/scripts/test/JS/JSTestObj.h

    r61379 r61384  
    131131JSC::JSValue jsTestObjTestObjAttr(JSC::ExecState*, JSC::JSValue, const JSC::Identifier&);
    132132void setJSTestObjTestObjAttr(JSC::ExecState*, JSC::JSObject*, JSC::JSValue);
    133 JSC::JSValue jsTestObjReflectedStringAttr(JSC::ExecState*, JSC::JSValue, const JSC::Identifier&);
    134 void setJSTestObjReflectedStringAttr(JSC::ExecState*, JSC::JSObject*, JSC::JSValue);
    135 JSC::JSValue jsTestObjReflectedIntegralAttr(JSC::ExecState*, JSC::JSValue, const JSC::Identifier&);
    136 void setJSTestObjReflectedIntegralAttr(JSC::ExecState*, JSC::JSObject*, JSC::JSValue);
    137 JSC::JSValue jsTestObjReflectedBooleanAttr(JSC::ExecState*, JSC::JSValue, const JSC::Identifier&);
    138 void setJSTestObjReflectedBooleanAttr(JSC::ExecState*, JSC::JSObject*, JSC::JSValue);
    139 JSC::JSValue jsTestObjReflectedURLAttr(JSC::ExecState*, JSC::JSValue, const JSC::Identifier&);
    140 void setJSTestObjReflectedURLAttr(JSC::ExecState*, JSC::JSObject*, JSC::JSValue);
    141 JSC::JSValue jsTestObjReflectedStringAttr(JSC::ExecState*, JSC::JSValue, const JSC::Identifier&);
    142 void setJSTestObjReflectedStringAttr(JSC::ExecState*, JSC::JSObject*, JSC::JSValue);
    143 JSC::JSValue jsTestObjReflectedCustomIntegralAttr(JSC::ExecState*, JSC::JSValue, const JSC::Identifier&);
    144 void setJSTestObjReflectedCustomIntegralAttr(JSC::ExecState*, JSC::JSObject*, JSC::JSValue);
    145 JSC::JSValue jsTestObjReflectedCustomBooleanAttr(JSC::ExecState*, JSC::JSValue, const JSC::Identifier&);
    146 void setJSTestObjReflectedCustomBooleanAttr(JSC::ExecState*, JSC::JSObject*, JSC::JSValue);
    147 JSC::JSValue jsTestObjReflectedURLAttr(JSC::ExecState*, JSC::JSValue, const JSC::Identifier&);
    148 void setJSTestObjReflectedURLAttr(JSC::ExecState*, JSC::JSObject*, JSC::JSValue);
     133JSC::JSValue jsTestObjAttrWithException(JSC::ExecState*, JSC::JSValue, const JSC::Identifier&);
     134void setJSTestObjAttrWithException(JSC::ExecState*, JSC::JSObject*, JSC::JSValue);
     135JSC::JSValue jsTestObjAttrWithSetterException(JSC::ExecState*, JSC::JSValue, const JSC::Identifier&);
     136void setJSTestObjAttrWithSetterException(JSC::ExecState*, JSC::JSObject*, JSC::JSValue);
    149137JSC::JSValue jsTestObjAttrWithGetterException(JSC::ExecState*, JSC::JSValue, const JSC::Identifier&);
    150138void setJSTestObjAttrWithGetterException(JSC::ExecState*, JSC::JSObject*, JSC::JSValue);
    151 JSC::JSValue jsTestObjAttrWithSetterException(JSC::ExecState*, JSC::JSValue, const JSC::Identifier&);
    152 void setJSTestObjAttrWithSetterException(JSC::ExecState*, JSC::JSObject*, JSC::JSValue);
    153 JSC::JSValue jsTestObjStringAttrWithGetterException(JSC::ExecState*, JSC::JSValue, const JSC::Identifier&);
    154 void setJSTestObjStringAttrWithGetterException(JSC::ExecState*, JSC::JSObject*, JSC::JSValue);
    155 JSC::JSValue jsTestObjStringAttrWithSetterException(JSC::ExecState*, JSC::JSValue, const JSC::Identifier&);
    156 void setJSTestObjStringAttrWithSetterException(JSC::ExecState*, JSC::JSObject*, JSC::JSValue);
    157139JSC::JSValue jsTestObjCustomAttr(JSC::ExecState*, JSC::JSValue, const JSC::Identifier&);
    158140void setJSTestObjCustomAttr(JSC::ExecState*, JSC::JSObject*, JSC::JSValue);

  • trunk/WebCore/bindings/scripts/test/ObjC/DOMTestObj.h

    r61379 r61384  
    4848- (DOMTestObj *)testObjAttr;
    4949- (void)setTestObjAttr:(DOMTestObj *)newTestObjAttr;
    50 - (NSString *)reflectedStringAttr;
    51 - (void)setReflectedStringAttr:(NSString *)newReflectedStringAttr;
    52 - (int)reflectedIntegralAttr;
    53 - (void)setReflectedIntegralAttr:(int)newReflectedIntegralAttr;
    54 - (BOOL)reflectedBooleanAttr;
    55 - (void)setReflectedBooleanAttr:(BOOL)newReflectedBooleanAttr;
    56 - (NSString *)reflectedURLAttr;
    57 - (void)setReflectedURLAttr:(NSString *)newReflectedURLAttr;
    58 - (NSString *)reflectedStringAttr;
    59 - (void)setReflectedStringAttr:(NSString *)newReflectedStringAttr;
    60 - (int)reflectedCustomIntegralAttr;
    61 - (void)setReflectedCustomIntegralAttr:(int)newReflectedCustomIntegralAttr;
    62 - (BOOL)reflectedCustomBooleanAttr;
    63 - (void)setReflectedCustomBooleanAttr:(BOOL)newReflectedCustomBooleanAttr;
    64 - (NSString *)reflectedURLAttr;
    65 - (void)setReflectedURLAttr:(NSString *)newReflectedURLAttr;
     50- (int)attrWithException;
     51- (void)setAttrWithException:(int)newAttrWithException;
     52- (int)attrWithSetterException;
     53- (void)setAttrWithSetterException:(int)newAttrWithSetterException;
    6654- (int)attrWithGetterException;
    6755- (void)setAttrWithGetterException:(int)newAttrWithGetterException;
    68 - (int)attrWithSetterException;
    69 - (void)setAttrWithSetterException:(int)newAttrWithSetterException;
    70 - (NSString *)stringAttrWithGetterException;
    71 - (void)setStringAttrWithGetterException:(NSString *)newStringAttrWithGetterException;
    72 - (NSString *)stringAttrWithSetterException;
    73 - (void)setStringAttrWithSetterException:(NSString *)newStringAttrWithSetterException;
    7456- (int)customAttr;
    7557- (void)setCustomAttr:(int)newCustomAttr;

  • trunk/WebCore/bindings/scripts/test/ObjC/DOMTestObj.mm

    r61379 r61384  
    4040#import "EventListener.h"
    4141#import "ExceptionHandlers.h"
    42 #import "HTMLNames.h"
    4342#import "JSMainThreadExecState.h"
    4443#import "KURL.h"
    … …  
    153152}
    154153
    155 - (NSString *)reflectedStringAttr
    156 {
    157     WebCore::JSMainThreadNullState state;
    158     return IMPL->getAttribute(WebCore::HTMLNames::reflectedstringattrAttr);
    159 }
    160 
    161 - (void)setReflectedStringAttr:(NSString *)newReflectedStringAttr
    162 {
    163     WebCore::JSMainThreadNullState state;
    164     IMPL->setAttribute(WebCore::HTMLNames::reflectedstringattrAttr, newReflectedStringAttr);
    165 }
    166 
    167 - (int)reflectedIntegralAttr
    168 {
    169     WebCore::JSMainThreadNullState state;
    170     return IMPL->getIntegralAttribute(WebCore::HTMLNames::reflectedintegralattrAttr);
    171 }
    172 
    173 - (void)setReflectedIntegralAttr:(int)newReflectedIntegralAttr
    174 {
    175     WebCore::JSMainThreadNullState state;
    176     IMPL->setIntegralAttribute(WebCore::HTMLNames::reflectedintegralattrAttr, newReflectedIntegralAttr);
    177 }
    178 
    179 - (BOOL)reflectedBooleanAttr
    180 {
    181     WebCore::JSMainThreadNullState state;
    182     return IMPL->hasAttribute(WebCore::HTMLNames::reflectedbooleanattrAttr);
    183 }
    184 
    185 - (void)setReflectedBooleanAttr:(BOOL)newReflectedBooleanAttr
    186 {
    187     WebCore::JSMainThreadNullState state;
    188     IMPL->setBooleanAttribute(WebCore::HTMLNames::reflectedbooleanattrAttr, newReflectedBooleanAttr);
    189 }
    190 
    191 - (NSString *)reflectedURLAttr
    192 {
    193     WebCore::JSMainThreadNullState state;
    194     return IMPL->getURLAttribute(WebCore::HTMLNames::reflectedurlattrAttr);
    195 }
    196 
    197 - (void)setReflectedURLAttr:(NSString *)newReflectedURLAttr
    198 {
    199     WebCore::JSMainThreadNullState state;
    200     IMPL->setAttribute(WebCore::HTMLNames::reflectedurlattrAttr, newReflectedURLAttr);
    201 }
    202 
    203 - (NSString *)reflectedStringAttr
    204 {
    205     WebCore::JSMainThreadNullState state;
    206     return IMPL->getAttribute(WebCore::HTMLNames::customContentStringAttrAttr);
    207 }
    208 
    209 - (void)setReflectedStringAttr:(NSString *)newReflectedStringAttr
    210 {
    211     WebCore::JSMainThreadNullState state;
    212     IMPL->setAttribute(WebCore::HTMLNames::customContentStringAttrAttr, newReflectedStringAttr);
    213 }
    214 
    215 - (int)reflectedCustomIntegralAttr
    216 {
    217     WebCore::JSMainThreadNullState state;
    218     return IMPL->getIntegralAttribute(WebCore::HTMLNames::customContentIntegralAttrAttr);
    219 }
    220 
    221 - (void)setReflectedCustomIntegralAttr:(int)newReflectedCustomIntegralAttr
    222 {
    223     WebCore::JSMainThreadNullState state;
    224     IMPL->setIntegralAttribute(WebCore::HTMLNames::customContentIntegralAttrAttr, newReflectedCustomIntegralAttr);
    225 }
    226 
    227 - (BOOL)reflectedCustomBooleanAttr
    228 {
    229     WebCore::JSMainThreadNullState state;
    230     return IMPL->hasAttribute(WebCore::HTMLNames::customContentBooleanAttrAttr);
    231 }
    232 
    233 - (void)setReflectedCustomBooleanAttr:(BOOL)newReflectedCustomBooleanAttr
    234 {
    235     WebCore::JSMainThreadNullState state;
    236     IMPL->setBooleanAttribute(WebCore::HTMLNames::customContentBooleanAttrAttr, newReflectedCustomBooleanAttr);
    237 }
    238 
    239 - (NSString *)reflectedURLAttr
    240 {
    241     WebCore::JSMainThreadNullState state;
    242     return IMPL->getURLAttribute(WebCore::HTMLNames::customContentURLAttrAttr);
    243 }
    244 
    245 - (void)setReflectedURLAttr:(NSString *)newReflectedURLAttr
    246 {
    247     WebCore::JSMainThreadNullState state;
    248     IMPL->setAttribute(WebCore::HTMLNames::customContentURLAttrAttr, newReflectedURLAttr);
     154- (int)attrWithException
     155{
     156    WebCore::JSMainThreadNullState state;
     157    return IMPL->attrWithException();
     158}
     159
     160- (void)setAttrWithException:(int)newAttrWithException
     161{
     162    WebCore::JSMainThreadNullState state;
     163    IMPL->setAttrWithException(newAttrWithException);
     164}
     165
     166- (int)attrWithSetterException
     167{
     168    WebCore::JSMainThreadNullState state;
     169    WebCore::ExceptionCode ec = 0;
     170    int result = IMPL->attrWithSetterException(ec);
     171    WebCore::raiseOnDOMError(ec);
     172    return result;
     173}
     174
     175- (void)setAttrWithSetterException:(int)newAttrWithSetterException
     176{
     177    WebCore::JSMainThreadNullState state;
     178    WebCore::ExceptionCode ec = 0;
     179    IMPL->setAttrWithSetterException(newAttrWithSetterException, ec);
     180    WebCore::raiseOnDOMError(ec);
    249181}
    250182
    … …  
    252184{
    253185    WebCore::JSMainThreadNullState state;
    254     WebCore::ExceptionCode ec = 0;
    255     int result = IMPL->attrWithGetterException(ec);
    256     WebCore::raiseOnDOMError(ec);
    257     return result;
     186    return IMPL->attrWithGetterException();
    258187}
    259188
    … …  
    263192    WebCore::ExceptionCode ec = 0;
    264193    IMPL->setAttrWithGetterException(newAttrWithGetterException, ec);
    265     WebCore::raiseOnDOMError(ec);
    266 }
    267 
    268 - (int)attrWithSetterException
    269 {
    270     WebCore::JSMainThreadNullState state;
    271     return IMPL->attrWithSetterException();
    272 }
    273 
    274 - (void)setAttrWithSetterException:(int)newAttrWithSetterException
    275 {
    276     WebCore::JSMainThreadNullState state;
    277     WebCore::ExceptionCode ec = 0;
    278     IMPL->setAttrWithSetterException(newAttrWithSetterException, ec);
    279     WebCore::raiseOnDOMError(ec);
    280 }
    281 
    282 - (NSString *)stringAttrWithGetterException
    283 {
    284     WebCore::JSMainThreadNullState state;
    285     WebCore::ExceptionCode ec = 0;
    286     NSString *result = IMPL->stringAttrWithGetterException(ec);
    287     WebCore::raiseOnDOMError(ec);
    288     return result;
    289 }
    290 
    291 - (void)setStringAttrWithGetterException:(NSString *)newStringAttrWithGetterException
    292 {
    293     WebCore::JSMainThreadNullState state;
    294     WebCore::ExceptionCode ec = 0;
    295     IMPL->setStringAttrWithGetterException(newStringAttrWithGetterException, ec);
    296     WebCore::raiseOnDOMError(ec);
    297 }
    298 
    299 - (NSString *)stringAttrWithSetterException
    300 {
    301     WebCore::JSMainThreadNullState state;
    302     return IMPL->stringAttrWithSetterException();
    303 }
    304 
    305 - (void)setStringAttrWithSetterException:(NSString *)newStringAttrWithSetterException
    306 {
    307     WebCore::JSMainThreadNullState state;
    308     WebCore::ExceptionCode ec = 0;
    309     IMPL->setStringAttrWithSetterException(newStringAttrWithSetterException, ec);
    310194    WebCore::raiseOnDOMError(ec);
    311195}

  • trunk/WebCore/bindings/scripts/test/TestObj.idl

    r61379 r61384  
    4141        attribute TestObj                  testObjAttr;
    4242
    43         // Reflected DOM attributes
    44         attribute [Reflect] DOMString reflectedStringAttr;
    45         attribute [Reflect] long reflectedIntegralAttr;
    46         attribute [Reflect] boolean reflectedBooleanAttr;
    47         attribute [ReflectURL] DOMString reflectedURLAttr;
    48         attribute [Reflect=customContentStringAttr] DOMString reflectedStringAttr;
    49         attribute [Reflect=customContentIntegralAttr] long reflectedCustomIntegralAttr;
    50         attribute [Reflect=customContentBooleanAttr] boolean reflectedCustomBooleanAttr;
    51         attribute [ReflectURL=customContentURLAttr] DOMString reflectedURLAttr;
    52 
    5343        // Methods
    5444        void    voidMethod();
    … …  
    6656
    6757        // Exceptions
    68         void methodWithException() raises(DOMException);
    69         attribute long attrWithGetterException getter raises(DOMException);
    70         attribute long attrWithSetterException setter raises(DOMException);
    71         attribute DOMString stringAttrWithGetterException getter raises(DOMException);
    72         attribute DOMString stringAttrWithSetterException setter raises(DOMException);
     58        void    methodWithException() raises(DOMException);
     59        attribute long attrWithException raises(DOMException);
     60        attribute long attrWithSetterException getter raises(DOMException);
     61        attribute long attrWithGetterException setter raises(DOMException);
    7362
    7463        // 'Custom' extended attribute

  • trunk/WebCore/bindings/scripts/test/V8/V8TestObj.cpp

    r61379 r61384  
    2323
    2424#include "ExceptionCode.h"
    25 #include "HTMLNames.h"
    2625#include "RuntimeEnabledFeatures.h"
    2726#include "ScriptCallStack.h"
    … …  
    153152}
    154153
    155 static v8::Handle<v8::Value> reflectedStringAttrAttrGetter(v8::Local<v8::String> name, const v8::AccessorInfo& info)
    156 {
    157     INC_STATS("DOM.TestObj.reflectedStringAttr._get");
    158     TestObj* imp = V8TestObj::toNative(info.Holder());
    159     return v8String(imp->getAttribute(WebCore::HTMLNames::reflectedstringattrAttr));
    160 }
    161 
    162 static void reflectedStringAttrAttrSetter(v8::Local<v8::String> name, v8::Local<v8::Value> value, const v8::AccessorInfo& info)
    163 {
    164     INC_STATS("DOM.TestObj.reflectedStringAttr._set");
    165     TestObj* imp = V8TestObj::toNative(info.Holder());
    166     V8Parameter<WithNullCheck> v = value;
    167     imp->setAttribute(WebCore::HTMLNames::reflectedstringattrAttr, v);
    168     return;
    169 }
    170 
    171 static v8::Handle<v8::Value> reflectedIntegralAttrAttrGetter(v8::Local<v8::String> name, const v8::AccessorInfo& info)
    172 {
    173     INC_STATS("DOM.TestObj.reflectedIntegralAttr._get");
    174     TestObj* imp = V8TestObj::toNative(info.Holder());
    175     return v8::Integer::New(imp->getIntegralAttribute(WebCore::HTMLNames::reflectedintegralattrAttr));
    176 }
    177 
    178 static void reflectedIntegralAttrAttrSetter(v8::Local<v8::String> name, v8::Local<v8::Value> value, const v8::AccessorInfo& info)
    179 {
    180     INC_STATS("DOM.TestObj.reflectedIntegralAttr._set");
     154static v8::Handle<v8::Value> attrWithExceptionAttrGetter(v8::Local<v8::String> name, const v8::AccessorInfo& info)
     155{
     156    INC_STATS("DOM.TestObj.attrWithException._get");
     157    TestObj* imp = V8TestObj::toNative(info.Holder());
     158    return v8::Integer::New(imp->attrWithException());
     159}
     160
     161static void attrWithExceptionAttrSetter(v8::Local<v8::String> name, v8::Local<v8::Value> value, const v8::AccessorInfo& info)
     162{
     163    INC_STATS("DOM.TestObj.attrWithException._set");
    181164    TestObj* imp = V8TestObj::toNative(info.Holder());
    182165    int v = toInt32(value);
    183     imp->setIntegralAttribute(WebCore::HTMLNames::reflectedintegralattrAttr, v);
    184     return;
    185 }
    186 
    187 static v8::Handle<v8::Value> reflectedBooleanAttrAttrGetter(v8::Local<v8::String> name, const v8::AccessorInfo& info)
    188 {
    189     INC_STATS("DOM.TestObj.reflectedBooleanAttr._get");
    190     TestObj* imp = V8TestObj::toNative(info.Holder());
    191     return v8Boolean(imp->hasAttribute(WebCore::HTMLNames::reflectedbooleanattrAttr));
    192 }
    193 
    194 static void reflectedBooleanAttrAttrSetter(v8::Local<v8::String> name, v8::Local<v8::Value> value, const v8::AccessorInfo& info)
    195 {
    196     INC_STATS("DOM.TestObj.reflectedBooleanAttr._set");
    197     TestObj* imp = V8TestObj::toNative(info.Holder());
    198     bool v = value->BooleanValue();
    199     imp->setBooleanAttribute(WebCore::HTMLNames::reflectedbooleanattrAttr, v);
    200     return;
    201 }
    202 
    203 static v8::Handle<v8::Value> reflectedURLAttrAttrGetter(v8::Local<v8::String> name, const v8::AccessorInfo& info)
    204 {
    205     INC_STATS("DOM.TestObj.reflectedURLAttr._get");
    206     TestObj* imp = V8TestObj::toNative(info.Holder());
    207     return v8String(imp->getURLAttribute(WebCore::HTMLNames::reflectedurlattrAttr));
    208 }
    209 
    210 static void reflectedURLAttrAttrSetter(v8::Local<v8::String> name, v8::Local<v8::Value> value, const v8::AccessorInfo& info)
    211 {
    212     INC_STATS("DOM.TestObj.reflectedURLAttr._set");
    213     TestObj* imp = V8TestObj::toNative(info.Holder());
    214     V8Parameter<WithNullCheck> v = value;
    215     imp->setAttribute(WebCore::HTMLNames::reflectedurlattrAttr, v);
    216     return;
    217 }
    218 
    219 static v8::Handle<v8::Value> reflectedStringAttrAttrGetter(v8::Local<v8::String> name, const v8::AccessorInfo& info)
    220 {
    221     INC_STATS("DOM.TestObj.reflectedStringAttr._get");
    222     TestObj* imp = V8TestObj::toNative(info.Holder());
    223     return v8String(imp->getAttribute(WebCore::HTMLNames::customContentStringAttrAttr));
    224 }
    225 
    226 static void reflectedStringAttrAttrSetter(v8::Local<v8::String> name, v8::Local<v8::Value> value, const v8::AccessorInfo& info)
    227 {
    228     INC_STATS("DOM.TestObj.reflectedStringAttr._set");
    229     TestObj* imp = V8TestObj::toNative(info.Holder());
    230     V8Parameter<WithNullCheck> v = value;
    231     imp->setAttribute(WebCore::HTMLNames::customContentStringAttrAttr, v);
    232     return;
    233 }
    234 
    235 static v8::Handle<v8::Value> reflectedCustomIntegralAttrAttrGetter(v8::Local<v8::String> name, const v8::AccessorInfo& info)
    236 {
    237     INC_STATS("DOM.TestObj.reflectedCustomIntegralAttr._get");
    238     TestObj* imp = V8TestObj::toNative(info.Holder());
    239     return v8::Integer::New(imp->getIntegralAttribute(WebCore::HTMLNames::customContentIntegralAttrAttr));
    240 }
    241 
    242 static void reflectedCustomIntegralAttrAttrSetter(v8::Local<v8::String> name, v8::Local<v8::Value> value, const v8::AccessorInfo& info)
    243 {
    244     INC_STATS("DOM.TestObj.reflectedCustomIntegralAttr._set");
    245     TestObj* imp = V8TestObj::toNative(info.Holder());
    246     int v = toInt32(value);
    247     imp->setIntegralAttribute(WebCore::HTMLNames::customContentIntegralAttrAttr, v);
    248     return;
    249 }
    250 
    251 static v8::Handle<v8::Value> reflectedCustomBooleanAttrAttrGetter(v8::Local<v8::String> name, const v8::AccessorInfo& info)
    252 {
    253     INC_STATS("DOM.TestObj.reflectedCustomBooleanAttr._get");
    254     TestObj* imp = V8TestObj::toNative(info.Holder());
    255     return v8Boolean(imp->hasAttribute(WebCore::HTMLNames::customContentBooleanAttrAttr));
    256 }
    257 
    258 static void reflectedCustomBooleanAttrAttrSetter(v8::Local<v8::String> name, v8::Local<v8::Value> value, const v8::AccessorInfo& info)
    259 {
    260     INC_STATS("DOM.TestObj.reflectedCustomBooleanAttr._set");
    261     TestObj* imp = V8TestObj::toNative(info.Holder());
    262     bool v = value->BooleanValue();
    263     imp->setBooleanAttribute(WebCore::HTMLNames::customContentBooleanAttrAttr, v);
    264     return;
    265 }
    266 
    267 static v8::Handle<v8::Value> reflectedURLAttrAttrGetter(v8::Local<v8::String> name, const v8::AccessorInfo& info)
    268 {
    269     INC_STATS("DOM.TestObj.reflectedURLAttr._get");
    270     TestObj* imp = V8TestObj::toNative(info.Holder());
    271     return v8String(imp->getURLAttribute(WebCore::HTMLNames::customContentURLAttrAttr));
    272 }
    273 
    274 static void reflectedURLAttrAttrSetter(v8::Local<v8::String> name, v8::Local<v8::Value> value, const v8::AccessorInfo& info)
    275 {
    276     INC_STATS("DOM.TestObj.reflectedURLAttr._set");
    277     TestObj* imp = V8TestObj::toNative(info.Holder());
    278     V8Parameter<WithNullCheck> v = value;
    279     imp->setAttribute(WebCore::HTMLNames::customContentURLAttrAttr, v);
    280     return;
    281 }
    282 
    283 static v8::Handle<v8::Value> attrWithGetterExceptionAttrGetter(v8::Local<v8::String> name, const v8::AccessorInfo& info)
    284 {
    285     INC_STATS("DOM.TestObj.attrWithGetterException._get");
     166    imp->setAttrWithException(v);
     167    return;
     168}
     169
     170static v8::Handle<v8::Value> attrWithSetterExceptionAttrGetter(v8::Local<v8::String> name, const v8::AccessorInfo& info)
     171{
     172    INC_STATS("DOM.TestObj.attrWithSetterException._get");
    286173    TestObj* imp = V8TestObj::toNative(info.Holder());
    287174    ExceptionCode ec = 0;
    288     int v = imp->attrWithGetterException(ec);
     175    int v = imp->attrWithSetterException(ec);
    289176    if (UNLIKELY(ec)) {
    290177        V8Proxy::setDOMException(ec);
    … …  
    292179    }
    293180    return v8::Integer::New(v);
    294 }
    295 
    296 static void attrWithGetterExceptionAttrSetter(v8::Local<v8::String> name, v8::Local<v8::Value> value, const v8::AccessorInfo& info)
    297 {
    298     INC_STATS("DOM.TestObj.attrWithGetterException._set");
    299     TestObj* imp = V8TestObj::toNative(info.Holder());
    300     int v = toInt32(value);
    301     ExceptionCode ec = 0;
    302     imp->setAttrWithGetterException(v, ec);
    303     if (UNLIKELY(ec))
    304         V8Proxy::setDOMException(ec);
    305     return;
    306 }
    307 
    308 static v8::Handle<v8::Value> attrWithSetterExceptionAttrGetter(v8::Local<v8::String> name, const v8::AccessorInfo& info)
    309 {
    310     INC_STATS("DOM.TestObj.attrWithSetterException._get");
    311     TestObj* imp = V8TestObj::toNative(info.Holder());
    312     return v8::Integer::New(imp->attrWithSetterException());
    313181}
    314182
    … …  
    325193}
    326194
    327 static v8::Handle<v8::Value> stringAttrWithGetterExceptionAttrGetter(v8::Local<v8::String> name, const v8::AccessorInfo& info)
    328 {
    329     INC_STATS("DOM.TestObj.stringAttrWithGetterException._get");
    330     TestObj* imp = V8TestObj::toNative(info.Holder());
     195static v8::Handle<v8::Value> attrWithGetterExceptionAttrGetter(v8::Local<v8::String> name, const v8::AccessorInfo& info)
     196{
     197    INC_STATS("DOM.TestObj.attrWithGetterException._get");
     198    TestObj* imp = V8TestObj::toNative(info.Holder());
     199    return v8::Integer::New(imp->attrWithGetterException());
     200}
     201
     202static void attrWithGetterExceptionAttrSetter(v8::Local<v8::String> name, v8::Local<v8::Value> value, const v8::AccessorInfo& info)
     203{
     204    INC_STATS("DOM.TestObj.attrWithGetterException._set");
     205    TestObj* imp = V8TestObj::toNative(info.Holder());
     206    int v = toInt32(value);
    331207    ExceptionCode ec = 0;
    332     String v = imp->stringAttrWithGetterException(ec);
    333     if (UNLIKELY(ec)) {
    334         V8Proxy::setDOMException(ec);
    335         return v8::Handle<v8::Value>();
    336     }
    337     return v8String(v);
    338 }
    339 
    340 static void stringAttrWithGetterExceptionAttrSetter(v8::Local<v8::String> name, v8::Local<v8::Value> value, const v8::AccessorInfo& info)
    341 {
    342     INC_STATS("DOM.TestObj.stringAttrWithGetterException._set");
    343     TestObj* imp = V8TestObj::toNative(info.Holder());
    344     V8Parameter<> v = value;
    345     ExceptionCode ec = 0;
    346     imp->setStringAttrWithGetterException(v, ec);
    347     if (UNLIKELY(ec))
    348         V8Proxy::setDOMException(ec);
    349     return;
    350 }
    351 
    352 static v8::Handle<v8::Value> stringAttrWithSetterExceptionAttrGetter(v8::Local<v8::String> name, const v8::AccessorInfo& info)
    353 {
    354     INC_STATS("DOM.TestObj.stringAttrWithSetterException._get");
    355     TestObj* imp = V8TestObj::toNative(info.Holder());
    356     return v8String(imp->stringAttrWithSetterException());
    357 }
    358 
    359 static void stringAttrWithSetterExceptionAttrSetter(v8::Local<v8::String> name, v8::Local<v8::Value> value, const v8::AccessorInfo& info)
    360 {
    361     INC_STATS("DOM.TestObj.stringAttrWithSetterException._set");
    362     TestObj* imp = V8TestObj::toNative(info.Holder());
    363     V8Parameter<> v = value;
    364     ExceptionCode ec = 0;
    365     imp->setStringAttrWithSetterException(v, ec);
     208    imp->setAttrWithGetterException(v, ec);
    366209    if (UNLIKELY(ec))
    367210        V8Proxy::setDOMException(ec);
    … …  
    873716    if (args.Length() == 1)
    874717        return overloadedMethod4Callback(args);
    875     V8Proxy::throwTypeError();
     718    V8Proxy::setDOMException(SYNTAX_ERR);
    876719    return notHandledByInterceptor();
    877720}
    … …  
    896739    // Attribute 'testObjAttr' (Type: 'attribute' ExtAttr: '')
    897740    {"testObjAttr", TestObjInternal::testObjAttrAttrGetter, TestObjInternal::testObjAttrAttrSetter, 0 /* no data */, static_cast<v8::AccessControl>(v8::DEFAULT), static_cast<v8::PropertyAttribute>(v8::None), 0 /* on instance */},
    898     // Attribute 'reflectedStringAttr' (Type: 'attribute' ExtAttr: 'Reflect')
    899     {"reflectedStringAttr", TestObjInternal::reflectedStringAttrAttrGetter, TestObjInternal::reflectedStringAttrAttrSetter, 0 /* no data */, static_cast<v8::AccessControl>(v8::DEFAULT), static_cast<v8::PropertyAttribute>(v8::None), 0 /* on instance */},
    900     // Attribute 'reflectedIntegralAttr' (Type: 'attribute' ExtAttr: 'Reflect')
    901     {"reflectedIntegralAttr", TestObjInternal::reflectedIntegralAttrAttrGetter, TestObjInternal::reflectedIntegralAttrAttrSetter, 0 /* no data */, static_cast<v8::AccessControl>(v8::DEFAULT), static_cast<v8::PropertyAttribute>(v8::None), 0 /* on instance */},
    902     // Attribute 'reflectedBooleanAttr' (Type: 'attribute' ExtAttr: 'Reflect')
    903     {"reflectedBooleanAttr", TestObjInternal::reflectedBooleanAttrAttrGetter, TestObjInternal::reflectedBooleanAttrAttrSetter, 0 /* no data */, static_cast<v8::AccessControl>(v8::DEFAULT), static_cast<v8::PropertyAttribute>(v8::None), 0 /* on instance */},
    904     // Attribute 'reflectedURLAttr' (Type: 'attribute' ExtAttr: 'ReflectURL')
    905     {"reflectedURLAttr", TestObjInternal::reflectedURLAttrAttrGetter, TestObjInternal::reflectedURLAttrAttrSetter, 0 /* no data */, static_cast<v8::AccessControl>(v8::DEFAULT), static_cast<v8::PropertyAttribute>(v8::None), 0 /* on instance */},
    906     // Attribute 'reflectedStringAttr' (Type: 'attribute' ExtAttr: 'Reflect')
    907     {"reflectedStringAttr", TestObjInternal::reflectedStringAttrAttrGetter, TestObjInternal::reflectedStringAttrAttrSetter, 0 /* no data */, static_cast<v8::AccessControl>(v8::DEFAULT), static_cast<v8::PropertyAttribute>(v8::None), 0 /* on instance */},
    908     // Attribute 'reflectedCustomIntegralAttr' (Type: 'attribute' ExtAttr: 'Reflect')
    909     {"reflectedCustomIntegralAttr", TestObjInternal::reflectedCustomIntegralAttrAttrGetter, TestObjInternal::reflectedCustomIntegralAttrAttrSetter, 0 /* no data */, static_cast<v8::AccessControl>(v8::DEFAULT), static_cast<v8::PropertyAttribute>(v8::None), 0 /* on instance */},
    910     // Attribute 'reflectedCustomBooleanAttr' (Type: 'attribute' ExtAttr: 'Reflect')
    911     {"reflectedCustomBooleanAttr", TestObjInternal::reflectedCustomBooleanAttrAttrGetter, TestObjInternal::reflectedCustomBooleanAttrAttrSetter, 0 /* no data */, static_cast<v8::AccessControl>(v8::DEFAULT), static_cast<v8::PropertyAttribute>(v8::None), 0 /* on instance */},
    912     // Attribute 'reflectedURLAttr' (Type: 'attribute' ExtAttr: 'ReflectURL')
    913     {"reflectedURLAttr", TestObjInternal::reflectedURLAttrAttrGetter, TestObjInternal::reflectedURLAttrAttrSetter, 0 /* no data */, static_cast<v8::AccessControl>(v8::DEFAULT), static_cast<v8::PropertyAttribute>(v8::None), 0 /* on instance */},
     741    // Attribute 'attrWithException' (Type: 'attribute' ExtAttr: '')
     742    {"attrWithException", TestObjInternal::attrWithExceptionAttrGetter, TestObjInternal::attrWithExceptionAttrSetter, 0 /* no data */, static_cast<v8::AccessControl>(v8::DEFAULT), static_cast<v8::PropertyAttribute>(v8::None), 0 /* on instance */},
     743    // Attribute 'attrWithSetterException' (Type: 'attribute' ExtAttr: '')
     744    {"attrWithSetterException", TestObjInternal::attrWithSetterExceptionAttrGetter, TestObjInternal::attrWithSetterExceptionAttrSetter, 0 /* no data */, static_cast<v8::AccessControl>(v8::DEFAULT), static_cast<v8::PropertyAttribute>(v8::None), 0 /* on instance */},
    914745    // Attribute 'attrWithGetterException' (Type: 'attribute' ExtAttr: '')
    915746    {"attrWithGetterException", TestObjInternal::attrWithGetterExceptionAttrGetter, TestObjInternal::attrWithGetterExceptionAttrSetter, 0 /* no data */, static_cast<v8::AccessControl>(v8::DEFAULT), static_cast<v8::PropertyAttribute>(v8::None), 0 /* on instance */},
    916     // Attribute 'attrWithSetterException' (Type: 'attribute' ExtAttr: '')
    917     {"attrWithSetterException", TestObjInternal::attrWithSetterExceptionAttrGetter, TestObjInternal::attrWithSetterExceptionAttrSetter, 0 /* no data */, static_cast<v8::AccessControl>(v8::DEFAULT), static_cast<v8::PropertyAttribute>(v8::None), 0 /* on instance */},
    918     // Attribute 'stringAttrWithGetterException' (Type: 'attribute' ExtAttr: '')
    919     {"stringAttrWithGetterException", TestObjInternal::stringAttrWithGetterExceptionAttrGetter, TestObjInternal::stringAttrWithGetterExceptionAttrSetter, 0 /* no data */, static_cast<v8::AccessControl>(v8::DEFAULT), static_cast<v8::PropertyAttribute>(v8::None), 0 /* on instance */},
    920     // Attribute 'stringAttrWithSetterException' (Type: 'attribute' ExtAttr: '')
    921     {"stringAttrWithSetterException", TestObjInternal::stringAttrWithSetterExceptionAttrGetter, TestObjInternal::stringAttrWithSetterExceptionAttrSetter, 0 /* no data */, static_cast<v8::AccessControl>(v8::DEFAULT), static_cast<v8::PropertyAttribute>(v8::None), 0 /* on instance */},
    922747    // Attribute 'customAttr' (Type: 'attribute' ExtAttr: 'Custom')
    923748    {"customAttr", V8TestObj::customAttrAccessorGetter, V8TestObj::customAttrAccessorSetter, 0 /* no data */, static_cast<v8::AccessControl>(v8::DEFAULT), static_cast<v8::PropertyAttribute>(v8::None), 0 /* on instance */},

  • trunk/WebCore/dom/Element.cpp

    r61379 r61384  
    55 *           (C) 2001 Dirk Mueller (mueller@kde.org)
    66 *           (C) 2007 David Smith (catfish.man@gmail.com)
    7  * Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009, 2010 Apple Inc. All rights reserved.
     7 * Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009 Apple Inc. All rights reserved.
    88 *           (C) 2007 Eric Seidel (eric@webkit.org)
    99 *
    … …  
    15321532}
    15331533
    1534 int Element::getIntegralAttribute(const QualifiedName& attributeName) const
    1535 {
    1536     return getAttribute(attributeName).string().toInt();
    1537 }
    1538 
    1539 void Element::setIntegralAttribute(const QualifiedName& attributeName, int value)
    1540 {
    1541     // FIXME: Need an AtomicString version of String::number.
    1542     ExceptionCode ec;
    1543     setAttribute(attributeName, String::number(value), ec);
    1544 }
    1545 
    1546 unsigned Element::getUnsignedIntegralAttribute(const QualifiedName& attributeName) const
    1547 {
    1548     return getAttribute(attributeName).string().toUInt();
    1549 }
    1550 
    1551 void Element::setUnsignedIntegralAttribute(const QualifiedName& attributeName, unsigned value)
    1552 {
    1553     // FIXME: Need an AtomicString version of String::number.
    1554     ExceptionCode ec;
    1555     setAttribute(attributeName, String::number(value), ec);
    1556 }
    1557 
    15581534} // namespace WebCore

  • trunk/WebCore/dom/Element.h

    r61379 r61384  
    102102    void removeAttribute(const QualifiedName&, ExceptionCode&);
    103103
    104     // Typed getters and setters for language bindings.
    105     int getIntegralAttribute(const QualifiedName& attributeName) const;
    106     void setIntegralAttribute(const QualifiedName& attributeName, int value);
    107     unsigned getUnsignedIntegralAttribute(const QualifiedName& attributeName) const;
    108     void setUnsignedIntegralAttribute(const QualifiedName& attributeName, unsigned value);
    109 
    110104    // Call this to get the value of an attribute that is known not to be the style
    111105    // attribute or one of the SVG animatable attributes.

  • trunk/WebCore/html/HTMLAnchorElement.idl

    r61379 r61384  
    11/*
    2  * Copyright (C) 2006, 2007, 2009, 2010 Apple Inc. All rights reserved.
     2 * Copyright (C) 2006, 2007, 2009 Apple Inc. All rights reserved.
    33 * Copyright (C) 2006 Samuel Weinig <sam.weinig@gmail.com>
    44 *
    … …  
    2222
    2323    interface HTMLAnchorElement : HTMLElement {
    24         attribute [Reflect] DOMString accessKey;
    25         attribute [Reflect] DOMString charset;
    26         attribute [Reflect] DOMString coords;
    27         attribute [ReflectURL] DOMString href;
    28         attribute [Reflect] DOMString hreflang;
    29         attribute [Reflect] DOMString name;
    30         attribute [Reflect] DOMString rel;
    31         attribute [Reflect] DOMString rev;
    32         attribute [Reflect] DOMString shape;
    33         attribute [Reflect] DOMString target;
    34         attribute [Reflect] DOMString type;
     24        attribute [ConvertNullToNullString, Reflect=accesskey] DOMString accessKey;
     25        attribute [ConvertNullToNullString, Reflect] DOMString charset;
     26        attribute [ConvertNullToNullString, Reflect] DOMString coords;
     27        attribute [ConvertNullToNullString, ReflectURL] DOMString href;
     28        attribute [ConvertNullToNullString, Reflect] DOMString hreflang;
     29        attribute [ConvertNullToNullString, Reflect] DOMString name;
     30        attribute [ConvertNullToNullString, Reflect] DOMString rel;
     31        attribute [ConvertNullToNullString, Reflect] DOMString rev;
     32        attribute [ConvertNullToNullString, Reflect] DOMString shape;
     33        attribute [ConvertNullToNullString, Reflect] DOMString target;
     34        attribute [ConvertNullToNullString, Reflect] DOMString type;
    3535
    3636#if defined(LANGUAGE_OBJECTIVE_C) && LANGUAGE_OBJECTIVE_C

  • trunk/WebCore/html/HTMLAppletElement.idl

    r61379 r61384  
    11/*
    2  * Copyright (C) 2006, 2007, 2009, 2010 Apple Inc. All rights reserved.
     2 * Copyright (C) 2006, 2007, 2009 Apple Inc. All rights reserved.
    33 * Copyright (C) 2006 Samuel Weinig <sam.weinig@gmail.com>
    44 *
    … …  
    2626        CustomCall
    2727    ] HTMLAppletElement : HTMLElement {
    28         attribute [Reflect] DOMString align;
    29         attribute [Reflect] DOMString alt;
    30         attribute [Reflect] DOMString archive;
    31         attribute [Reflect] DOMString code;
    32         attribute [Reflect] DOMString codeBase;
    33         attribute [Reflect] DOMString height;
     28                 attribute [ConvertNullToNullString, Reflect] DOMString align;
     29                 attribute [ConvertNullToNullString, Reflect] DOMString alt;
     30                 attribute [ConvertNullToNullString, Reflect] DOMString archive;
     31                 attribute [ConvertNullToNullString, Reflect] DOMString code;
     32                 attribute [ConvertNullToNullString, Reflect=codebase] DOMString codeBase;
     33                 attribute [ConvertNullToNullString, Reflect] DOMString height;
    3434#if defined(LANGUAGE_JAVASCRIPT) && LANGUAGE_JAVASCRIPT
    35         attribute [Reflect] DOMString hspace;
     35                 attribute [ConvertNullToNullString, Reflect] DOMString hspace;
    3636#else
    37         attribute [Reflect] long hspace;
     37                 attribute [ConvertFromString] long hspace;
    3838#endif
    39         attribute [Reflect] DOMString name;
    40         attribute [Reflect] DOMString object;
     39                 attribute [ConvertNullToNullString, Reflect] DOMString name;
     40                 attribute [ConvertNullToNullString, Reflect] DOMString object;
    4141#if defined(LANGUAGE_JAVASCRIPT) && LANGUAGE_JAVASCRIPT
    42         attribute [Reflect] DOMString vspace;
     42                 attribute [ConvertNullToNullString, Reflect] DOMString vspace;
    4343#else
    44         attribute [Reflect] long vspace;
     44                 attribute [ConvertFromString] long vspace;
    4545#endif
    46         attribute [Reflect] DOMString width;
     46                 attribute [ConvertNullToNullString, Reflect] DOMString width;
    4747    };
    4848

  • trunk/WebCore/html/HTMLAreaElement.idl

    r61379 r61384  
    11/*
    2  * Copyright (C) 2006, 2009, 2010 Apple Inc. All rights reserved.
     2 * Copyright (C) 2006, 2009 Apple Inc. All rights reserved.
    33 * Copyright (C) 2006 Samuel Weinig <sam.weinig@gmail.com>
    44 *
    … …  
    2222
    2323    interface HTMLAreaElement : HTMLElement {
    24         attribute [Reflect] DOMString accessKey;
    25         attribute [Reflect] DOMString alt;
    26         attribute [Reflect] DOMString coords;
    27         attribute [ReflectURL] DOMString href;
    28         attribute [Reflect] boolean noHref;
    29         attribute [Reflect] DOMString shape;
    30         attribute [Reflect] DOMString target;
     24        attribute [ConvertNullToNullString, Reflect=accesskey] DOMString accessKey;
     25        attribute [ConvertNullToNullString, Reflect] DOMString alt;
     26        attribute [ConvertNullToNullString, Reflect] DOMString coords;
     27        attribute [ConvertNullToNullString, ReflectURL] DOMString href;
     28        attribute boolean noHref;
     29        attribute [ConvertNullToNullString, Reflect] DOMString shape;
     30        attribute [ConvertNullToNullString, Reflect] DOMString target;
    3131
    3232        // IE Extensions

  • trunk/WebCore/html/HTMLBRElement.idl

    r61379 r61384  
    2121
    2222    interface HTMLBRElement : HTMLElement {
    23         attribute [Reflect] DOMString clear;
     23        attribute [ConvertNullToNullString, Reflect] DOMString clear;
    2424    };
    2525

  • trunk/WebCore/html/HTMLBaseElement.idl

    r61379 r61384  
    2121
    2222    interface HTMLBaseElement : HTMLElement {
    23         attribute [Reflect] DOMString href;
    24         attribute [Reflect] DOMString target;
     23        attribute [ConvertNullToNullString, Reflect] DOMString href;
     24        attribute [ConvertNullToNullString, Reflect] DOMString target;
    2525    };
    2626

  • trunk/WebCore/html/HTMLBaseFontElement.idl

    r61379 r61384  
    11/*
    2  * Copyright (C) 2006, 2009, 2010 Apple Inc. All rights reserved.
     2 * Copyright (C) 2006, 2009 Apple Inc. All rights reserved.
    33 *
    44 * This library is free software; you can redistribute it and/or
    … …  
    2121
    2222    interface HTMLBaseFontElement : HTMLElement {
    23         attribute [Reflect] DOMString color;
    24         attribute [Reflect] DOMString face;
     23        attribute [ConvertNullToNullString, Reflect] DOMString color;
     24        attribute [ConvertNullToNullString, Reflect] DOMString face;
    2525#if defined(LANGUAGE_OBJECTIVE_C) && LANGUAGE_OBJECTIVE_C
    2626        attribute [ConvertToString] DOMString size; // this changed to a long, but our existing API is a string
    2727#else
    28         attribute [Reflect] long size;
     28        attribute long size;
    2929#endif
    3030    };

  • trunk/WebCore/html/HTMLBlockquoteElement.idl

    r61379 r61384  
    2121
    2222    interface HTMLBlockquoteElement : HTMLElement {
    23         attribute [Reflect] DOMString cite;
     23        attribute [ConvertNullToNullString, Reflect] DOMString cite;
    2424    };
    2525

  • trunk/WebCore/html/HTMLBodyElement.idl

    r61379 r61384  
    11/*
    2  * Copyright (C) 2006, 2009, 2010 Apple Inc. All rights reserved.
     2 * Copyright (C) 2006, 2009 Apple Inc. All rights reserved.
    33 * Copyright (C) 2006 Samuel Weinig <sam.weinig@gmail.com>
    44 *
    … …  
    2222
    2323    interface HTMLBodyElement : HTMLElement {
    24         attribute [Reflect] DOMString aLink;
    25         attribute [Reflect] DOMString background;
    26         attribute [Reflect] DOMString bgColor;
    27         attribute [Reflect] DOMString link;
    28         attribute [Reflect] DOMString text;
    29         attribute [Reflect] DOMString vLink;
     24        attribute [ConvertNullToNullString, Reflect=alink] DOMString aLink;
     25        attribute [ConvertNullToNullString, Reflect] DOMString background;
     26        attribute [ConvertNullToNullString, Reflect=bgcolor] DOMString bgColor;
     27        attribute [ConvertNullToNullString, Reflect] DOMString link;
     28        attribute [ConvertNullToNullString, Reflect] DOMString text;
     29        attribute [ConvertNullToNullString, Reflect=vlink] DOMString vLink;
    3030
    3131#if !defined(LANGUAGE_OBJECTIVE_C) || !LANGUAGE_OBJECTIVE_C

  • trunk/WebCore/html/HTMLButtonElement.idl

    r61379 r61384  
    11/*
    2  * Copyright (C) 2006, 2010 Apple Inc. All rights reserved.
     2 * Copyright (C) 2006 Apple Computer, Inc.
    33 * Copyright (C) 2006 Samuel Weinig <sam.weinig@gmail.com>
    44 *
    … …  
    2222
    2323    interface HTMLButtonElement : HTMLElement {
    24         readonly attribute HTMLFormElement form;
    25 
    26         attribute [Reflect] boolean formNoValidate;
    27         readonly attribute ValidityState validity;
    28 
    29         attribute [Reflect] DOMString accessKey;
    30         attribute [Reflect] boolean disabled;
    31         attribute [Reflect] boolean autofocus;
    32         attribute [Reflect] DOMString name;
    33         readonly attribute DOMString type;
    34         attribute [Reflect] DOMString value;
    35 
    36         readonly attribute boolean willValidate;
    37         readonly attribute DOMString validationMessage;
    38         boolean checkValidity();
     24        readonly attribute  HTMLFormElement      form;
     25                 attribute  boolean              formNoValidate;
     26        readonly attribute  ValidityState        validity;
     27                 attribute  [ConvertNullToNullString] DOMString            accessKey;
     28                 attribute  boolean              disabled;
     29                 attribute  boolean              autofocus;
     30                 attribute  [ConvertNullToNullString] DOMString            name;
     31        readonly attribute  DOMString            type;
     32                 attribute  [ConvertNullToNullString] DOMString            value;
     33        readonly attribute boolean               willValidate;
     34        readonly attribute DOMString             validationMessage;
     35        boolean  checkValidity();
    3936        void setCustomValidity(in [ConvertUndefinedOrNullToNullString] DOMString error);
    40 
    4137        void click();
    42 
    43         readonly attribute NodeList labels;
     38        readonly attribute  NodeList              labels;
    4439    };
    4540

  • trunk/WebCore/html/HTMLDListElement.idl

    r61379 r61384  
    11/*
    2  * Copyright (C) 2006, 2010 Apple Inc. All rights reserved.
     2 * Copyright (C) 2006 Apple Computer, Inc.
    33 *
    44 * This library is free software; you can redistribute it and/or
    … …  
    2121
    2222    interface HTMLDListElement : HTMLElement {
    23         attribute [Reflect] boolean compact;
     23        attribute boolean compact;
    2424    };
    2525

  • trunk/WebCore/html/HTMLDirectoryElement.idl

    r61379 r61384  
    11/*
    2  * Copyright (C) 2006, 2010 Apple Inc. All rights reserved.
     2 * Copyright (C) 2006 Apple Computer, Inc.
    33 *
    44 * This library is free software; you can redistribute it and/or
    … …  
    2121
    2222    interface HTMLDirectoryElement : HTMLElement {
    23         attribute [Reflect] boolean compact;
     23        attribute boolean compact;
    2424    };
    2525

  • trunk/WebCore/html/HTMLDivElement.idl

    r61379 r61384  
    11/*
    2  * Copyright (C) 2006, 2010 Apple Inc. All rights reserved.
     2 * Copyright (C) 2006 Apple Computer, Inc.
    33 *
    44 * This library is free software; you can redistribute it and/or
    … …  
    2121
    2222    interface HTMLDivElement : HTMLElement {
    23         attribute [Reflect] DOMString align;
     23        attribute [ConvertNullToNullString] DOMString align;
    2424    };
    2525

  • trunk/WebCore/html/HTMLElement.idl

    r61379 r61384  
    2727                 // iht.com relies on id returning the empty string when no id is present.
    2828                 // Other browsers do this as well. So we don't convert null to JS null.
    29                  attribute [Reflect] DOMString id;
    30                  attribute [Reflect] DOMString title;
    31                  attribute [Reflect] DOMString lang;
    32                  attribute [Reflect] DOMString dir;
    33                  attribute [Reflect=class] DOMString className;
     29                 attribute [ConvertNullToNullString, Reflect] DOMString id;
     30                 attribute [ConvertNullToNullString, Reflect] DOMString title;
     31                 attribute [ConvertNullToNullString, Reflect] DOMString lang;
     32                 attribute [ConvertNullToNullString, Reflect] DOMString dir;
     33                 attribute [ConvertNullToNullString, Reflect=class] DOMString className;
    3434
    3535                 attribute long            tabIndex;

  • trunk/WebCore/html/HTMLEmbedElement.idl

    r61379 r61384  
    11/*
    2  * Copyright (C) 2006, 2007, 2010 Apple Inc. All rights reserved.
     2 * Copyright (C) 2006, 2007 Apple Inc. All rights reserved.
    33 * Copyright (C) 2006 Samuel Weinig <sam.weinig@gmail.com>
    44 *
    … …  
    2626        CustomCall
    2727    ] HTMLEmbedElement : HTMLElement {
    28     attribute [Reflect] DOMString align;
     28                 attribute [ConvertNullToNullString, Reflect] DOMString align;
    2929#if defined(LANGUAGE_JAVASCRIPT) && LANGUAGE_JAVASCRIPT
    30     attribute [Reflect] DOMString height;
     30                 attribute [ConvertNullToNullString, Reflect] DOMString height;
    3131#else
    32     attribute [Reflect] long height;
     32                 attribute [ConvertFromString] long height;
    3333#endif
    34     attribute [Reflect] DOMString name;
    35     attribute [Reflect] DOMString src;
    36     attribute [Reflect] DOMString type;
     34                 attribute [ConvertNullToNullString, Reflect] DOMString name;
     35                 attribute [ConvertNullToNullString, Reflect] DOMString src;
     36                 attribute [ConvertNullToNullString, Reflect] DOMString type;
    3737#if defined(LANGUAGE_JAVASCRIPT) && LANGUAGE_JAVASCRIPT
    38     attribute [Reflect] DOMString width;
     38                 attribute [ConvertNullToNullString, Reflect] DOMString width;
    3939#else
    40     attribute [Reflect] long width;
     40                 attribute [ConvertFromString] long width;
    4141#endif
    4242
    4343#if defined(ENABLE_SVG) && ENABLE_SVG
    4444#if !defined(LANGUAGE_OBJECTIVE_C) || !LANGUAGE_OBJECTIVE_C || defined(ENABLE_SVG_DOM_OBJC_BINDINGS) && ENABLE_SVG_DOM_OBJC_BINDINGS
    45     [SVGCheckSecurityDocument] SVGDocument getSVGDocument() raises(DOMException);
     45        [SVGCheckSecurityDocument] SVGDocument getSVGDocument()
     46            raises(DOMException);
    4647#endif
    4748#endif

  • trunk/WebCore/html/HTMLFontElement.idl

    r61379 r61384  
    11/*
    2  * Copyright (C) 2006, 2010 Apple Inc. All rights reserved.
     2 * Copyright (C) 2006 Apple Computer, Inc.
    33 *
    44 * This library is free software; you can redistribute it and/or
    … …  
    2121
    2222    interface HTMLFontElement : HTMLElement {
    23         attribute [Reflect] DOMString color;
    24         attribute [Reflect] DOMString face;
    25         attribute [Reflect] DOMString size;
     23        attribute [ConvertNullToNullString] DOMString color;
     24        attribute [ConvertNullToNullString] DOMString face;
     25        attribute [ConvertNullToNullString] DOMString size;
    2626    };
    2727

  • trunk/WebCore/html/HTMLFormElement.idl

    r61379 r61384  
    11/*
    2  * Copyright (C) 2006, 2010 Apple Inc. All rights reserved.
     2 * Copyright (C) 2006 Apple Computer, Inc.
    33 * Copyright (C) 2006 Samuel Weinig <sam.weinig@gmail.com>
    44 *
    … …  
    2525        HasOverridingNameGetter
    2626    ] HTMLFormElement : HTMLElement {
    27         readonly attribute HTMLCollection elements;
    28         readonly attribute long length;
    29 
    30         attribute [Reflect] DOMString name;
    31         attribute [Reflect] boolean noValidate;
    32         attribute [Reflect=accept_charset] DOMString acceptCharset;
    33         attribute [Reflect] DOMString action;
    34         attribute [ConvertNullToNullString] DOMString encoding;  /* Netscape/Firefox legacy attribute. Same as enctype. */
    35         attribute [ConvertNullToNullString] DOMString enctype;
    36         attribute [Reflect] DOMString method;
    37         attribute [Reflect] DOMString target;
     27        readonly attribute HTMLCollection  elements;
     28        readonly attribute long            length;
     29                 attribute [ConvertNullToNullString] DOMString       name;
     30                 attribute boolean         noValidate;
     31                 attribute [ConvertNullToNullString] DOMString       acceptCharset;
     32                 attribute [ConvertNullToNullString] DOMString       action;
     33                 attribute [ConvertNullToNullString] DOMString       encoding;  /* Netscape/Firefox legacy attribute. Same as enctype. */
     34                 attribute [ConvertNullToNullString] DOMString       enctype;
     35                 attribute [ConvertNullToNullString] DOMString       method;
     36                 attribute [ConvertNullToNullString] DOMString       target;
    3837       
    3938        [CallWith=DynamicFrame] void submit();
    4039        void reset();
    41         boolean checkValidity();
     40        boolean  checkValidity();
    4241    };
    4342}

  • trunk/WebCore/html/HTMLFrameElement.idl

    r61379 r61384  
    11/*
    2  * Copyright (C) 2006, 2007, 2010 Apple Inc. All rights reserved.
     2 * Copyright (C) 2006, 2007 Apple Inc. All rights reserved.
    33 * Copyright (C) 2006 Samuel Weinig <sam.weinig@gmail.com>
    44 *
    … …  
    2323    interface HTMLFrameElement : HTMLElement {
    2424
    25         attribute [Reflect] DOMString frameBorder;
    26         attribute [Reflect] DOMString longDesc;
    27         attribute [Reflect] DOMString marginHeight;
    28         attribute [Reflect] DOMString marginWidth;
    29         attribute [Reflect] DOMString name;
    30         attribute [Reflect] boolean noResize;
    31         attribute [Reflect] DOMString scrolling;
    32         attribute [ReflectURL, CustomSetter] DOMString src;
     25                 attribute [ConvertNullToNullString, Reflect=frameborder] DOMString      frameBorder;
     26                 attribute [ConvertNullToNullString, Reflect=longdesc] DOMString      longDesc;
     27                 attribute [ConvertNullToNullString, Reflect=marginheight] DOMString      marginHeight;
     28                 attribute [ConvertNullToNullString, Reflect=marginwidth] DOMString      marginWidth;
     29                 attribute [ConvertNullToNullString, Reflect] DOMString      name;
     30                 attribute boolean        noResize;
     31                 attribute [ConvertNullToNullString, Reflect] DOMString      scrolling;
     32                 attribute [ConvertNullToNullString, CustomSetter, ReflectURL] DOMString      src;
    3333
    3434        // Introduced in DOM Level 2:
    35         readonly attribute [CheckFrameSecurity] Document contentDocument;
     35        readonly attribute [CheckFrameSecurity] Document        contentDocument;
    3636
    3737        // Extensions
    … …  
    4545#endif
    4646
    47         attribute [ConvertNullToNullString, CustomSetter] DOMString location;
    48 
    49         readonly attribute long width;
    50         readonly attribute long height;
     47                 attribute [ConvertNullToNullString, CustomSetter] DOMString       location;
     48        readonly attribute long            width;
     49        readonly attribute long            height;
    5150
    5251    };

  • trunk/WebCore/html/HTMLFrameSetElement.idl

    r61379 r61384  
    11/*
    2  * Copyright (C) 2006, 2007, 2009, 2010 Apple Inc. All rights reserve
     2 * Copyright (C) 2006, 2007, 2009 Apple Inc. All rights reserve
    33 * Copyright (C) 2006 Samuel Weinig <sam.weinig@gmail.com>
    44 *
    … …  
    2424        HasOverridingNameGetter
    2525    ] HTMLFrameSetElement : HTMLElement {
    26         attribute [Reflect] DOMString cols;
    27         attribute [Reflect] DOMString rows;
     26        attribute [ConvertNullToNullString] DOMString cols;
     27        attribute [ConvertNullToNullString] DOMString rows;
    2828
    2929#if !defined(LANGUAGE_OBJECTIVE_C) || !LANGUAGE_OBJECTIVE_C

  • trunk/WebCore/html/HTMLHRElement.idl

    r61379 r61384  
    11/*
    2  * Copyright (C) 2006, 2010 Apple Inc. All rights reserved.
     2 * Copyright (C) 2006 Apple Computer, Inc.
    33 *
    44 * This library is free software; you can redistribute it and/or
    … …  
    2121
    2222    interface HTMLHRElement : HTMLElement {
    23         attribute [Reflect] DOMString align;
    24         attribute [Reflect] boolean noShade;
    25         attribute [Reflect] DOMString size;
    26         attribute [Reflect] DOMString width;
     23        attribute [ConvertNullToNullString] DOMString align;
     24        attribute boolean noShade;
     25        attribute [ConvertNullToNullString] DOMString size;
     26        attribute [ConvertNullToNullString] DOMString width;
    2727    };
    2828

  • trunk/WebCore/html/HTMLHeadElement.idl

    r61379 r61384  
    11/*
    2  * Copyright (C) 2006, 2010 Apple Inc. All rights reserved.
     2 * Copyright (C) 2006 Apple Computer, Inc.
    33 *
    44 * This library is free software; you can redistribute it and/or
    … …  
    2121
    2222    interface HTMLHeadElement : HTMLElement {
    23         attribute [Reflect] DOMString profile;
     23        attribute  [ConvertNullToNullString] DOMString            profile;
    2424    };
    2525

  • trunk/WebCore/html/HTMLHeadingElement.idl

    r61379 r61384  
    11/*
    2  * Copyright (C) 2006, 2010 Apple Inc. All rights reserved.
     2 * Copyright (C) 2006 Apple Computer, Inc.
    33 *
    44 * This library is free software; you can redistribute it and/or
    … …  
    2121
    2222    interface HTMLHeadingElement : HTMLElement {
    23         attribute [Reflect] DOMString align;
     23        attribute [ConvertNullToNullString] DOMString align;
    2424    };
    2525

  • trunk/WebCore/html/HTMLHtmlElement.idl

    r61379 r61384  
    11/*
    2  * Copyright (C) 2006, 2010 Apple Inc. All rights reserved.
     2 * Copyright (C) 2006 Apple Computer, Inc.
    33 *
    44 * This library is free software; you can redistribute it and/or
    … …  
    2121
    2222    interface HTMLHtmlElement : HTMLElement {
    23         attribute [Reflect] DOMString version;
     23
     24        attribute [ConvertNullToNullString] DOMString version;
     25
    2426    };
    2527

  • trunk/WebCore/html/HTMLIFrameElement.idl

    r61379 r61384  
    11/*
    2  * Copyright (C) 2006, 2007, 2009, 2010 Apple Inc. All rights reserved.
     2 * Copyright (C) 2006, 2007, 2009 Apple Inc. All rights reserved.
    33 * Copyright (C) 2006 Samuel Weinig <sam.weinig@gmail.com>
    44 *
    … …  
    2222
    2323    interface HTMLIFrameElement : HTMLElement {
    24         attribute [Reflect] DOMString align;
    25         attribute [Reflect] DOMString frameBorder;
    26         attribute [Reflect] DOMString height;
    27         attribute [Reflect] DOMString longDesc;
    28         attribute [Reflect] DOMString marginHeight;
    29         attribute [Reflect] DOMString marginWidth;
    30         attribute [Reflect] DOMString name;
    31         attribute [Reflect] DOMString sandbox;
    32         attribute [Reflect] DOMString scrolling;
    33         attribute [CustomSetter, Reflect] DOMString src;
    34         attribute [Reflect] DOMString width;
     24
     25                 attribute [ConvertNullToNullString, Reflect] DOMString       align;
     26                 attribute [ConvertNullToNullString, Reflect=frameborder] DOMString       frameBorder;
     27                 attribute [ConvertNullToNullString, Reflect] DOMString       height;
     28                 attribute [ConvertNullToNullString, Reflect=longdesc] DOMString       longDesc;
     29                 attribute [ConvertNullToNullString, Reflect=marginheight] DOMString       marginHeight;
     30                 attribute [ConvertNullToNullString, Reflect=marginwidth] DOMString       marginWidth;
     31                 attribute [ConvertNullToNullString, Reflect] DOMString       name;
     32                 attribute [ConvertNullToNullString, Reflect] DOMString       sandbox;
     33                 attribute [ConvertNullToNullString, Reflect] DOMString       scrolling;
     34                 attribute [ConvertNullToNullString, CustomSetter, Reflect] DOMString       src;
     35                 attribute [ConvertNullToNullString, Reflect] DOMString       width;
    3536
    3637        // Introduced in DOM Level 2:
    37         readonly attribute [CheckFrameSecurity] Document contentDocument;
     38        readonly attribute [CheckFrameSecurity] Document        contentDocument;
    3839
    3940        // Extensions
    … …  
    4647#endif
    4748#endif
     49
    4850    };
    4951

  • trunk/WebCore/html/HTMLImageElement.idl

    r61379 r61384  
    11/*
    2  * Copyright (C) 2006, 2009, 2010 Apple Inc. All rights reserved.
     2 * Copyright (C) 2006, 2009 Apple Inc. All rights reserved.
    33 * Copyright (C) 2006 Samuel Weinig <sam.weinig@gmail.com>
    44 *
    … …  
    2424        GenerateNativeConverter
    2525    ] HTMLImageElement : HTMLElement {
    26         attribute [Reflect] DOMString name;
    27         attribute [Reflect] DOMString align;
    28         attribute [Reflect] DOMString alt;
    29         attribute [Reflect] DOMString border;       
    30         attribute [Reflect] long height;
    31         attribute [Reflect] long hspace;
    32         attribute [Reflect] boolean isMap;
    33         attribute [ReflectURL=longdesc] DOMString longDesc;
    34         attribute [ReflectURL] DOMString src;
    35         attribute [Reflect] DOMString useMap;
    36         attribute [Reflect] long vspace;
    37         attribute [Reflect] long width;
     26                 attribute [ConvertNullToNullString, Reflect] DOMString name;
     27                 attribute [ConvertNullToNullString, Reflect] DOMString align;
     28                 attribute [ConvertNullToNullString, Reflect] DOMString alt;
     29                 attribute [ConvertNullToNullString, Reflect] DOMString border;       
     30                 attribute long height;
     31                 attribute long hspace;
     32                 attribute boolean isMap;
     33                 attribute [ConvertNullToNullString, ReflectURL=longdesc] DOMString longDesc;
     34                 attribute [ConvertNullToNullString, ReflectURL] DOMString src;
     35                 attribute [ConvertNullToNullString, Reflect=usemap] DOMString useMap;
     36                 attribute long vspace;
     37                 attribute long width;
    3838       
    3939        // Extensions
    4040        readonly attribute boolean complete;
    41         attribute [ReflectURL] DOMString lowsrc;
     41                 attribute [ConvertNullToNullString, ReflectURL] DOMString lowsrc;
    4242        readonly attribute long naturalHeight;
    4343        readonly attribute long naturalWidth;

  • trunk/WebCore/html/HTMLInputElement.idl

    r61379 r61384  
    11/*
    2  * Copyright (C) 2006, 2010 Apple Inc. All rights reserved.
     2 * Copyright (C) 2006 Apple Computer, Inc.
    33 * Copyright (C) 2006 Samuel Weinig <sam.weinig@gmail.com>
    44 *
    … …  
    2222
    2323    interface HTMLInputElement : HTMLElement {
    24         attribute [ConvertNullToNullString] DOMString defaultValue;
    25         attribute [Reflect=checked] boolean defaultChecked;
     24                 attribute [ConvertNullToNullString] DOMString defaultValue;
     25                 attribute boolean        defaultChecked;
    2626        readonly attribute HTMLFormElement form;
    27         attribute [Reflect] boolean formNoValidate;
    28         readonly attribute ValidityState validity;
    29         attribute [Reflect] DOMString accept;
    30         attribute [Reflect] DOMString accessKey;
    31         attribute [Reflect] DOMString align;
    32         attribute [Reflect] DOMString alt;
    33         attribute boolean checked;
    34         attribute [Reflect] boolean disabled;
    35         attribute [Reflect] boolean autofocus;
     27                 attribute boolean        formNoValidate;
     28        readonly attribute ValidityState   validity;
     29                 attribute [ConvertNullToNullString] DOMString accept;
     30                 attribute [ConvertNullToNullString] DOMString accessKey;
     31                 attribute [ConvertNullToNullString] DOMString align;
     32                 attribute [ConvertNullToNullString] DOMString alt;
     33                 attribute boolean        checked;
     34                 attribute boolean        disabled;
     35                 attribute boolean        autofocus;
    3636#if defined(ENABLE_DATALIST) && ENABLE_DATALIST
    3737        readonly attribute HTMLElement     list;
    3838#endif
    39         attribute [Reflect] DOMString max;
    40         attribute long maxLength setter raises(DOMException);
    41         attribute [Reflect] DOMString min;
    42         attribute [Reflect] boolean multiple;
    43         attribute [Reflect] DOMString name;
    44         attribute [Reflect] DOMString pattern;
    45         attribute [Reflect] DOMString placeholder;
    46         attribute [Reflect] boolean readOnly;
    47         attribute [Reflect] boolean required;
     39                 attribute [ConvertNullToNullString, Reflect] DOMString max;
     40                 attribute long            maxLength
     41                     setter raises(DOMException);
     42                 attribute [ConvertNullToNullString, Reflect] DOMString min;
     43                 attribute boolean         multiple;
     44                 attribute [ConvertNullToNullString] DOMString name;
     45                 attribute [ConvertNullToNullString, Reflect] DOMString pattern;
     46                 attribute DOMString       placeholder;
     47                 attribute boolean         readOnly;
     48                 attribute boolean         required;
    4849#if defined(LANGUAGE_OBJECTIVE_C) && LANGUAGE_OBJECTIVE_C
    49         attribute [ConvertToString] DOMString size; // DOM level 2 changed this to a long, but our existing API is a string
     50                 attribute [ConvertToString] DOMString size; // DOM level 2 changed this to a long, but our existing API is a string
    5051#else
    51         // FIXME: The spec says this should be a long, not an unsigned long.
    52         attribute unsigned long size; // Changed string -> long as part of DOM level 2
     52                 // FIXME: the spec says this should be a long, not an unsigned long
     53                 attribute unsigned long  size; // Changed string -> long as part of DOM level 2
    5354#endif
    54         attribute [ReflectURL] DOMString src;
    55         attribute [Reflect] DOMString step;
    56         attribute [ConvertNullToNullString, JSCCustomGetter] DOMString type; // readonly dropped as part of DOM level 2
    57         attribute [Reflect] DOMString useMap;
    58         attribute [ConvertNullToNullString] DOMString value;
     55                 attribute [ConvertNullToNullString] DOMString src;
     56                 attribute [ConvertNullToNullString, Reflect] DOMString step;
     57                 attribute [ConvertNullToNullString, JSCCustomGetter] DOMString type; // readonly dropped as part of DOM level 2
     58                 attribute [ConvertNullToNullString] DOMString useMap;
     59                 attribute [ConvertNullToNullString] DOMString value;
    5960#if !defined(LANGUAGE_CPP) || !LANGUAGE_CPP
    60         attribute Date valueAsDate setter raises(DOMException);
     61                 attribute Date            valueAsDate setter raises(DOMException);
    6162#endif
    62         attribute double valueAsNumber setter raises(DOMException);
     63                 attribute double          valueAsNumber setter raises(DOMException);
    6364#if defined(ENABLE_DATALIST) && ENABLE_DATALIST
    6465        readonly attribute HTMLOptionElement selectedOption;
    6566#endif
    6667
    67         void stepUp(in [Optional] long n) raises(DOMException);
    68         void stepDown(in [Optional] long n) raises(DOMException);
     68        void               stepUp(in [Optional] long n)
     69            raises(DOMException);
     70        void               stepDown(in [Optional] long n)
     71            raises(DOMException);
    6972
    70         readonly attribute boolean willValidate;
    71         readonly attribute DOMString validationMessage;
    72         boolean checkValidity();
    73         void setCustomValidity(in [ConvertUndefinedOrNullToNullString] DOMString error);
    74         void select();
    75         void click();
     73        readonly attribute boolean         willValidate;
     74        readonly attribute DOMString       validationMessage;
     75        boolean            checkValidity();
     76        void               setCustomValidity(in [ConvertUndefinedOrNullToNullString] DOMString error);
     77        void               select();
     78        void               click();
    7679
    7780#if !defined(LANGUAGE_JAVASCRIPT) || !LANGUAGE_JAVASCRIPT
    78         void setValueForUser(in [ConvertNullToNullString] DOMString value);
     81        void               setValueForUser(in [ConvertNullToNullString] DOMString value);
    7982#endif
    8083
    8184        // WinIE extension:
    82         attribute boolean indeterminate;
     85                 attribute boolean        indeterminate;
    8386
    8487        // WinIE & FireFox extension:
    8588
    86         attribute [Custom] long selectionStart;
    87         attribute [Custom] long selectionEnd;
     89                 attribute [Custom] long selectionStart;
     90                 attribute [Custom] long selectionEnd;
    8891        [Custom] void setSelectionRange(in long start, in long end);
    8992
    9093#if defined(LANGUAGE_OBJECTIVE_C)
    9194        // Objective-C extension:
    92         readonly attribute DOMString altDisplayString;
    93         readonly attribute URL absoluteImageURL;
     95        readonly attribute DOMString       altDisplayString;
     96        readonly attribute URL             absoluteImageURL;
    9497#endif
    9598
    9699        readonly attribute FileList files;
    97         readonly attribute NodeList labels;
     100        readonly attribute  NodeList      labels;
    98101    };
    99102

  • trunk/WebCore/html/HTMLIsIndexElement.idl

    r61379 r61384  
    11/*
    2  * Copyright (C) 2006, 2010 Apple Inc. All rights reserved.
     2 * Copyright (C) 2006 Apple Computer, Inc.
    33 *
    44 * This library is free software; you can redistribute it and/or
    … …  
    2222    interface HTMLIsIndexElement : HTMLInputElement {
    2323        readonly attribute HTMLFormElement form;
    24         attribute [Reflect] DOMString prompt;
     24        attribute [ConvertNullToNullString] DOMString prompt;
    2525    };
    2626

  • trunk/WebCore/html/HTMLLIElement.idl

    r61379 r61384  
    11/*
    2  * Copyright (C) 2006, 2010 Apple Inc. All rights reserved.
     2 * Copyright (C) 2006 Apple Computer, Inc.
    33 *
    44 * This library is free software; you can redistribute it and/or
    … …  
    2121
    2222    interface HTMLLIElement : HTMLElement {
    23         attribute [Reflect] DOMString type;
    24         attribute [Reflect] long value;   
     23        attribute [ConvertNullToNullString] DOMString type;
     24        attribute long value;   
    2525    };
    2626

  • trunk/WebCore/html/HTMLLabelElement.idl

    r61379 r61384  
    11/*
    2  * Copyright (C) 2006, 2010 Apple Inc. All rights reserved.
     2 * Copyright (C) 2006 Apple Computer, Inc.
    33 * Copyright (C) 2006 Samuel Weinig <sam.weinig@gmail.com>
    44 *
    … …  
    2323    interface HTMLLabelElement : HTMLElement {
    2424        readonly attribute HTMLFormElement form;
    25         attribute [Reflect] DOMString accessKey;
    26         attribute [Reflect=for] DOMString htmlFor;
     25        attribute [ConvertNullToNullString] DOMString accessKey;
     26        attribute [ConvertNullToNullString] DOMString htmlFor;
    2727        readonly attribute HTMLElement control;
    2828    };

  • trunk/WebCore/html/HTMLLegendElement.idl

    r61379 r61384  
    11/*
    2  * Copyright (C) 2006, 2010 Apple Inc. All rights reserved.
     2 * Copyright (C) 2006 Apple Computer, Inc.
    33 * Copyright (C) 2006 Samuel Weinig <sam.weinig@gmail.com>
    44 *
    … …  
    2323    interface HTMLLegendElement : HTMLElement {
    2424        readonly attribute HTMLFormElement form;
    25         attribute [Reflect] DOMString accessKey;
    26         attribute [Reflect] DOMString align;
     25        attribute [ConvertNullToNullString] DOMString accessKey;
     26        attribute [ConvertNullToNullString] DOMString align;
    2727    };
    2828

  • trunk/WebCore/html/HTMLLinkElement.idl

    r61379 r61384  
    11/*
    2  * Copyright (C) 2006, 2010 Apple Inc. All rights reserved.
     2 * Copyright (C) 2006 Apple Computer, Inc.
    33 * Copyright (C) 2006 Samuel Weinig <sam.weinig@gmail.com>
    44 *
    … …  
    2222
    2323    interface HTMLLinkElement : HTMLElement {
    24         attribute [Reflect] boolean disabled;
    25         attribute [Reflect] DOMString charset;
    26         attribute [ReflectURL] DOMString href;
    27         attribute [Reflect] DOMString hreflang;
    28         attribute [Reflect] DOMString media;
    29         attribute [Reflect] DOMString rel;
    30         attribute [Reflect] DOMString rev;
    31         attribute [Reflect] DOMString target;
    32         attribute [Reflect] DOMString type;
     24        attribute  boolean              disabled;
     25        attribute  [ConvertNullToNullString] DOMString            charset;
     26        attribute  [ConvertNullToNullString] DOMString            href;
     27        attribute  [ConvertNullToNullString] DOMString            hreflang;
     28        attribute  [ConvertNullToNullString] DOMString            media;
     29        attribute  [ConvertNullToNullString] DOMString            rel;
     30        attribute  [ConvertNullToNullString] DOMString            rev;
     31        attribute  [ConvertNullToNullString] DOMString            target;
     32        attribute  [ConvertNullToNullString] DOMString            type;
    3333
    3434        // DOM Level 2 Style
    35         readonly attribute StyleSheet sheet;
     35        readonly attribute StyleSheet   sheet;
    3636
    3737#if defined(LANGUAGE_OBJECTIVE_C) && LANGUAGE_OBJECTIVE_C

  • trunk/WebCore/html/HTMLMapElement.idl

    r61379 r61384  
    11/*
    2  * Copyright (C) 2006, 2010 Apple Inc. All rights reserved.
     2 * Copyright (C) 2006 Apple Computer, Inc.
    33 * Copyright (C) 2006 Samuel Weinig <sam.weinig@gmail.com>
    44 *
    … …  
    2323    interface HTMLMapElement : HTMLElement {
    2424        readonly attribute HTMLCollection areas;
    25         attribute [Reflect] DOMString name;
     25        attribute [ConvertNullToNullString] DOMString name;
    2626    };
    2727

  • trunk/WebCore/html/HTMLMediaElement.idl

    r61379 r61384  
    11/*
    2  * Copyright (C) 2007, 2010 Apple Inc. All rights reserved.
     2 * Copyright (C) 2007 Apple Inc. All rights reserved.
    33 *
    44 * Redistribution and use in source and binary forms, with or without
    … …  
    3131
    3232    // network state
    33     attribute [ReflectURL] DOMString src;
     33    attribute DOMString src;
    3434    readonly attribute DOMString currentSrc;
    3535   
    … …  
    6767    readonly attribute TimeRanges seekable;
    6868    readonly attribute boolean ended;
    69     attribute [Reflect] boolean autoplay;
    70     attribute [Reflect] boolean loop;
     69    attribute boolean autoplay;
     70    attribute boolean loop;
    7171    [NeedsUserGestureCheck] void play();
    7272    [NeedsUserGestureCheck] void pause();

  • trunk/WebCore/html/HTMLMenuElement.idl

    r61379 r61384  
    11/*
    2  * Copyright (C) 2006, 2010 Apple Inc. All rights reserved.
     2 * Copyright (C) 2006 Apple Computer, Inc.
    33 *
    44 * This library is free software; you can redistribute it and/or
    … …  
    2121
    2222    interface HTMLMenuElement : HTMLElement {
    23         attribute [Reflect] boolean compact;
     23        attribute boolean compact;
    2424    };
    2525

  • trunk/WebCore/html/HTMLMetaElement.idl

    r61379 r61384  
    11/*
    2  * Copyright (C) 2006, 2010 Apple Inc. All rights reserved.
     2 * Copyright (C) 2006 Apple Computer, Inc.
    33 *
    44 * This library is free software; you can redistribute it and/or
    … …  
    2121
    2222    interface HTMLMetaElement : HTMLElement {
    23         attribute [Reflect] DOMString content;
    24         attribute [Reflect=http_equiv] DOMString httpEquiv;
    25         attribute [Reflect] DOMString name;
    26         attribute [Reflect] DOMString scheme;
     23        attribute  [ConvertNullToNullString] DOMString    content;
     24        attribute  [ConvertNullToNullString] DOMString    httpEquiv;
     25        attribute  [ConvertNullToNullString] DOMString    name;
     26        attribute  [ConvertNullToNullString] DOMString    scheme;
    2727    };
    2828

  • trunk/WebCore/html/HTMLModElement.idl

    r61379 r61384  
    11/*
    2  * Copyright (C) 2006, 2010 Apple Inc. All rights reserved.
     2 * Copyright (C) 2006 Apple Computer, Inc.
    33 *
    44 * This library is free software; you can redistribute it and/or
    … …  
    2121
    2222    interface HTMLModElement : HTMLElement {
    23         attribute [Reflect] DOMString cite;
    24         attribute [Reflect] DOMString dateTime;
     23        attribute [ConvertNullToNullString] DOMString cite;
     24        attribute [ConvertNullToNullString] DOMString dateTime;
    2525    };
    2626   

  • trunk/WebCore/html/HTMLOListElement.idl

    r61379 r61384  
    11/*
    2  * Copyright (C) 2006, 2010 Apple Inc. All rights reserved.
     2 * Copyright (C) 2006 Apple Computer, Inc.
    33 *
    44 * This library is free software; you can redistribute it and/or
    … …  
    2121
    2222    interface HTMLOListElement : HTMLElement {
    23         attribute [Reflect] boolean compact;
     23        attribute boolean compact;
    2424        attribute long start;
    25         attribute [Reflect] DOMString type;
     25        attribute [ConvertNullToNullString] DOMString type;
    2626    };
    2727

  • trunk/WebCore/html/HTMLObjectElement.idl

    r61379 r61384  
    11/*
    2  * Copyright (C) 2006, 2007, 2009, 2010 Apple Inc. All rights reserved.
     2 * Copyright (C) 2006, 2007, 2009 Apple Inc. All rights reserved.
    33 * Copyright (C) 2006 Samuel Weinig <sam.weinig@gmail.com>
    44 *
    … …  
    2727    ] HTMLObjectElement : HTMLElement {
    2828        readonly attribute HTMLFormElement form;
    29         attribute [Reflect] DOMString code;
    30         attribute [Reflect] DOMString align;
    31         attribute [Reflect] DOMString archive;
    32         attribute [Reflect] DOMString border;
    33         attribute [Reflect] DOMString codeBase;
    34         attribute [Reflect] DOMString codeType;
    35         attribute [ReflectURL] DOMString data;
    36         attribute [Reflect] boolean declare;
    37         attribute [Reflect] DOMString height;
    38         attribute [Reflect] long hspace;
    39         attribute [Reflect] DOMString name;
    40         attribute [Reflect] DOMString standby;
    41         attribute [Reflect] DOMString type;
    42         attribute [Reflect] DOMString useMap;
    43         attribute [Reflect] long vspace;
    44         attribute [Reflect] DOMString width;
    45         readonly attribute boolean willValidate;
     29                 attribute [ConvertNullToNullString, Reflect] DOMString      code;
     30                 attribute [ConvertNullToNullString, Reflect] DOMString      align;
     31                 attribute [ConvertNullToNullString, Reflect] DOMString      archive;
     32                 attribute [ConvertNullToNullString, Reflect] DOMString      border;
     33                 attribute [ConvertNullToNullString, Reflect=codebase] DOMString      codeBase;
     34                 attribute [ConvertNullToNullString, Reflect=codetype] DOMString      codeType;
     35                 attribute [ConvertNullToNullString, ReflectURL] DOMString      data;
     36                 attribute boolean        declare;
     37                 attribute [ConvertNullToNullString, Reflect] DOMString      height;
     38                 attribute long            hspace;
     39                 attribute [ConvertNullToNullString, Reflect] DOMString      name;
     40                 attribute [ConvertNullToNullString, Reflect] DOMString      standby;
     41                 attribute [ConvertNullToNullString, Reflect] DOMString      type;
     42                 attribute [ConvertNullToNullString, Reflect=usemap] DOMString      useMap;
     43                 attribute long            vspace;
     44                 attribute [ConvertNullToNullString, Reflect] DOMString      width;
     45        readonly attribute boolean         willValidate;
    4646
    4747        // Introduced in DOM Level 2:
    48         readonly attribute [CheckFrameSecurity] Document contentDocument;
     48        readonly attribute [CheckFrameSecurity] Document        contentDocument;
    4949
    5050#if defined(ENABLE_SVG) && ENABLE_SVG
    5151#if !defined(LANGUAGE_OBJECTIVE_C) || !LANGUAGE_OBJECTIVE_C || defined(ENABLE_SVG_DOM_OBJC_BINDINGS) && ENABLE_SVG_DOM_OBJC_BINDINGS
    52         [SVGCheckSecurityDocument] SVGDocument getSVGDocument() raises(DOMException);
     52        [SVGCheckSecurityDocument] SVGDocument getSVGDocument()
     53            raises(DOMException);
    5354#endif
    5455#endif
    … …  
    5657#if defined(LANGUAGE_OBJECTIVE_C) && LANGUAGE_OBJECTIVE_C
    5758        // Objective-C extension:
    58         readonly attribute URL absoluteImageURL;
     59        readonly attribute URL             absoluteImageURL;
    5960#endif
    6061    };

  • trunk/WebCore/html/HTMLOptGroupElement.idl

    r61379 r61384  
    11/*
    2  * Copyright (C) 2006, 2010 Apple Inc. All rights reserved.
     2 * Copyright (C) 2006 Apple Computer, Inc.
    33 *
    44 * This library is free software; you can redistribute it and/or
    … …  
    2121
    2222    interface HTMLOptGroupElement : HTMLElement {
    23         attribute [Reflect] boolean disabled;
    24         attribute [Reflect] DOMString label;
     23        attribute  boolean              disabled;
     24        attribute  [ConvertNullToNullString] DOMString            label;
    2525    };
    2626

  • trunk/WebCore/html/HTMLOptionElement.idl

    r61379 r61384  
    11/*
    2  * Copyright (C) 2006, 2007, 2010 Apple, Inc. All rights reserved.
     2 * Copyright (C) 2006, 2007 Apple, Inc.
    33 * Copyright (C) 2006 Samuel Weinig <sam.weinig@gmail.com>
    44 *
    … …  
    2424        GenerateNativeConverter
    2525    ] HTMLOptionElement : HTMLElement {
    26         readonly attribute HTMLFormElement form;
    27         attribute [Reflect=selected] boolean defaultSelected;
     26        readonly attribute  HTMLFormElement      form;
     27                 attribute  boolean              defaultSelected;
    2828#if defined(LANGUAGE_JAVASCRIPT) && LANGUAGE_JAVASCRIPT
    29         attribute [ConvertNullToNullString] DOMString text setter raises(DOMException);
     29                 attribute  [ConvertNullToNullString] DOMString            text
     30                     setter raises(DOMException);
    3031#else
    31         readonly attribute DOMString text;
     32        readonly attribute  DOMString            text;
    3233#endif
    33         readonly attribute long index;
    34         attribute [Reflect] boolean disabled;
    35         attribute [Reflect] DOMString label;
    36         attribute boolean selected;
    37         attribute [Reflect] DOMString value;
     34        readonly attribute  long                index;
     35                 attribute  boolean              disabled;
     36                 attribute  [ConvertNullToNullString] DOMString            label;
     37                 attribute  boolean              selected;
     38                 attribute  [ConvertNullToNullString] DOMString            value;
    3839    };
    3940

  • trunk/WebCore/html/HTMLParagraphElement.idl

    r61379 r61384  
    11/*
    2  * Copyright (C) 2006, 2010 Apple Inc. All rights reserved.
     2 * Copyright (C) 2006 Apple Computer, Inc.
    33 *
    44 * This library is free software; you can redistribute it and/or
    … …  
    2121
    2222    interface HTMLParagraphElement : HTMLElement {
    23         attribute [Reflect] DOMString align;
     23        attribute [ConvertNullToNullString] DOMString align;
    2424    };
    2525

  • trunk/WebCore/html/HTMLParamElement.idl

    r61379 r61384  
    11/*
    2  * Copyright (C) 2006, 2010 Apple Inc. All rights reserved.
     2 * Copyright (C) 2006 Apple Computer, Inc.
    33 *
    44 * This library is free software; you can redistribute it and/or
    … …  
    2121
    2222    interface HTMLParamElement : HTMLElement {
    23         attribute [Reflect] DOMString name;
    24         attribute [Reflect] DOMString type;
    25         attribute [Reflect] DOMString value;
    26         attribute [Reflect] DOMString valueType;
     23        attribute [ConvertNullToNullString] DOMString name;
     24        attribute [ConvertNullToNullString] DOMString type;
     25        attribute [ConvertNullToNullString] DOMString value;
     26        attribute [ConvertNullToNullString] DOMString valueType;
    2727    };
    2828

  • trunk/WebCore/html/HTMLPreElement.idl

    r61379 r61384  
    11/*
    2  * Copyright (C) 2006, 2010 Apple Inc. All right reserved.
     2 * Copyright (C) 2006 Apple Computer, Inc.
    33 * Copyright (C) 2006 Samuel Weinig <sam.weinig@gmail.com>
    44 *
    … …  
    2424        // FIXME: DOM spec says that width should be of type DOMString
    2525        // see http://bugs.webkit.org/show_bug.cgi?id=8992
    26         attribute [Reflect] long width;
     26        attribute long width;
    2727       
    2828        // Extensions
    29         attribute [Reflect] boolean wrap;
     29        attribute boolean wrap;
    3030    };
    3131

  • trunk/WebCore/html/HTMLQuoteElement.idl

    r61379 r61384  
    11/*
    2  * Copyright (C) 2006, 2010 Apple Inc. All rights reserved.
     2 * Copyright (C) 2006 Apple Computer, Inc.
    33 *
    44 * This library is free software; you can redistribute it and/or
    … …  
    2121
    2222    interface HTMLQuoteElement : HTMLElement {
    23         attribute [Reflect] DOMString cite;
     23        attribute [ConvertNullToNullString] DOMString cite;
    2424    };
    2525}

  • trunk/WebCore/html/HTMLScriptElement.idl

    r61379 r61384  
    11/*
    2  * Copyright (C) 2006, 2010 Apple Inc. All rights reserved.
     2 * Copyright (C) 2006 Apple Computer, Inc.
    33 *
    44 * This library is free software; you can redistribute it and/or
    … …  
    2222    interface HTMLScriptElement : HTMLElement {
    2323        attribute [ConvertNullToNullString] DOMString text;
    24         attribute [Reflect=for] DOMString htmlFor;
    25         attribute [Reflect] DOMString event;
    26         attribute [Reflect] DOMString charset;
    27         attribute [Reflect] boolean defer;
    28         attribute [ReflectURL] DOMString src;
    29         attribute [Reflect] DOMString type;
     24        attribute [ConvertNullToNullString] DOMString htmlFor;
     25        attribute [ConvertNullToNullString] DOMString event;
     26        attribute [ConvertNullToNullString] DOMString charset;
     27        attribute boolean defer;
     28        attribute [ConvertNullToNullString] DOMString src;
     29        attribute [ConvertNullToNullString] DOMString type;
    3030    };
    3131}

  • trunk/WebCore/html/HTMLStyleElement.idl

    r61379 r61384  
    11/*
    2  * Copyright (C) 2006, 2010 Apple Inc. All rights reserved.
     2 * Copyright (C) 2006 Apple Computer, Inc.
    33 * Copyright (C) 2006 Samuel Weinig <sam.weinig@gmail.com>
    44 *
    … …  
    2222
    2323    interface HTMLStyleElement : HTMLElement {
    24         attribute boolean disabled;
    25         attribute [Reflect] DOMString media;
    26         attribute [Reflect] DOMString type;
     24        attribute  boolean              disabled;
     25        attribute  [ConvertNullToNullString] DOMString            media;
     26        attribute  [ConvertNullToNullString] DOMString            type;
    2727
    2828        // DOM Level 2 Style

  • trunk/WebCore/html/HTMLTableCaptionElement.idl

    r61379 r61384  
    11/*
    2  * Copyright (C) 2006, 2007, 2010 Apple Inc. All rights reserved.
     2 * Copyright (C) 2006, 2007 Apple Inc.
    33 * Copyright (C) 2006 Samuel Weinig <sam.weinig@gmail.com>
    44 *
    … …  
    2424        GenerateNativeConverter
    2525    ] HTMLTableCaptionElement : HTMLElement {
    26         attribute [Reflect] DOMString align;
     26
     27        attribute [ConvertNullToNullString] DOMString       align;
     28
    2729    };
    2830

  • trunk/WebCore/html/HTMLTableCellElement.idl

    r61379 r61384  
    11/*
    2  * Copyright (C) 2006, 2007, 2010 Apple Inc. All rights reserved.
     2 * Copyright (C) 2006, 2007 Apple Inc.
    33 * Copyright (C) 2006 Samuel Weinig <sam.weinig@gmail.com>
    44 *
    … …  
    2222
    2323    interface HTMLTableCellElement : HTMLElement {
    24         readonly attribute long cellIndex;
    25         attribute [Reflect] DOMString abbr;
    26         attribute [Reflect] DOMString align;
    27         attribute [Reflect] DOMString axis;
    28         attribute [Reflect] DOMString bgColor;
    29         attribute [Reflect=char] DOMString ch;
    30         attribute [Reflect=charoff] DOMString chOff;
    31         attribute long colSpan;
    32         attribute [Reflect] DOMString headers;
    33         attribute [Reflect] DOMString height;
    34         attribute boolean noWrap;
    35         attribute long rowSpan;
    36         attribute [Reflect] DOMString scope;
    37         attribute [Reflect] DOMString vAlign;
    38         attribute [Reflect] DOMString width;
     24
     25        readonly attribute long            cellIndex;
     26                 attribute [ConvertNullToNullString] DOMString       abbr;
     27                 attribute [ConvertNullToNullString] DOMString       align;
     28                 attribute [ConvertNullToNullString] DOMString       axis;
     29                 attribute [ConvertNullToNullString] DOMString       bgColor;
     30                 attribute [ConvertNullToNullString] DOMString       ch;
     31                 attribute [ConvertNullToNullString] DOMString       chOff;
     32                 attribute long            colSpan;
     33                 attribute [ConvertNullToNullString] DOMString       headers;
     34                 attribute [ConvertNullToNullString] DOMString       height;
     35                 attribute boolean         noWrap;
     36                 attribute long            rowSpan;
     37                 attribute [ConvertNullToNullString] DOMString       scope;
     38                 attribute [ConvertNullToNullString] DOMString       vAlign;
     39                 attribute [ConvertNullToNullString] DOMString       width;
     40
    3941    };
    4042

  • trunk/WebCore/html/HTMLTableColElement.idl

    r61379 r61384  
    11/*
    2  * Copyright (C) 2006, 2007, 2010 Apple Inc. All rights reserved.
     2 * Copyright (C) 2006, 2007 Apple Inc.
    33 * Copyright (C) 2006 Samuel Weinig <sam.weinig@gmail.com>
    44 *
    … …  
    2222
    2323    interface HTMLTableColElement : HTMLElement {
    24         attribute [Reflect] DOMString align;
    25         attribute [Reflect=char] DOMString ch;
    26         attribute [Reflect=charoff] DOMString chOff;
    27         attribute long span;
    28         attribute [Reflect] DOMString vAlign;
    29         attribute [Reflect] DOMString width;
     24
     25        attribute [ConvertNullToNullString] DOMString       align;
     26        attribute [ConvertNullToNullString] DOMString       ch;
     27        attribute [ConvertNullToNullString] DOMString       chOff;
     28        attribute long            span;
     29        attribute [ConvertNullToNullString] DOMString       vAlign;
     30        attribute [ConvertNullToNullString] DOMString       width;
     31
    3032    };
    3133

  • trunk/WebCore/html/HTMLTableElement.idl

    r61379 r61384  
    11/*
    2  * Copyright (C) 2006, 2007, 2010 Apple Inc. All rights reserved.
     2 * Copyright (C) 2006, 2007 Apple Inc.
    33 * Copyright (C) 2006 Samuel Weinig <sam.weinig@gmail.com>
    44 *
    … …  
    2222
    2323    interface HTMLTableElement : HTMLElement {
    24         attribute HTMLTableCaptionElement caption setter raises(DOMException);
    25         attribute HTMLTableSectionElement tHead setter raises(DOMException);
    26         attribute HTMLTableSectionElement tFoot setter raises(DOMException);
     24
     25        // could raise excepetions on setting.
     26                 attribute HTMLTableCaptionElement caption
     27                     setter raises(DOMException);
     28                 attribute HTMLTableSectionElement tHead
     29                     setter raises(DOMException);
     30                 attribute HTMLTableSectionElement tFoot
     31                     setter raises(DOMException);
    2732
    2833        readonly attribute HTMLCollection rows;
    2934        readonly attribute HTMLCollection tBodies;
    30         attribute [Reflect] DOMString align;
    31         attribute [Reflect] DOMString bgColor;
    32         attribute [Reflect] DOMString border;
    33         attribute [Reflect] DOMString cellPadding;
    34         attribute [Reflect] DOMString cellSpacing;
     35                 attribute [ConvertNullToNullString] DOMString align;
     36                 attribute [ConvertNullToNullString] DOMString bgColor;
     37                 attribute [ConvertNullToNullString] DOMString border;
     38                 attribute [ConvertNullToNullString] DOMString cellPadding;
     39                 attribute [ConvertNullToNullString] DOMString cellSpacing;
    3540
    36         attribute [Reflect] DOMString frame;
     41        // FIXME: the obj-c attribute is called frameBorders
     42                 attribute [ConvertNullToNullString] DOMString frame;
    3743
    38         attribute [Reflect] DOMString rules;
    39         attribute [Reflect] DOMString summary;
    40         attribute [Reflect] DOMString width;
     44                 attribute [ConvertNullToNullString] DOMString rules;
     45                 attribute [ConvertNullToNullString] DOMString summary;
     46                 attribute [ConvertNullToNullString] DOMString width;
    4147
    42         HTMLElement createTHead();
    43         void deleteTHead();
     48        HTMLElement        createTHead();
     49        void               deleteTHead();
    4450        HTMLElement        createTFoot();
    45         void deleteTFoot();
    46         HTMLElement createCaption();
    47         void deleteCaption();
     51        void               deleteTFoot();
     52        HTMLElement        createCaption();
     53        void               deleteCaption();
    4854
    49         HTMLElement insertRow(in long index) raises(DOMException);
    50         void deleteRow(in long index) raises(DOMException);
     55        HTMLElement insertRow(in long index)
     56            raises(DOMException);
     57
     58        void deleteRow(in long index)
     59            raises(DOMException);
     60
    5161    };
    5262

  • trunk/WebCore/html/HTMLTableRowElement.idl

    r61379 r61384  
    11/*
    2  * Copyright (C) 2006, 2007, 2010 Apple Inc. ALl rights reserved.
     2 * Copyright (C) 2006, 2007 Apple Inc.
    33 * Copyright (C) 2006 Samuel Weinig <sam.weinig@gmail.com>
    44 *
    … …  
    2222
    2323    interface HTMLTableRowElement : HTMLElement {
    24         readonly attribute long rowIndex;
    25         readonly attribute long sectionRowIndex;
    26         readonly attribute HTMLCollection cells;
    27         attribute [Reflect] DOMString align;
    28         attribute [Reflect] DOMString bgColor;
    29         attribute [Reflect=char] DOMString ch;
    30         attribute [Reflect=charoff] DOMString chOff;
    31         attribute [Reflect] DOMString vAlign;
    32         HTMLElement insertCell(in long index) raises(DOMException);
    33         void deleteCell(in long index) raises(DOMException);
     24
     25        readonly attribute long            rowIndex;
     26        readonly attribute long            sectionRowIndex;
     27        readonly attribute HTMLCollection  cells;
     28                 attribute [ConvertNullToNullString] DOMString       align;
     29                 attribute [ConvertNullToNullString] DOMString       bgColor;
     30                 attribute [ConvertNullToNullString] DOMString       ch;
     31                 attribute [ConvertNullToNullString] DOMString       chOff;
     32                 attribute [ConvertNullToNullString] DOMString       vAlign;
     33
     34        HTMLElement        insertCell(in long index)
     35            raises(DOMException);
     36        void               deleteCell(in long index)
     37            raises(DOMException);
     38
    3439    };
    3540

  • trunk/WebCore/html/HTMLTableSectionElement.idl

    r61379 r61384  
    11/*
    2  * Copyright (C) 2006, 2007, 2010 Apple Inc. All rights reserved.
     2 * Copyright (C) 2006, 2007 Apple Inc.
    33 * Copyright (C) 2006 Samuel Weinig <sam.weinig@gmail.com>
    44 *
    … …  
    2424        GenerateNativeConverter
    2525    ] HTMLTableSectionElement : HTMLElement {
    26         attribute [Reflect] DOMString align;
    27         attribute [Reflect=char] DOMString ch;
    28         attribute [Reflect=charoff] DOMString chOff;
    29         attribute [Reflect] DOMString vAlign;
    30         readonly attribute HTMLCollection rows;
    31         HTMLElement insertRow(in long index) raises(DOMException);
    32         void deleteRow(in long index) raises(DOMException);
     26
     27                 attribute [ConvertNullToNullString] DOMString       align;
     28                 attribute [ConvertNullToNullString] DOMString       ch;
     29                 attribute [ConvertNullToNullString] DOMString       chOff;
     30                 attribute [ConvertNullToNullString] DOMString       vAlign;
     31        readonly attribute HTMLCollection  rows;
     32
     33        HTMLElement        insertRow(in long index)
     34            raises(DOMException);
     35        void               deleteRow(in long index)
     36            raises(DOMException);
     37
    3338    };
    3439

  • trunk/WebCore/html/HTMLTextAreaElement.idl

    r61379 r61384  
    11/*
    2  * Copyright (C) 2006, 2010 Apple Inc. All rights reserved.
     2 * Copyright (C) 2006 Apple Computer, Inc.
    33 * Copyright (C) 2006 Samuel Weinig <sam.weinig@gmail.com>
    44 *
    … …  
    2222
    2323    interface HTMLTextAreaElement : HTMLElement {
    24         attribute [ConvertNullToNullString] DOMString defaultValue;
    25         readonly attribute  HTMLFormElement form;
    26         readonly attribute  ValidityState validity;
    27         attribute DOMString accessKey;
    28         attribute long cols;
    29         attribute boolean disabled;
    30         attribute boolean autofocus;
    31         attribute long maxLength setter raises(DOMException);
    32         attribute [ConvertNullToNullString] DOMString name;
    33         attribute [Reflect] DOMString placeholder;
    34         attribute boolean readOnly;
    35         attribute  boolean required;
    36         attribute long rows;
    37         readonly attribute  DOMString type;
    38         attribute [ConvertNullToNullString] DOMString value;
    39         readonly attribute  unsigned long textLength;
     24                 attribute  [ConvertNullToNullString] DOMString            defaultValue;
     25        readonly attribute  HTMLFormElement      form;
     26        readonly attribute  ValidityState        validity;
     27                 attribute  [ConvertNullToNullString] DOMString            accessKey;
     28                 attribute  long                 cols;
     29                 attribute  boolean              disabled;
     30                 attribute  boolean              autofocus;
     31                 attribute  long                 maxLength
     32                     setter raises(DOMException);
     33                 attribute  [ConvertNullToNullString] DOMString            name;
     34                 attribute  [ConvertNullToNullString, Reflect] DOMString   placeholder;
     35                 attribute  boolean              readOnly;
     36                 attribute  boolean              required;
     37                 attribute  long                 rows;
     38        readonly attribute  DOMString            type;
     39                 attribute  [ConvertNullToNullString] DOMString            value;
     40        readonly attribute  unsigned long        textLength;
    4041       
    41         void select();
     42        void     select();
    4243
    43         readonly attribute boolean willValidate;
    44         readonly attribute DOMString validationMessage;
    45         boolean checkValidity();
    46         void setCustomValidity(in [ConvertUndefinedOrNullToNullString] DOMString error);
     44        readonly attribute boolean         willValidate;
     45        readonly attribute DOMString       validationMessage;
     46        boolean  checkValidity();
     47        void     setCustomValidity(in [ConvertUndefinedOrNullToNullString] DOMString error);
    4748
    4849       // WinIE & FireFox extension:
    49         attribute long selectionStart;
    50         attribute long selectionEnd;
     50                 attribute long selectionStart;
     51                 attribute long selectionEnd;
    5152        void setSelectionRange(in long start, in long end);
    52         readonly attribute  NodeList labels;
     53        readonly attribute  NodeList              labels;
    5354    };
    5455

  • trunk/WebCore/html/HTMLUListElement.idl

    r61379 r61384  
    11/*
    2  * Copyright (C) 2006, 2010 Apple Inc. All rights reserved.
     2 * Copyright (C) 2006 Apple Computer, Inc.
    33 *
    44 * This library is free software; you can redistribute it and/or
    … …  
    2222    interface HTMLUListElement : HTMLElement {
    2323        attribute boolean compact;
    24         attribute [Reflect] DOMString type;
     24        attribute [ConvertNullToNullString] DOMString type;
    2525    };
    2626

  • trunk/WebCore/html/HTMLVideoElement.idl

    r61379 r61384  
    11/*
    2  * Copyright (C) 2007, 2010 Apple Inc. All rights reserved.
     2 * Copyright (C) 2007 Apple Inc. All rights reserved.
    33 *
    44 * Redistribution and use in source and binary forms, with or without
    … …  
    2929        GenerateNativeConverter
    3030    ] HTMLVideoElement : HTMLMediaElement {
    31         attribute [Reflect] unsigned long width;
    32         attribute [Reflect] unsigned long height;
     31        attribute unsigned long width;
     32        attribute unsigned long height;
    3333        readonly attribute unsigned long videoWidth;
    3434        readonly attribute unsigned long videoHeight;
    35         attribute [ConvertNullToNullString] DOMString poster;
     35                 attribute [ConvertNullToNullString] DOMString poster;
    3636
    3737        readonly attribute boolean webkitSupportsFullscreen;
    3838        readonly attribute boolean webkitDisplayingFullscreen;
    3939
    40         [NeedsUserGestureCheck] void webkitEnterFullscreen() raises (DOMException);
     40        [NeedsUserGestureCheck] void webkitEnterFullscreen()
     41            raises (DOMException);
    4142        void webkitExitFullscreen();
    4243   
    43         [NeedsUserGestureCheck] void webkitEnterFullScreen() raises (DOMException);
     44        [NeedsUserGestureCheck] void webkitEnterFullScreen()
     45            raises (DOMException);
    4446        void webkitExitFullScreen();
     47
    4548    };
    4649}

  • trunk/WebCore/svg/SVGElement.idl

    r61379 r61384  
    2424
    2525    interface [GenerateNativeConverter, Conditional=SVG] SVGElement : Element {
    26         attribute [Reflect] DOMString id setter raises(DOMException);
    27         attribute [ConvertNullToNullString] DOMString xmlbase setter raises(DOMException);
     26                 attribute [ConvertNullToNullString, Reflect] DOMString id
     27                     setter raises(DOMException);
     28                 attribute [ConvertNullToNullString] DOMString xmlbase
     29                     setter raises(DOMException);
    2830        readonly attribute SVGSVGElement ownerSVGElement;
    2931        readonly attribute SVGElement viewportElement;
Note: See TracChangeset for help on using the changeset viewer.