Changeset 107039 in webkit


Ignore:
Timestamp:
Feb 7, 2012 9:47:36 PM (12 years ago)
Author:
haraken@chromium.org
Message:

Rename [HasOverridingNameGetter] attribute to [CustomNamedGetter] attribute
​https://bugs.webkit.org/show_bug.cgi?id=78076

Reviewed by Adam Barth.

This patch renames the [HasOverridingNameGetter] attribute to the
[CustomNamedGetter] attribute, for naming consistency with [CustomNamedSetter].

Test: bindings/scripts/test/TestCustomNamedGetter.idl

  • bindings/scripts/CodeGeneratorJS.pm:

(GenerateGetOwnPropertySlotBody):
(GenerateGetOwnPropertyDescriptorBody):
(GenerateHeader):
(GenerateImplementation):

  • bindings/scripts/CodeGeneratorV8.pm:

(GenerateHeaderNamedAndIndexedPropertyAccessors):
(GenerateImplementationNamedPropertyGetter):

  • html/HTMLDocument.idl:
  • html/HTMLFormElement.idl:
  • html/HTMLFrameSetElement.idl:
  • bindings/scripts/test/TestCustomNamedGetter.idl: Renamed from Source/WebCore/bindings/scripts/test/TestOverridingNameGetter.idl.
  • bindings/scripts/test/CPP/WebDOMTestCustomNamedGetter.cpp: Updated run-bindings-tests results.

(WebDOMTestCustomNamedGetter::WebDOMTestCustomNamedGetterPrivate::WebDOMTestCustomNamedGetterPrivate):
(WebDOMTestCustomNamedGetter::WebDOMTestCustomNamedGetterPrivate):
(WebDOMTestCustomNamedGetter::WebDOMTestCustomNamedGetter):
(WebDOMTestCustomNamedGetter::operator=):
(WebDOMTestCustomNamedGetter::impl):
(WebDOMTestCustomNamedGetter::~WebDOMTestCustomNamedGetter):
(WebDOMTestCustomNamedGetter::anotherFunction):
(toWebCore):
(toWebKit):

  • bindings/scripts/test/CPP/WebDOMTestCustomNamedGetter.h: Ditto.

(WebCore):
(WebDOMTestCustomNamedGetter):

  • bindings/scripts/test/GObject/WebKitDOMTestCustomNamedGetter.cpp: Ditto.

(WebKit):
(WebKit::kit):
(webkit_dom_test_custom_named_getter_another_function):
(WebKit::core):
(webkit_dom_test_custom_named_getter_finalize):
(webkit_dom_test_custom_named_getter_set_property):
(webkit_dom_test_custom_named_getter_get_property):
(webkit_dom_test_custom_named_getter_constructed):
(webkit_dom_test_custom_named_getter_class_init):
(webkit_dom_test_custom_named_getter_init):
(WebKit::wrapTestCustomNamedGetter):

  • bindings/scripts/test/GObject/WebKitDOMTestCustomNamedGetter.h: Ditto.

(_WebKitDOMTestCustomNamedGetter):
(_WebKitDOMTestCustomNamedGetterClass):

  • bindings/scripts/test/GObject/WebKitDOMTestCustomNamedGetterPrivate.h: Ditto.

(WebKit):

  • bindings/scripts/test/GObject/WebKitDOMTestOverridingNameGetter.h: Ditto.
  • bindings/scripts/test/JS/JSTestCustomNamedGetter.cpp: Ditto.

(WebCore):
(WebCore::JSTestCustomNamedGetterConstructor::JSTestCustomNamedGetterConstructor):
(WebCore::JSTestCustomNamedGetterConstructor::finishCreation):
(WebCore::JSTestCustomNamedGetterConstructor::getOwnPropertySlot):
(WebCore::JSTestCustomNamedGetterConstructor::getOwnPropertyDescriptor):
(WebCore::JSTestCustomNamedGetterPrototype::self):
(WebCore::JSTestCustomNamedGetterPrototype::getOwnPropertySlot):
(WebCore::JSTestCustomNamedGetterPrototype::getOwnPropertyDescriptor):
(WebCore::JSTestCustomNamedGetter::JSTestCustomNamedGetter):
(WebCore::JSTestCustomNamedGetter::finishCreation):
(WebCore::JSTestCustomNamedGetter::createPrototype):
(WebCore::JSTestCustomNamedGetter::destroy):
(WebCore::JSTestCustomNamedGetter::getOwnPropertySlot):
(WebCore::JSTestCustomNamedGetter::getOwnPropertyDescriptor):
(WebCore::jsTestCustomNamedGetterConstructor):
(WebCore::JSTestCustomNamedGetter::getConstructor):
(WebCore::jsTestCustomNamedGetterPrototypeFunctionAnotherFunction):
(WebCore::isObservable):
(WebCore::JSTestCustomNamedGetterOwner::isReachableFromOpaqueRoots):
(WebCore::JSTestCustomNamedGetterOwner::finalize):
(WebCore::toJS):
(WebCore::toTestCustomNamedGetter):

  • bindings/scripts/test/JS/JSTestCustomNamedGetter.h: Ditto.

(WebCore):
(JSTestCustomNamedGetter):
(WebCore::JSTestCustomNamedGetter::create):
(WebCore::JSTestCustomNamedGetter::createStructure):
(WebCore::JSTestCustomNamedGetter::impl):
(WebCore::JSTestCustomNamedGetter::releaseImpl):
(WebCore::JSTestCustomNamedGetter::releaseImplIfNotNull):
(JSTestCustomNamedGetterOwner):
(WebCore::wrapperOwner):
(WebCore::wrapperContext):
(JSTestCustomNamedGetterPrototype):
(WebCore::JSTestCustomNamedGetterPrototype::create):
(WebCore::JSTestCustomNamedGetterPrototype::createStructure):
(WebCore::JSTestCustomNamedGetterPrototype::JSTestCustomNamedGetterPrototype):
(JSTestCustomNamedGetterConstructor):
(WebCore::JSTestCustomNamedGetterConstructor::create):
(WebCore::JSTestCustomNamedGetterConstructor::createStructure):

  • bindings/scripts/test/JS/JSTestOverridingNameGetter.cpp:
  • bindings/scripts/test/ObjC/DOMTestCustomNamedGetter.h: Ditto.
  • bindings/scripts/test/ObjC/DOMTestCustomNamedGetter.mm: Ditto.

(-[DOMTestCustomNamedGetter dealloc]):
(-[DOMTestCustomNamedGetter finalize]):
(-[DOMTestCustomNamedGetter anotherFunction:]):
(core):
(kit):

  • bindings/scripts/test/ObjC/DOMTestCustomNamedGetterInternal.h: Ditto.

(WebCore):

  • bindings/scripts/test/V8/V8TestCustomNamedGetter.cpp: Ditto.

(WebCore):
(TestCustomNamedGetterInternal):
(WebCore::TestCustomNamedGetterInternal::V8_USE):
(WebCore::TestCustomNamedGetterInternal::anotherFunctionCallback):
(WebCore::ConfigureV8TestCustomNamedGetterTemplate):
(WebCore::V8TestCustomNamedGetter::GetRawTemplate):
(WebCore::V8TestCustomNamedGetter::GetTemplate):
(WebCore::V8TestCustomNamedGetter::HasInstance):
(WebCore::V8TestCustomNamedGetter::wrapSlow):
(WebCore::V8TestCustomNamedGetter::derefObject):

  • bindings/scripts/test/V8/V8TestCustomNamedGetter.h: Ditto.

(WebCore):
(V8TestCustomNamedGetter):
(WebCore::V8TestCustomNamedGetter::toNative):
(WebCore::V8TestCustomNamedGetter::existingWrapper):
(WebCore::V8TestCustomNamedGetter::wrap):
(WebCore::toV8):

Location:
trunk/Source/WebCore
Files:
2 added
2 deleted
6 edited
11 moved

Legend:

Unmodified
Added
Removed

  • trunk/Source/WebCore/ChangeLog

    r107038 r107039  
     12012-02-07  Kentaro Hara  <haraken@chromium.org>
     2
     3        Rename [HasOverridingNameGetter] attribute to [CustomNamedGetter] attribute
     4        https://bugs.webkit.org/show_bug.cgi?id=78076
     5
     6        Reviewed by Adam Barth.
     7
     8        This patch renames the [HasOverridingNameGetter] attribute to the
     9        [CustomNamedGetter] attribute, for naming consistency with [CustomNamedSetter].
     10
     11        Test: bindings/scripts/test/TestCustomNamedGetter.idl
     12
     13        * bindings/scripts/CodeGeneratorJS.pm:
     14        (GenerateGetOwnPropertySlotBody):
     15        (GenerateGetOwnPropertyDescriptorBody):
     16        (GenerateHeader):
     17        (GenerateImplementation):
     18        * bindings/scripts/CodeGeneratorV8.pm:
     19        (GenerateHeaderNamedAndIndexedPropertyAccessors):
     20        (GenerateImplementationNamedPropertyGetter):
     21
     22        * html/HTMLDocument.idl:
     23        * html/HTMLFormElement.idl:
     24        * html/HTMLFrameSetElement.idl:
     25
     26        * bindings/scripts/test/TestCustomNamedGetter.idl: Renamed from Source/WebCore/bindings/scripts/test/TestOverridingNameGetter.idl.
     27
     28        * bindings/scripts/test/CPP/WebDOMTestCustomNamedGetter.cpp: Updated run-bindings-tests results.
     29        (WebDOMTestCustomNamedGetter::WebDOMTestCustomNamedGetterPrivate::WebDOMTestCustomNamedGetterPrivate):
     30        (WebDOMTestCustomNamedGetter::WebDOMTestCustomNamedGetterPrivate):
     31        (WebDOMTestCustomNamedGetter::WebDOMTestCustomNamedGetter):
     32        (WebDOMTestCustomNamedGetter::operator=):
     33        (WebDOMTestCustomNamedGetter::impl):
     34        (WebDOMTestCustomNamedGetter::~WebDOMTestCustomNamedGetter):
     35        (WebDOMTestCustomNamedGetter::anotherFunction):
     36        (toWebCore):
     37        (toWebKit):
     38        * bindings/scripts/test/CPP/WebDOMTestCustomNamedGetter.h: Ditto.
     39        (WebCore):
     40        (WebDOMTestCustomNamedGetter):
     41        * bindings/scripts/test/GObject/WebKitDOMTestCustomNamedGetter.cpp: Ditto.
     42        (WebKit):
     43        (WebKit::kit):
     44        (webkit_dom_test_custom_named_getter_another_function):
     45        (WebKit::core):
     46        (webkit_dom_test_custom_named_getter_finalize):
     47        (webkit_dom_test_custom_named_getter_set_property):
     48        (webkit_dom_test_custom_named_getter_get_property):
     49        (webkit_dom_test_custom_named_getter_constructed):
     50        (webkit_dom_test_custom_named_getter_class_init):
     51        (webkit_dom_test_custom_named_getter_init):
     52        (WebKit::wrapTestCustomNamedGetter):
     53        * bindings/scripts/test/GObject/WebKitDOMTestCustomNamedGetter.h: Ditto.
     54        (_WebKitDOMTestCustomNamedGetter):
     55        (_WebKitDOMTestCustomNamedGetterClass):
     56        * bindings/scripts/test/GObject/WebKitDOMTestCustomNamedGetterPrivate.h: Ditto.
     57        (WebKit):
     58        * bindings/scripts/test/GObject/WebKitDOMTestOverridingNameGetter.h: Ditto.
     59        * bindings/scripts/test/JS/JSTestCustomNamedGetter.cpp: Ditto.
     60        (WebCore):
     61        (WebCore::JSTestCustomNamedGetterConstructor::JSTestCustomNamedGetterConstructor):
     62        (WebCore::JSTestCustomNamedGetterConstructor::finishCreation):
     63        (WebCore::JSTestCustomNamedGetterConstructor::getOwnPropertySlot):
     64        (WebCore::JSTestCustomNamedGetterConstructor::getOwnPropertyDescriptor):
     65        (WebCore::JSTestCustomNamedGetterPrototype::self):
     66        (WebCore::JSTestCustomNamedGetterPrototype::getOwnPropertySlot):
     67        (WebCore::JSTestCustomNamedGetterPrototype::getOwnPropertyDescriptor):
     68        (WebCore::JSTestCustomNamedGetter::JSTestCustomNamedGetter):
     69        (WebCore::JSTestCustomNamedGetter::finishCreation):
     70        (WebCore::JSTestCustomNamedGetter::createPrototype):
     71        (WebCore::JSTestCustomNamedGetter::destroy):
     72        (WebCore::JSTestCustomNamedGetter::getOwnPropertySlot):
     73        (WebCore::JSTestCustomNamedGetter::getOwnPropertyDescriptor):
     74        (WebCore::jsTestCustomNamedGetterConstructor):
     75        (WebCore::JSTestCustomNamedGetter::getConstructor):
     76        (WebCore::jsTestCustomNamedGetterPrototypeFunctionAnotherFunction):
     77        (WebCore::isObservable):
     78        (WebCore::JSTestCustomNamedGetterOwner::isReachableFromOpaqueRoots):
     79        (WebCore::JSTestCustomNamedGetterOwner::finalize):
     80        (WebCore::toJS):
     81        (WebCore::toTestCustomNamedGetter):
     82        * bindings/scripts/test/JS/JSTestCustomNamedGetter.h: Ditto.
     83        (WebCore):
     84        (JSTestCustomNamedGetter):
     85        (WebCore::JSTestCustomNamedGetter::create):
     86        (WebCore::JSTestCustomNamedGetter::createStructure):
     87        (WebCore::JSTestCustomNamedGetter::impl):
     88        (WebCore::JSTestCustomNamedGetter::releaseImpl):
     89        (WebCore::JSTestCustomNamedGetter::releaseImplIfNotNull):
     90        (JSTestCustomNamedGetterOwner):
     91        (WebCore::wrapperOwner):
     92        (WebCore::wrapperContext):
     93        (JSTestCustomNamedGetterPrototype):
     94        (WebCore::JSTestCustomNamedGetterPrototype::create):
     95        (WebCore::JSTestCustomNamedGetterPrototype::createStructure):
     96        (WebCore::JSTestCustomNamedGetterPrototype::JSTestCustomNamedGetterPrototype):
     97        (JSTestCustomNamedGetterConstructor):
     98        (WebCore::JSTestCustomNamedGetterConstructor::create):
     99        (WebCore::JSTestCustomNamedGetterConstructor::createStructure):
     100        * bindings/scripts/test/JS/JSTestOverridingNameGetter.cpp:
     101        * bindings/scripts/test/ObjC/DOMTestCustomNamedGetter.h: Ditto.
     102        * bindings/scripts/test/ObjC/DOMTestCustomNamedGetter.mm: Ditto.
     103        (-[DOMTestCustomNamedGetter dealloc]):
     104        (-[DOMTestCustomNamedGetter finalize]):
     105        (-[DOMTestCustomNamedGetter anotherFunction:]):
     106        (core):
     107        (kit):
     108        * bindings/scripts/test/ObjC/DOMTestCustomNamedGetterInternal.h: Ditto.
     109        (WebCore):
     110        * bindings/scripts/test/V8/V8TestCustomNamedGetter.cpp: Ditto.
     111        (WebCore):
     112        (TestCustomNamedGetterInternal):
     113        (WebCore::TestCustomNamedGetterInternal::V8_USE):
     114        (WebCore::TestCustomNamedGetterInternal::anotherFunctionCallback):
     115        (WebCore::ConfigureV8TestCustomNamedGetterTemplate):
     116        (WebCore::V8TestCustomNamedGetter::GetRawTemplate):
     117        (WebCore::V8TestCustomNamedGetter::GetTemplate):
     118        (WebCore::V8TestCustomNamedGetter::HasInstance):
     119        (WebCore::V8TestCustomNamedGetter::wrapSlow):
     120        (WebCore::V8TestCustomNamedGetter::derefObject):
     121        * bindings/scripts/test/V8/V8TestCustomNamedGetter.h: Ditto.
     122        (WebCore):
     123        (V8TestCustomNamedGetter):
     124        (WebCore::V8TestCustomNamedGetter::toNative):
     125        (WebCore::V8TestCustomNamedGetter::existingWrapper):
     126        (WebCore::V8TestCustomNamedGetter::wrap):
     127        (WebCore::toV8):
     128
    11292012-02-07  Emil A Eklund  <eae@chromium.org>
    2130

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

    r106892 r107039  
    430430    };
    431431
    432     if (!$dataNode->extendedAttributes->{"HasOverridingNameGetter"}) {
     432    if (!$dataNode->extendedAttributes->{"CustomNamedGetter"}) {
    433433        &$manualLookupGetterGeneration();
    434434    }
    … …  
    454454    }
    455455
    456     if ($dataNode->extendedAttributes->{"NamedGetter"} || $dataNode->extendedAttributes->{"HasOverridingNameGetter"}) {
     456    if ($dataNode->extendedAttributes->{"NamedGetter"} || $dataNode->extendedAttributes->{"CustomNamedGetter"}) {
    457457        push(@getOwnPropertySlotImpl, "    if (canGetItemsForName(exec, static_cast<$implClassName*>(thisObject->impl()), propertyName)) {\n");
    458458        push(@getOwnPropertySlotImpl, "        slot.setCustom(thisObject, thisObject->nameGetter);\n");
    … …  
    466466    }
    467467
    468     if ($dataNode->extendedAttributes->{"HasOverridingNameGetter"}) {
     468    if ($dataNode->extendedAttributes->{"CustomNamedGetter"}) {
    469469        &$manualLookupGetterGeneration();
    470470    }
    … …  
    523523        }
    524524    };
    525    
    526     if (!$dataNode->extendedAttributes->{"HasOverridingNameGetter"}) {
     525
     526    if (!$dataNode->extendedAttributes->{"CustomNamedGetter"}) {
    527527        &$manualLookupGetterGeneration();
    528528    }
    529    
     529
    530530    if ($dataNode->extendedAttributes->{"IndexedGetter"} || $dataNode->extendedAttributes->{"HasNumericIndexGetter"}) {
    531531        push(@getOwnPropertyDescriptorImpl, "    bool ok;\n");
    … …  
    552552        push(@getOwnPropertyDescriptorImpl, "    }\n");
    553553    }
    554    
    555     if ($dataNode->extendedAttributes->{"NamedGetter"} || $dataNode->extendedAttributes->{"HasOverridingNameGetter"}) {
     554
     555    if ($dataNode->extendedAttributes->{"NamedGetter"} || $dataNode->extendedAttributes->{"CustomNamedGetter"}) {
    556556        push(@getOwnPropertyDescriptorImpl, "    if (canGetItemsForName(exec, static_cast<$implClassName*>(thisObject->impl()), propertyName)) {\n");
    557557        push(@getOwnPropertyDescriptorImpl, "        ${namespaceMaybe}PropertySlot slot;\n");
    … …  
    566566        }
    567567    }
    568    
    569     if ($dataNode->extendedAttributes->{"HasOverridingNameGetter"}) {
     568
     569    if ($dataNode->extendedAttributes->{"CustomNamedGetter"}) {
    570570        &$manualLookupGetterGeneration();
    571571    }
    572    
     572
    573573    if ($dataNode->extendedAttributes->{"DelegatingGetOwnPropertySlot"}) {
    574574        push(@getOwnPropertyDescriptorImpl, "    if (thisObject->getOwnPropertyDescriptorDelegate(exec, propertyName, descriptor))\n");
    575575        push(@getOwnPropertyDescriptorImpl, "        return true;\n");
    576576    }
    577    
     577
    578578    if ($hasAttributes) {
    579579        if ($inlined) {
    … …  
    754754    $implIncludes{"${className}Custom.h"} = 1 if !$dataNode->extendedAttributes->{"CustomHeader"} && ($dataNode->extendedAttributes->{"CustomPutFunction"} || $dataNode->extendedAttributes->{"DelegatingPutFunction"});
    755755
    756     my $hasGetter = $numAttributes > 0 
     756    my $hasGetter = $numAttributes > 0
    757757                 || !$dataNode->extendedAttributes->{"OmitConstructor"}
    758758                 || $dataNode->extendedAttributes->{"IndexedGetter"}
    … …  
    761761                 || $dataNode->extendedAttributes->{"DelegatingGetOwnPropertySlot"}
    762762                 || $dataNode->extendedAttributes->{"NamedGetter"}
    763                  || $dataNode->extendedAttributes->{"HasOverridingNameGetter"};
     763                 || $dataNode->extendedAttributes->{"CustomNamedGetter"};
    764764
    765765    # Getters
    … …  
    767767        push(@headerContent, "    static bool getOwnPropertySlot(JSC::JSCell*, JSC::ExecState*, const JSC::Identifier& propertyName, JSC::PropertySlot&);\n");
    768768        push(@headerContent, "    static bool getOwnPropertyDescriptor(JSC::JSObject*, JSC::ExecState*, const JSC::Identifier& propertyName, JSC::PropertyDescriptor&);\n");
    769         push(@headerContent, "    static bool getOwnPropertySlotByIndex(JSC::JSCell*, JSC::ExecState*, unsigned propertyName, JSC::PropertySlot&);\n") if ($dataNode->extendedAttributes->{"IndexedGetter"} || $dataNode->extendedAttributes->{"HasNumericIndexGetter"}) && !$dataNode->extendedAttributes->{"HasOverridingNameGetter"};
     769        push(@headerContent, "    static bool getOwnPropertySlotByIndex(JSC::JSCell*, JSC::ExecState*, unsigned propertyName, JSC::PropertySlot&);\n") if ($dataNode->extendedAttributes->{"IndexedGetter"} || $dataNode->extendedAttributes->{"HasNumericIndexGetter"}) && !$dataNode->extendedAttributes->{"CustomNamedGetter"};
    770770        push(@headerContent, "    bool getOwnPropertySlotDelegate(JSC::ExecState*, const JSC::Identifier&, JSC::PropertySlot&);\n") if $dataNode->extendedAttributes->{"DelegatingGetOwnPropertySlot"};
    771771        push(@headerContent, "    bool getOwnPropertyDescriptorDelegate(JSC::ExecState*, const JSC::Identifier&, JSC::PropertyDescriptor&);\n") if $dataNode->extendedAttributes->{"DelegatingGetOwnPropertySlot"};
    … …  
    952952       
    953953    }
    954    
     954
    955955    # Index setter
    956956    if ($dataNode->extendedAttributes->{"CustomIndexedSetter"}) {
    … …  
    958958    }
    959959    # Name getter
    960     if ($dataNode->extendedAttributes->{"NamedGetter"} || $dataNode->extendedAttributes->{"HasOverridingNameGetter"}) {
     960    if ($dataNode->extendedAttributes->{"NamedGetter"} || $dataNode->extendedAttributes->{"CustomNamedGetter"}) {
    961961        push(@headerContent, "private:\n");
    962962        push(@headerContent, "    static bool canGetItemsForName(JSC::ExecState*, $implClassName*, const JSC::Identifier&);\n");
    … …  
    16211621    }
    16221622
    1623     my $hasGetter = $numAttributes > 0 
     1623    my $hasGetter = $numAttributes > 0
    16241624                 || !$dataNode->extendedAttributes->{"OmitConstructor"}
    16251625                 || $dataNode->extendedAttributes->{"IndexedGetter"}
    … …  
    16281628                 || $dataNode->extendedAttributes->{"CustomGetOwnPropertySlot"}
    16291629                 || $dataNode->extendedAttributes->{"NamedGetter"}
    1630                  || $dataNode->extendedAttributes->{"HasOverridingNameGetter"};
     1630                 || $dataNode->extendedAttributes->{"CustomNamedGetter"};
    16311631
    16321632    # Attributes
    … …  
    16471647        }
    16481648
    1649         if (($dataNode->extendedAttributes->{"IndexedGetter"} || $dataNode->extendedAttributes->{"HasNumericIndexGetter"}) 
    1650                 && !$dataNode->extendedAttributes->{"HasOverridingNameGetter"}) {
     1649        if (($dataNode->extendedAttributes->{"IndexedGetter"} || $dataNode->extendedAttributes->{"HasNumericIndexGetter"})
     1650                && !$dataNode->extendedAttributes->{"CustomNamedGetter"}) {
    16511651            push(@implContent, "bool ${className}::getOwnPropertySlotByIndex(JSCell* cell, ExecState* exec, unsigned propertyName, PropertySlot& slot)\n");
    16521652            push(@implContent, "{\n");

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

    r107035 r107039  
    566566    my $hasCustomIndexedGetter = $dataNode->extendedAttributes->{"IndexedGetter"} || $dataNode->extendedAttributes->{"CustomGetOwnPropertySlot"};
    567567    my $hasCustomIndexedSetter = $dataNode->extendedAttributes->{"CustomIndexedSetter"} && !$dataNode->extendedAttributes->{"HasNumericIndexGetter"};
    568     my $hasCustomNamedGetter = $dataNode->extendedAttributes->{"NamedGetter"} || $dataNode->extendedAttributes->{"HasOverridingNameGetter"} || $dataNode->extendedAttributes->{"CustomGetOwnPropertySlot"};
     568    my $hasCustomNamedGetter = $dataNode->extendedAttributes->{"NamedGetter"} || $dataNode->extendedAttributes->{"CustomNamedGetter"} || $dataNode->extendedAttributes->{"CustomGetOwnPropertySlot"};
    569569    my $hasCustomNamedSetter = $dataNode->extendedAttributes->{"DelegatingPutFunction"};
    570570    my $hasCustomDeleters = $dataNode->extendedAttributes->{"CustomDeleteProperty"};
    … …  
    21342134    my $namedPropertyGetter = shift;
    21352135    my $interfaceName = $dataNode->name;
    2136     my $hasCustomGetter = $dataNode->extendedAttributes->{"HasOverridingNameGetter"} || $dataNode->extendedAttributes->{"CustomGetOwnPropertySlot"};
     2136    my $hasCustomNamedGetter = $dataNode->extendedAttributes->{"CustomNamedGetter"} || $dataNode->extendedAttributes->{"CustomGetOwnPropertySlot"};
    21372137
    21382138    # FIXME: Remove hard-coded HTMLOptionsCollection reference by changing HTMLOptionsCollection to not inherit
    … …  
    21402140    if ($interfaceName eq "HTMLOptionsCollection") {
    21412141        $interfaceName = "HTMLCollection";
    2142         $hasCustomGetter = 1;
     2142        $hasCustomNamedGetter = 1;
    21432143    }
    21442144
    21452145    if ($interfaceName eq "HTMLAppletElement" || $interfaceName eq "HTMLEmbedElement" || $interfaceName eq "HTMLObjectElement") {
    2146         $hasCustomGetter = 1;
     2146        $hasCustomNamedGetter = 1;
    21472147    }
    21482148
    21492149    if ($interfaceName eq "HTMLDocument") {
    2150         $hasCustomGetter = 0;
    2151     }
    2152 
    2153     my $hasGetter = $dataNode->extendedAttributes->{"NamedGetter"} || $hasCustomGetter;
     2150        $hasCustomNamedGetter = 0;
     2151    }
     2152
     2153    my $hasGetter = $dataNode->extendedAttributes->{"NamedGetter"} || $hasCustomNamedGetter;
    21542154    if (!$hasGetter) {
    21552155        return;
    … …  
    21602160    }
    21612161
    2162     if ($namedPropertyGetter && $namedPropertyGetter->type ne "Node" && !$namedPropertyGetter->extendedAttributes->{"Custom"} && !$hasCustomGetter) {
     2162    if ($namedPropertyGetter && $namedPropertyGetter->type ne "Node" && !$namedPropertyGetter->extendedAttributes->{"Custom"} && !$hasCustomNamedGetter) {
    21632163        AddToImplIncludes("V8Collection.h");
    21642164        my $type = $namedPropertyGetter->type;

  • trunk/Source/WebCore/bindings/scripts/test/CPP/WebDOMTestCustomNamedGetter.cpp

    r107038 r107039  
    2020
    2121#include "config.h"
    22 #include "WebDOMTestOverridingNameGetter.h"
     22#include "WebDOMTestCustomNamedGetter.h"
    2323
    2424#include "KURL.h"
    25 #include "TestOverridingNameGetter.h"
     25#include "TestCustomNamedGetter.h"
    2626#include "WebDOMString.h"
    2727#include "WebExceptionHandler.h"
    … …  
    3030#include <wtf/RefPtr.h>
    3131
    32 struct WebDOMTestOverridingNameGetter::WebDOMTestOverridingNameGetterPrivate {
    33     WebDOMTestOverridingNameGetterPrivate(WebCore::TestOverridingNameGetter* object = 0)
     32struct WebDOMTestCustomNamedGetter::WebDOMTestCustomNamedGetterPrivate {
     33    WebDOMTestCustomNamedGetterPrivate(WebCore::TestCustomNamedGetter* object = 0)
    3434        : impl(object)
    3535    {
    3636    }
    3737
    38     RefPtr<WebCore::TestOverridingNameGetter> impl;
     38    RefPtr<WebCore::TestCustomNamedGetter> impl;
    3939};
    4040
    41 WebDOMTestOverridingNameGetter::WebDOMTestOverridingNameGetter()
     41WebDOMTestCustomNamedGetter::WebDOMTestCustomNamedGetter()
    4242    : WebDOMObject()
    4343    , m_impl(0)
    … …  
    4545}
    4646
    47 WebDOMTestOverridingNameGetter::WebDOMTestOverridingNameGetter(WebCore::TestOverridingNameGetter* impl)
     47WebDOMTestCustomNamedGetter::WebDOMTestCustomNamedGetter(WebCore::TestCustomNamedGetter* impl)
    4848    : WebDOMObject()
    49     , m_impl(new WebDOMTestOverridingNameGetterPrivate(impl))
     49    , m_impl(new WebDOMTestCustomNamedGetterPrivate(impl))
    5050{
    5151}
    5252
    53 WebDOMTestOverridingNameGetter::WebDOMTestOverridingNameGetter(const WebDOMTestOverridingNameGetter& copy)
     53WebDOMTestCustomNamedGetter::WebDOMTestCustomNamedGetter(const WebDOMTestCustomNamedGetter& copy)
    5454    : WebDOMObject()
    5555{
    56     m_impl = copy.impl() ? new WebDOMTestOverridingNameGetterPrivate(copy.impl()) : 0;
     56    m_impl = copy.impl() ? new WebDOMTestCustomNamedGetterPrivate(copy.impl()) : 0;
    5757}
    5858
    59 WebDOMTestOverridingNameGetter& WebDOMTestOverridingNameGetter::operator=(const WebDOMTestOverridingNameGetter& copy)
     59WebDOMTestCustomNamedGetter& WebDOMTestCustomNamedGetter::operator=(const WebDOMTestCustomNamedGetter& copy)
    6060{
    6161    delete m_impl;
    62     m_impl = copy.impl() ? new WebDOMTestOverridingNameGetterPrivate(copy.impl()) : 0;
     62    m_impl = copy.impl() ? new WebDOMTestCustomNamedGetterPrivate(copy.impl()) : 0;
    6363    return *this;
    6464}
    6565
    66 WebCore::TestOverridingNameGetter* WebDOMTestOverridingNameGetter::impl() const
     66WebCore::TestCustomNamedGetter* WebDOMTestCustomNamedGetter::impl() const
    6767{
    6868    return m_impl ? WTF::getPtr(m_impl->impl) : 0;
    6969}
    7070
    71 WebDOMTestOverridingNameGetter::~WebDOMTestOverridingNameGetter()
     71WebDOMTestCustomNamedGetter::~WebDOMTestCustomNamedGetter()
    7272{
    7373    delete m_impl;
    … …  
    7575}
    7676
    77 void WebDOMTestOverridingNameGetter::anotherFunction(const WebDOMString& str)
     77void WebDOMTestCustomNamedGetter::anotherFunction(const WebDOMString& str)
    7878{
    7979    if (!impl())
    … …  
    8383}
    8484
    85 WebCore::TestOverridingNameGetter* toWebCore(const WebDOMTestOverridingNameGetter& wrapper)
     85WebCore::TestCustomNamedGetter* toWebCore(const WebDOMTestCustomNamedGetter& wrapper)
    8686{
    8787    return wrapper.impl();
    8888}
    8989
    90 WebDOMTestOverridingNameGetter toWebKit(WebCore::TestOverridingNameGetter* value)
     90WebDOMTestCustomNamedGetter toWebKit(WebCore::TestCustomNamedGetter* value)
    9191{
    92     return WebDOMTestOverridingNameGetter(value);
     92    return WebDOMTestCustomNamedGetter(value);
    9393}

  • trunk/Source/WebCore/bindings/scripts/test/CPP/WebDOMTestCustomNamedGetter.h

    r107038 r107039  
    2121 */
    2222
    23 #ifndef WebDOMTestOverridingNameGetter_h
    24 #define WebDOMTestOverridingNameGetter_h
     23#ifndef WebDOMTestCustomNamedGetter_h
     24#define WebDOMTestCustomNamedGetter_h
    2525
    2626#include <WebDOMObject.h>
    … …  
    2828
    2929namespace WebCore {
    30 class TestOverridingNameGetter;
     30class TestCustomNamedGetter;
    3131};
    3232
    3333
    34 class WebDOMTestOverridingNameGetter : public WebDOMObject {
     34class WebDOMTestCustomNamedGetter : public WebDOMObject {
    3535public:
    36     WebDOMTestOverridingNameGetter();
    37     explicit WebDOMTestOverridingNameGetter(WebCore::TestOverridingNameGetter*);
    38     WebDOMTestOverridingNameGetter(const WebDOMTestOverridingNameGetter&);
    39     WebDOMTestOverridingNameGetter& operator=(const WebDOMTestOverridingNameGetter&);
    40     virtual ~WebDOMTestOverridingNameGetter();
     36    WebDOMTestCustomNamedGetter();
     37    explicit WebDOMTestCustomNamedGetter(WebCore::TestCustomNamedGetter*);
     38    WebDOMTestCustomNamedGetter(const WebDOMTestCustomNamedGetter&);
     39    WebDOMTestCustomNamedGetter& operator=(const WebDOMTestCustomNamedGetter&);
     40    virtual ~WebDOMTestCustomNamedGetter();
    4141
    4242    void anotherFunction(const WebDOMString& str);
    4343
    44     WebCore::TestOverridingNameGetter* impl() const;
     44    WebCore::TestCustomNamedGetter* impl() const;
    4545
    4646protected:
    47     struct WebDOMTestOverridingNameGetterPrivate;
    48     WebDOMTestOverridingNameGetterPrivate* m_impl;
     47    struct WebDOMTestCustomNamedGetterPrivate;
     48    WebDOMTestCustomNamedGetterPrivate* m_impl;
    4949};
    5050
    51 WebCore::TestOverridingNameGetter* toWebCore(const WebDOMTestOverridingNameGetter&);
    52 WebDOMTestOverridingNameGetter toWebKit(WebCore::TestOverridingNameGetter*);
     51WebCore::TestCustomNamedGetter* toWebCore(const WebDOMTestCustomNamedGetter&);
     52WebDOMTestCustomNamedGetter toWebKit(WebCore::TestCustomNamedGetter*);
    5353
    5454#endif

  • trunk/Source/WebCore/bindings/scripts/test/GObject/WebKitDOMTestCustomNamedGetter.cpp

    r107038 r107039  
    2727#include "ExceptionCode.h"
    2828#include "JSMainThreadExecState.h"
    29 #include "TestOverridingNameGetter.h"
     29#include "TestCustomNamedGetter.h"
    3030#include "WebKitDOMBinding.h"
    3131#include "gobject/ConvertToUTF8String.h"
    32 #include "webkit/WebKitDOMTestOverridingNameGetter.h"
    33 #include "webkit/WebKitDOMTestOverridingNameGetterPrivate.h"
     32#include "webkit/WebKitDOMTestCustomNamedGetter.h"
     33#include "webkit/WebKitDOMTestCustomNamedGetterPrivate.h"
    3434#include "webkitdefines.h"
    3535#include "webkitglobalsprivate.h"
    … …  
    3838namespace WebKit {
    3939   
    40 WebKitDOMTestOverridingNameGetter* kit(WebCore::TestOverridingNameGetter* obj)
     40WebKitDOMTestCustomNamedGetter* kit(WebCore::TestCustomNamedGetter* obj)
    4141{
    4242    g_return_val_if_fail(obj, 0);
    4343
    4444    if (gpointer ret = DOMObjectCache::get(obj))
    45         return static_cast<WebKitDOMTestOverridingNameGetter*>(ret);
     45        return static_cast<WebKitDOMTestCustomNamedGetter*>(ret);
    4646
    47     return static_cast<WebKitDOMTestOverridingNameGetter*>(DOMObjectCache::put(obj, WebKit::wrapTestOverridingNameGetter(obj)));
     47    return static_cast<WebKitDOMTestCustomNamedGetter*>(DOMObjectCache::put(obj, WebKit::wrapTestCustomNamedGetter(obj)));
    4848}
    4949   
    … …  
    5151
    5252void
    53 webkit_dom_test_overriding_name_getter_another_function(WebKitDOMTestOverridingNameGetter* self, const gchar* str)
     53webkit_dom_test_custom_named_getter_another_function(WebKitDOMTestCustomNamedGetter* self, const gchar* str)
    5454{
    5555    g_return_if_fail(self);
    5656    WebCore::JSMainThreadNullState state;
    57     WebCore::TestOverridingNameGetter * item = WebKit::core(self);
     57    WebCore::TestCustomNamedGetter * item = WebKit::core(self);
    5858    g_return_if_fail(str);
    5959    WTF::String converted_str = WTF::String::fromUTF8(str);
    … …  
    6262
    6363
    64 G_DEFINE_TYPE(WebKitDOMTestOverridingNameGetter, webkit_dom_test_overriding_name_getter, WEBKIT_TYPE_DOM_OBJECT)
     64G_DEFINE_TYPE(WebKitDOMTestCustomNamedGetter, webkit_dom_test_custom_named_getter, WEBKIT_TYPE_DOM_OBJECT)
    6565
    6666namespace WebKit {
    6767
    68 WebCore::TestOverridingNameGetter* core(WebKitDOMTestOverridingNameGetter* request)
     68WebCore::TestCustomNamedGetter* core(WebKitDOMTestCustomNamedGetter* request)
    6969{
    7070    g_return_val_if_fail(request, 0);
    7171
    72     WebCore::TestOverridingNameGetter* coreObject = static_cast<WebCore::TestOverridingNameGetter*>(WEBKIT_DOM_OBJECT(request)->coreObject);
     72    WebCore::TestCustomNamedGetter* coreObject = static_cast<WebCore::TestCustomNamedGetter*>(WEBKIT_DOM_OBJECT(request)->coreObject);
    7373    g_return_val_if_fail(coreObject, 0);
    7474
    … …  
    8282
    8383
    84 static void webkit_dom_test_overriding_name_getter_finalize(GObject* object)
     84static void webkit_dom_test_custom_named_getter_finalize(GObject* object)
    8585{
    8686    WebKitDOMObject* dom_object = WEBKIT_DOM_OBJECT(object);
    8787   
    8888    if (dom_object->coreObject) {
    89         WebCore::TestOverridingNameGetter* coreObject = static_cast<WebCore::TestOverridingNameGetter *>(dom_object->coreObject);
     89        WebCore::TestCustomNamedGetter* coreObject = static_cast<WebCore::TestCustomNamedGetter *>(dom_object->coreObject);
    9090
    9191        WebKit::DOMObjectCache::forget(coreObject);
    … …  
    9595    }
    9696
    97     G_OBJECT_CLASS(webkit_dom_test_overriding_name_getter_parent_class)->finalize(object);
     97    G_OBJECT_CLASS(webkit_dom_test_custom_named_getter_parent_class)->finalize(object);
    9898}
    9999
    100 static void webkit_dom_test_overriding_name_getter_set_property(GObject* object, guint prop_id, const GValue* value, GParamSpec* pspec)
     100static void webkit_dom_test_custom_named_getter_set_property(GObject* object, guint prop_id, const GValue* value, GParamSpec* pspec)
    101101{
    102102    WebCore::JSMainThreadNullState state;
    … …  
    109109
    110110
    111 static void webkit_dom_test_overriding_name_getter_get_property(GObject* object, guint prop_id, GValue* value, GParamSpec* pspec)
     111static void webkit_dom_test_custom_named_getter_get_property(GObject* object, guint prop_id, GValue* value, GParamSpec* pspec)
    112112{
    113113    WebCore::JSMainThreadNullState state;
    … …  
    120120
    121121
    122 static void webkit_dom_test_overriding_name_getter_constructed(GObject* object)
     122static void webkit_dom_test_custom_named_getter_constructed(GObject* object)
    123123{
    124124
    125     if (G_OBJECT_CLASS(webkit_dom_test_overriding_name_getter_parent_class)->constructed)
    126         G_OBJECT_CLASS(webkit_dom_test_overriding_name_getter_parent_class)->constructed(object);
     125    if (G_OBJECT_CLASS(webkit_dom_test_custom_named_getter_parent_class)->constructed)
     126        G_OBJECT_CLASS(webkit_dom_test_custom_named_getter_parent_class)->constructed(object);
    127127}
    128128
    129 static void webkit_dom_test_overriding_name_getter_class_init(WebKitDOMTestOverridingNameGetterClass* requestClass)
     129static void webkit_dom_test_custom_named_getter_class_init(WebKitDOMTestCustomNamedGetterClass* requestClass)
    130130{
    131131    GObjectClass *gobjectClass = G_OBJECT_CLASS(requestClass);
    132     gobjectClass->finalize = webkit_dom_test_overriding_name_getter_finalize;
    133     gobjectClass->set_property = webkit_dom_test_overriding_name_getter_set_property;
    134     gobjectClass->get_property = webkit_dom_test_overriding_name_getter_get_property;
    135     gobjectClass->constructed = webkit_dom_test_overriding_name_getter_constructed;
     132    gobjectClass->finalize = webkit_dom_test_custom_named_getter_finalize;
     133    gobjectClass->set_property = webkit_dom_test_custom_named_getter_set_property;
     134    gobjectClass->get_property = webkit_dom_test_custom_named_getter_get_property;
     135    gobjectClass->constructed = webkit_dom_test_custom_named_getter_constructed;
    136136
    137137
    … …  
    139139}
    140140
    141 static void webkit_dom_test_overriding_name_getter_init(WebKitDOMTestOverridingNameGetter* request)
     141static void webkit_dom_test_custom_named_getter_init(WebKitDOMTestCustomNamedGetter* request)
    142142{
    143143}
    144144
    145145namespace WebKit {
    146 WebKitDOMTestOverridingNameGetter* wrapTestOverridingNameGetter(WebCore::TestOverridingNameGetter* coreObject)
     146WebKitDOMTestCustomNamedGetter* wrapTestCustomNamedGetter(WebCore::TestCustomNamedGetter* coreObject)
    147147{
    148148    g_return_val_if_fail(coreObject, 0);
    … …  
    154154    coreObject->ref();
    155155
    156     return  WEBKIT_DOM_TEST_OVERRIDING_NAME_GETTER(g_object_new(WEBKIT_TYPE_DOM_TEST_OVERRIDING_NAME_GETTER,
     156    return  WEBKIT_DOM_TEST_CUSTOM_NAMED_GETTER(g_object_new(WEBKIT_TYPE_DOM_TEST_CUSTOM_NAMED_GETTER,
    157157                                               "core-object", coreObject, NULL));
    158158}

  • trunk/Source/WebCore/bindings/scripts/test/GObject/WebKitDOMTestCustomNamedGetterPrivate.h

    r107038 r107039  
    1919*/
    2020
    21 #ifndef WEB_KIT_DOM_TEST_OVERRIDING_NAME_GETTER_PRIVATE_H
    22 #define WEB_KIT_DOM_TEST_OVERRIDING_NAME_GETTER_PRIVATE_H
     21#ifndef WEB_KIT_DOM_TEST_CUSTOM_NAMED_GETTER_PRIVATE_H
     22#define WEB_KIT_DOM_TEST_CUSTOM_NAMED_GETTER_PRIVATE_H
    2323
    2424#include <glib-object.h>
    2525#include <webkit/WebKitDOMObject.h>
    26 #include "TestOverridingNameGetter.h"
     26#include "TestCustomNamedGetter.h"
    2727namespace WebKit {
    28     WebKitDOMTestOverridingNameGetter *
    29     wrapTestOverridingNameGetter(WebCore::TestOverridingNameGetter *coreObject);
     28    WebKitDOMTestCustomNamedGetter *
     29    wrapTestCustomNamedGetter(WebCore::TestCustomNamedGetter *coreObject);
    3030
    31     WebCore::TestOverridingNameGetter *
    32     core(WebKitDOMTestOverridingNameGetter *request);
     31    WebCore::TestCustomNamedGetter *
     32    core(WebKitDOMTestCustomNamedGetter *request);
    3333
    34     WebKitDOMTestOverridingNameGetter*
    35     kit(WebCore::TestOverridingNameGetter* node);
     34    WebKitDOMTestCustomNamedGetter*
     35    kit(WebCore::TestCustomNamedGetter* node);
    3636
    3737} // namespace WebKit
    3838
    39 #endif /* WEB_KIT_DOM_TEST_OVERRIDING_NAME_GETTER_PRIVATE_H */
     39#endif /* WEB_KIT_DOM_TEST_CUSTOM_NAMED_GETTER_PRIVATE_H */

  • trunk/Source/WebCore/bindings/scripts/test/JS/JSTestCustomNamedGetter.h

    r107038 r107039  
    1919*/
    2020
    21 #ifndef JSTestOverridingNameGetter_h
    22 #define JSTestOverridingNameGetter_h
     21#ifndef JSTestCustomNamedGetter_h
     22#define JSTestCustomNamedGetter_h
    2323
    2424#include "JSDOMBinding.h"
    25 #include "TestOverridingNameGetter.h"
     25#include "TestCustomNamedGetter.h"
    2626#include <runtime/JSGlobalObject.h>
    2727#include <runtime/JSObject.h>
    … …  
    3030namespace WebCore {
    3131
    32 class JSTestOverridingNameGetter : public JSDOMWrapper {
     32class JSTestCustomNamedGetter : public JSDOMWrapper {
    3333public:
    3434    typedef JSDOMWrapper Base;
    35     static JSTestOverridingNameGetter* create(JSC::Structure* structure, JSDOMGlobalObject* globalObject, PassRefPtr<TestOverridingNameGetter> impl)
     35    static JSTestCustomNamedGetter* create(JSC::Structure* structure, JSDOMGlobalObject* globalObject, PassRefPtr<TestCustomNamedGetter> impl)
    3636    {
    37         JSTestOverridingNameGetter* ptr = new (NotNull, JSC::allocateCell<JSTestOverridingNameGetter>(globalObject->globalData().heap)) JSTestOverridingNameGetter(structure, globalObject, impl);
     37        JSTestCustomNamedGetter* ptr = new (NotNull, JSC::allocateCell<JSTestCustomNamedGetter>(globalObject->globalData().heap)) JSTestCustomNamedGetter(structure, globalObject, impl);
    3838        ptr->finishCreation(globalObject->globalData());
    3939        return ptr;
    … …  
    5252
    5353    static JSC::JSValue getConstructor(JSC::ExecState*, JSC::JSGlobalObject*);
    54     TestOverridingNameGetter* impl() const { return m_impl; }
     54    TestCustomNamedGetter* impl() const { return m_impl; }
    5555    void releaseImpl() { m_impl->deref(); m_impl = 0; }
    5656
    … …  
    5858
    5959private:
    60     TestOverridingNameGetter* m_impl;
     60    TestCustomNamedGetter* m_impl;
    6161protected:
    62     JSTestOverridingNameGetter(JSC::Structure*, JSDOMGlobalObject*, PassRefPtr<TestOverridingNameGetter>);
     62    JSTestCustomNamedGetter(JSC::Structure*, JSDOMGlobalObject*, PassRefPtr<TestCustomNamedGetter>);
    6363    void finishCreation(JSC::JSGlobalData&);
    6464    static const unsigned StructureFlags = JSC::OverridesGetOwnPropertySlot | Base::StructureFlags;
    6565private:
    66     static bool canGetItemsForName(JSC::ExecState*, TestOverridingNameGetter*, const JSC::Identifier&);
     66    static bool canGetItemsForName(JSC::ExecState*, TestCustomNamedGetter*, const JSC::Identifier&);
    6767    static JSC::JSValue nameGetter(JSC::ExecState*, JSC::JSValue, const JSC::Identifier&);
    6868};
    6969
    70 class JSTestOverridingNameGetterOwner : public JSC::WeakHandleOwner {
     70class JSTestCustomNamedGetterOwner : public JSC::WeakHandleOwner {
    7171    virtual bool isReachableFromOpaqueRoots(JSC::Handle<JSC::Unknown>, void* context, JSC::SlotVisitor&);
    7272    virtual void finalize(JSC::Handle<JSC::Unknown>, void* context);
    7373};
    7474
    75 inline JSC::WeakHandleOwner* wrapperOwner(DOMWrapperWorld*, TestOverridingNameGetter*)
     75inline JSC::WeakHandleOwner* wrapperOwner(DOMWrapperWorld*, TestCustomNamedGetter*)
    7676{
    77     DEFINE_STATIC_LOCAL(JSTestOverridingNameGetterOwner, jsTestOverridingNameGetterOwner, ());
    78     return &jsTestOverridingNameGetterOwner;
     77    DEFINE_STATIC_LOCAL(JSTestCustomNamedGetterOwner, jsTestCustomNamedGetterOwner, ());
     78    return &jsTestCustomNamedGetterOwner;
    7979}
    8080
    81 inline void* wrapperContext(DOMWrapperWorld* world, TestOverridingNameGetter*)
     81inline void* wrapperContext(DOMWrapperWorld* world, TestCustomNamedGetter*)
    8282{
    8383    return world;
    8484}
    8585
    86 JSC::JSValue toJS(JSC::ExecState*, JSDOMGlobalObject*, TestOverridingNameGetter*);
    87 TestOverridingNameGetter* toTestOverridingNameGetter(JSC::JSValue);
     86JSC::JSValue toJS(JSC::ExecState*, JSDOMGlobalObject*, TestCustomNamedGetter*);
     87TestCustomNamedGetter* toTestCustomNamedGetter(JSC::JSValue);
    8888
    89 class JSTestOverridingNameGetterPrototype : public JSC::JSNonFinalObject {
     89class JSTestCustomNamedGetterPrototype : public JSC::JSNonFinalObject {
    9090public:
    9191    typedef JSC::JSNonFinalObject Base;
    9292    static JSC::JSObject* self(JSC::ExecState*, JSC::JSGlobalObject*);
    93     static JSTestOverridingNameGetterPrototype* create(JSC::JSGlobalData& globalData, JSC::JSGlobalObject* globalObject, JSC::Structure* structure)
     93    static JSTestCustomNamedGetterPrototype* create(JSC::JSGlobalData& globalData, JSC::JSGlobalObject* globalObject, JSC::Structure* structure)
    9494    {
    95         JSTestOverridingNameGetterPrototype* ptr = new (NotNull, JSC::allocateCell<JSTestOverridingNameGetterPrototype>(globalData.heap)) JSTestOverridingNameGetterPrototype(globalData, globalObject, structure);
     95        JSTestCustomNamedGetterPrototype* ptr = new (NotNull, JSC::allocateCell<JSTestCustomNamedGetterPrototype>(globalData.heap)) JSTestCustomNamedGetterPrototype(globalData, globalObject, structure);
    9696        ptr->finishCreation(globalData);
    9797        return ptr;
    … …  
    107107
    108108private:
    109     JSTestOverridingNameGetterPrototype(JSC::JSGlobalData& globalData, JSC::JSGlobalObject*, JSC::Structure* structure) : JSC::JSNonFinalObject(globalData, structure) { }
     109    JSTestCustomNamedGetterPrototype(JSC::JSGlobalData& globalData, JSC::JSGlobalObject*, JSC::Structure* structure) : JSC::JSNonFinalObject(globalData, structure) { }
    110110protected:
    111111    static const unsigned StructureFlags = JSC::OverridesGetOwnPropertySlot | Base::StructureFlags;
    112112};
    113113
    114 class JSTestOverridingNameGetterConstructor : public DOMConstructorObject {
     114class JSTestCustomNamedGetterConstructor : public DOMConstructorObject {
    115115private:
    116     JSTestOverridingNameGetterConstructor(JSC::Structure*, JSDOMGlobalObject*);
     116    JSTestCustomNamedGetterConstructor(JSC::Structure*, JSDOMGlobalObject*);
    117117    void finishCreation(JSC::ExecState*, JSDOMGlobalObject*);
    118118
    119119public:
    120120    typedef DOMConstructorObject Base;
    121     static JSTestOverridingNameGetterConstructor* create(JSC::ExecState* exec, JSC::Structure* structure, JSDOMGlobalObject* globalObject)
     121    static JSTestCustomNamedGetterConstructor* create(JSC::ExecState* exec, JSC::Structure* structure, JSDOMGlobalObject* globalObject)
    122122    {
    123         JSTestOverridingNameGetterConstructor* ptr = new (NotNull, JSC::allocateCell<JSTestOverridingNameGetterConstructor>(*exec->heap())) JSTestOverridingNameGetterConstructor(structure, globalObject);
     123        JSTestCustomNamedGetterConstructor* ptr = new (NotNull, JSC::allocateCell<JSTestCustomNamedGetterConstructor>(*exec->heap())) JSTestCustomNamedGetterConstructor(structure, globalObject);
    124124        ptr->finishCreation(exec, globalObject);
    125125        return ptr;
    … …  
    139139// Functions
    140140
    141 JSC::EncodedJSValue JSC_HOST_CALL jsTestOverridingNameGetterPrototypeFunctionAnotherFunction(JSC::ExecState*);
     141JSC::EncodedJSValue JSC_HOST_CALL jsTestCustomNamedGetterPrototypeFunctionAnotherFunction(JSC::ExecState*);
    142142// Attributes
    143143
    144 JSC::JSValue jsTestOverridingNameGetterConstructor(JSC::ExecState*, JSC::JSValue, const JSC::Identifier&);
     144JSC::JSValue jsTestCustomNamedGetterConstructor(JSC::ExecState*, JSC::JSValue, const JSC::Identifier&);
    145145
    146146} // namespace WebCore

  • trunk/Source/WebCore/bindings/scripts/test/ObjC/DOMTestCustomNamedGetter.h

    r107038 r107039  
    3131@class NSString;
    3232
    33 @interface DOMTestOverridingNameGetter : DOMObject
     33@interface DOMTestCustomNamedGetter : DOMObject
    3434- (void)anotherFunction:(NSString *)str;
    3535@end

  • trunk/Source/WebCore/bindings/scripts/test/ObjC/DOMTestCustomNamedGetter.mm

    r107038 r107039  
    2828#import "DOMInternal.h"
    2929
    30 #import "DOMTestOverridingNameGetter.h"
     30#import "DOMTestCustomNamedGetter.h"
    3131
    3232#import "DOMBlobInternal.h"
    … …  
    3636#import "DOMNodeInternal.h"
    3737#import "DOMStyleSheetInternal.h"
    38 #import "DOMTestOverridingNameGetterInternal.h"
     38#import "DOMTestCustomNamedGetterInternal.h"
    3939#import "ExceptionHandlers.h"
    4040#import "JSMainThreadExecState.h"
    4141#import "KURL.h"
    42 #import "TestOverridingNameGetter.h"
     42#import "TestCustomNamedGetter.h"
    4343#import "ThreadCheck.h"
    4444#import "WebCoreObjCExtras.h"
    … …  
    4646#import <wtf/GetPtr.h>
    4747
    48 #define IMPL reinterpret_cast<WebCore::TestOverridingNameGetter*>(_internal)
     48#define IMPL reinterpret_cast<WebCore::TestCustomNamedGetter*>(_internal)
    4949
    50 @implementation DOMTestOverridingNameGetter
     50@implementation DOMTestCustomNamedGetter
    5151
    5252- (void)dealloc
    5353{
    54     if (WebCoreObjCScheduleDeallocateOnMainThread([DOMTestOverridingNameGetter class], self))
     54    if (WebCoreObjCScheduleDeallocateOnMainThread([DOMTestCustomNamedGetter class], self))
    5555        return;
    5656
    … …  
    7575@end
    7676
    77 WebCore::TestOverridingNameGetter* core(DOMTestOverridingNameGetter *wrapper)
     77WebCore::TestCustomNamedGetter* core(DOMTestCustomNamedGetter *wrapper)
    7878{
    79     return wrapper ? reinterpret_cast<WebCore::TestOverridingNameGetter*>(wrapper->_internal) : 0;
     79    return wrapper ? reinterpret_cast<WebCore::TestCustomNamedGetter*>(wrapper->_internal) : 0;
    8080}
    8181
    82 DOMTestOverridingNameGetter *kit(WebCore::TestOverridingNameGetter* value)
     82DOMTestCustomNamedGetter *kit(WebCore::TestCustomNamedGetter* value)
    8383{
    8484    { DOM_ASSERT_MAIN_THREAD(); WebCoreThreadViolationCheckRoundOne(); };
    8585    if (!value)
    8686        return nil;
    87     if (DOMTestOverridingNameGetter *wrapper = getDOMWrapper(value))
     87    if (DOMTestCustomNamedGetter *wrapper = getDOMWrapper(value))
    8888        return [[wrapper retain] autorelease];
    89     DOMTestOverridingNameGetter *wrapper = [[DOMTestOverridingNameGetter alloc] _init];
     89    DOMTestCustomNamedGetter *wrapper = [[DOMTestCustomNamedGetter alloc] _init];
    9090    wrapper->_internal = reinterpret_cast<DOMObjectInternal*>(value);
    9191    value->ref();

  • trunk/Source/WebCore/bindings/scripts/test/ObjC/DOMTestCustomNamedGetterInternal.h

    r107038 r107039  
    2525 */
    2626
    27 #import <WebCore/DOMTestOverridingNameGetter.h>
     27#import <WebCore/DOMTestCustomNamedGetter.h>
    2828
    2929#if WEBKIT_VERSION_MAX_ALLOWED >= WEBKIT_VERSION_LATEST
    3030
    3131namespace WebCore {
    32     class TestOverridingNameGetter;
     32    class TestCustomNamedGetter;
    3333}
    3434
    35 WebCore::TestOverridingNameGetter* core(DOMTestOverridingNameGetter *);
    36 DOMTestOverridingNameGetter *kit(WebCore::TestOverridingNameGetter*);
     35WebCore::TestCustomNamedGetter* core(DOMTestCustomNamedGetter *);
     36DOMTestCustomNamedGetter *kit(WebCore::TestCustomNamedGetter*);
    3737
    3838#endif

  • trunk/Source/WebCore/bindings/scripts/test/TestCustomNamedGetter.idl

    r107038 r107039  
    3030
    3131    interface [
    32         HasOverridingNameGetter
    33     ] TestOverridingNameGetter {
     32        CustomNamedGetter
     33    ] TestCustomNamedGetter {
    3434        void anotherFunction(in DOMString str);
    3535    };

  • trunk/Source/WebCore/bindings/scripts/test/V8/V8TestCustomNamedGetter.cpp

    r107038 r107039  
    2020
    2121#include "config.h"
    22 #include "V8TestOverridingNameGetter.h"
     22#include "V8TestCustomNamedGetter.h"
    2323
    2424#include "ExceptionCode.h"
    … …  
    3434namespace WebCore {
    3535
    36 WrapperTypeInfo V8TestOverridingNameGetter::info = { V8TestOverridingNameGetter::GetTemplate, V8TestOverridingNameGetter::derefObject, 0, 0 };
     36WrapperTypeInfo V8TestCustomNamedGetter::info = { V8TestCustomNamedGetter::GetTemplate, V8TestCustomNamedGetter::derefObject, 0, 0 };
    3737
    38 namespace TestOverridingNameGetterInternal {
     38namespace TestCustomNamedGetterInternal {
    3939
    4040template <typename T> void V8_USE(T) { }
    … …  
    4242static v8::Handle<v8::Value> anotherFunctionCallback(const v8::Arguments& args)
    4343{
    44     INC_STATS("DOM.TestOverridingNameGetter.anotherFunction");
     44    INC_STATS("DOM.TestCustomNamedGetter.anotherFunction");
    4545    if (args.Length() < 1)
    4646        return throwError("Not enough arguments", V8Proxy::TypeError);
    47     TestOverridingNameGetter* imp = V8TestOverridingNameGetter::toNative(args.Holder());
     47    TestCustomNamedGetter* imp = V8TestCustomNamedGetter::toNative(args.Holder());
    4848    STRING_TO_V8PARAMETER_EXCEPTION_BLOCK(V8Parameter<>, str, MAYBE_MISSING_PARAMETER(args, 0, MissingIsUndefined));
    4949    imp->anotherFunction(str);
    … …  
    5151}
    5252
    53 } // namespace TestOverridingNameGetterInternal
     53} // namespace TestCustomNamedGetterInternal
    5454
    55 static const BatchedCallback TestOverridingNameGetterCallbacks[] = {
    56     {"anotherFunction", TestOverridingNameGetterInternal::anotherFunctionCallback},
     55static const BatchedCallback TestCustomNamedGetterCallbacks[] = {
     56    {"anotherFunction", TestCustomNamedGetterInternal::anotherFunctionCallback},
    5757};
    5858
    59 static v8::Persistent<v8::FunctionTemplate> ConfigureV8TestOverridingNameGetterTemplate(v8::Persistent<v8::FunctionTemplate> desc)
     59static v8::Persistent<v8::FunctionTemplate> ConfigureV8TestCustomNamedGetterTemplate(v8::Persistent<v8::FunctionTemplate> desc)
    6060{
    6161    desc->ReadOnlyPrototype();
    6262
    6363    v8::Local<v8::Signature> defaultSignature;
    64     defaultSignature = configureTemplate(desc, "TestOverridingNameGetter", v8::Persistent<v8::FunctionTemplate>(), V8TestOverridingNameGetter::internalFieldCount,
     64    defaultSignature = configureTemplate(desc, "TestCustomNamedGetter", v8::Persistent<v8::FunctionTemplate>(), V8TestCustomNamedGetter::internalFieldCount,
    6565        0, 0,
    66         TestOverridingNameGetterCallbacks, WTF_ARRAY_LENGTH(TestOverridingNameGetterCallbacks));
     66        TestCustomNamedGetterCallbacks, WTF_ARRAY_LENGTH(TestCustomNamedGetterCallbacks));
    6767    UNUSED_PARAM(defaultSignature); // In some cases, it will not be used.
    6868    v8::Local<v8::ObjectTemplate> instance = desc->InstanceTemplate();
    … …  
    7171    UNUSED_PARAM(proto); // In some cases, it will not be used.
    7272   
    73     desc->InstanceTemplate()->SetNamedPropertyHandler(V8TestOverridingNameGetter::namedPropertyGetter, 0, 0, 0, 0);
     73    desc->InstanceTemplate()->SetNamedPropertyHandler(V8TestCustomNamedGetter::namedPropertyGetter, 0, 0, 0, 0);
    7474
    7575    // Custom toString template
    … …  
    7878}
    7979
    80 v8::Persistent<v8::FunctionTemplate> V8TestOverridingNameGetter::GetRawTemplate()
     80v8::Persistent<v8::FunctionTemplate> V8TestCustomNamedGetter::GetRawTemplate()
    8181{
    8282    V8BindingPerIsolateData* data = V8BindingPerIsolateData::current();
    … …  
    9191}
    9292
    93 v8::Persistent<v8::FunctionTemplate> V8TestOverridingNameGetter::GetTemplate()
     93v8::Persistent<v8::FunctionTemplate> V8TestCustomNamedGetter::GetTemplate()
    9494{
    9595    V8BindingPerIsolateData* data = V8BindingPerIsolateData::current();
    … …  
    100100    v8::HandleScope handleScope;
    101101    v8::Persistent<v8::FunctionTemplate> templ =
    102         ConfigureV8TestOverridingNameGetterTemplate(GetRawTemplate());
     102        ConfigureV8TestCustomNamedGetterTemplate(GetRawTemplate());
    103103    data->templateMap().add(&info, templ);
    104104    return templ;
    105105}
    106106
    107 bool V8TestOverridingNameGetter::HasInstance(v8::Handle<v8::Value> value)
     107bool V8TestCustomNamedGetter::HasInstance(v8::Handle<v8::Value> value)
    108108{
    109109    return GetRawTemplate()->HasInstance(value);
    … …  
    111111
    112112
    113 v8::Handle<v8::Object> V8TestOverridingNameGetter::wrapSlow(TestOverridingNameGetter* impl)
     113v8::Handle<v8::Object> V8TestCustomNamedGetter::wrapSlow(TestCustomNamedGetter* impl)
    114114{
    115115    v8::Handle<v8::Object> wrapper;
    … …  
    128128}
    129129
    130 void V8TestOverridingNameGetter::derefObject(void* object)
     130void V8TestCustomNamedGetter::derefObject(void* object)
    131131{
    132     static_cast<TestOverridingNameGetter*>(object)->deref();
     132    static_cast<TestCustomNamedGetter*>(object)->deref();
    133133}
    134134

  • trunk/Source/WebCore/bindings/scripts/test/V8/V8TestCustomNamedGetter.h

    r107038 r107039  
    1919*/
    2020
    21 #ifndef V8TestOverridingNameGetter_h
    22 #define V8TestOverridingNameGetter_h
     21#ifndef V8TestCustomNamedGetter_h
     22#define V8TestCustomNamedGetter_h
    2323
    24 #include "TestOverridingNameGetter.h"
     24#include "TestCustomNamedGetter.h"
    2525#include "V8DOMWrapper.h"
    2626#include "WrapperTypeInfo.h"
    … …  
    3131namespace WebCore {
    3232
    33 class V8TestOverridingNameGetter {
     33class V8TestCustomNamedGetter {
    3434public:
    3535    static const bool hasDependentLifetime = false;
    … …  
    3737    static v8::Persistent<v8::FunctionTemplate> GetRawTemplate();
    3838    static v8::Persistent<v8::FunctionTemplate> GetTemplate();
    39     static TestOverridingNameGetter* toNative(v8::Handle<v8::Object> object)
     39    static TestCustomNamedGetter* toNative(v8::Handle<v8::Object> object)
    4040    {
    41         return reinterpret_cast<TestOverridingNameGetter*>(object->GetPointerFromInternalField(v8DOMWrapperObjectIndex));
     41        return reinterpret_cast<TestCustomNamedGetter*>(object->GetPointerFromInternalField(v8DOMWrapperObjectIndex));
    4242    }
    43     inline static v8::Handle<v8::Object> wrap(TestOverridingNameGetter*);
     43    inline static v8::Handle<v8::Object> wrap(TestCustomNamedGetter*);
    4444    static void derefObject(void*);
    4545    static WrapperTypeInfo info;
    4646    static v8::Handle<v8::Value> namedPropertyGetter(v8::Local<v8::String>, const v8::AccessorInfo&);
    4747    static const int internalFieldCount = v8DefaultWrapperInternalFieldCount + 0;
    48     static v8::Handle<v8::Object> existingWrapper(TestOverridingNameGetter*);
     48    static v8::Handle<v8::Object> existingWrapper(TestCustomNamedGetter*);
    4949
    5050private:
    51     static v8::Handle<v8::Object> wrapSlow(TestOverridingNameGetter*);
     51    static v8::Handle<v8::Object> wrapSlow(TestCustomNamedGetter*);
    5252};
    5353
    54 ALWAYS_INLINE v8::Handle<v8::Object> V8TestOverridingNameGetter::existingWrapper(TestOverridingNameGetter* impl)
     54ALWAYS_INLINE v8::Handle<v8::Object> V8TestCustomNamedGetter::existingWrapper(TestCustomNamedGetter* impl)
    5555{
    5656    return getDOMObjectMap().get(impl);
    5757}
    5858
    59 v8::Handle<v8::Object> V8TestOverridingNameGetter::wrap(TestOverridingNameGetter* impl)
     59v8::Handle<v8::Object> V8TestCustomNamedGetter::wrap(TestCustomNamedGetter* impl)
    6060{
    6161        v8::Handle<v8::Object> wrapper = existingWrapper(impl);
    6262        if (!wrapper.IsEmpty())
    6363            return wrapper;
    64     return V8TestOverridingNameGetter::wrapSlow(impl);
     64    return V8TestCustomNamedGetter::wrapSlow(impl);
    6565}
    6666
    67 inline v8::Handle<v8::Value> toV8(TestOverridingNameGetter* impl)
     67inline v8::Handle<v8::Value> toV8(TestCustomNamedGetter* impl)
    6868{
    6969    if (!impl)
    7070        return v8::Null();
    71     return V8TestOverridingNameGetter::wrap(impl);
     71    return V8TestCustomNamedGetter::wrap(impl);
    7272}
    73 inline v8::Handle<v8::Value> toV8(PassRefPtr< TestOverridingNameGetter > impl)
     73inline v8::Handle<v8::Value> toV8(PassRefPtr< TestCustomNamedGetter > impl)
    7474{
    7575    return toV8(impl.get());
    … …  
    7878}
    7979
    80 #endif // V8TestOverridingNameGetter_h
     80#endif // V8TestCustomNamedGetter_h

  • trunk/Source/WebCore/html/HTMLDocument.idl

    r106776 r107039  
    2222
    2323    interface [
    24         HasOverridingNameGetter
     24        CustomNamedGetter
    2525    ] HTMLDocument : Document {
    2626        [JSCustom, V8Custom] void open();

  • trunk/Source/WebCore/html/HTMLFormElement.idl

    r106892 r107039  
    2323    interface [
    2424        IndexedGetter,
    25         HasOverridingNameGetter
     25        CustomNamedGetter
    2626    ] HTMLFormElement : HTMLElement {
    2727        readonly attribute HTMLCollection elements;

  • trunk/Source/WebCore/html/HTMLFrameSetElement.idl

    r106737 r107039  
    2222
    2323    interface [
    24         HasOverridingNameGetter
     24        CustomNamedGetter
    2525    ] HTMLFrameSetElement : HTMLElement {
    2626        attribute [Reflect] DOMString cols;
Note: See TracChangeset for help on using the changeset viewer.