+2012-02-07 Kentaro Hara <haraken@chromium.org>
+
+ 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):
+
2012-02-07 Emil A Eklund <eae@chromium.org>
Revert TableSection cell and border calculations to integers
}
};
- if (!$dataNode->extendedAttributes->{"HasOverridingNameGetter"}) {
+ if (!$dataNode->extendedAttributes->{"CustomNamedGetter"}) {
&$manualLookupGetterGeneration();
}
push(@getOwnPropertySlotImpl, " }\n");
}
- if ($dataNode->extendedAttributes->{"NamedGetter"} || $dataNode->extendedAttributes->{"HasOverridingNameGetter"}) {
+ if ($dataNode->extendedAttributes->{"NamedGetter"} || $dataNode->extendedAttributes->{"CustomNamedGetter"}) {
push(@getOwnPropertySlotImpl, " if (canGetItemsForName(exec, static_cast<$implClassName*>(thisObject->impl()), propertyName)) {\n");
push(@getOwnPropertySlotImpl, " slot.setCustom(thisObject, thisObject->nameGetter);\n");
push(@getOwnPropertySlotImpl, " return true;\n");
}
}
- if ($dataNode->extendedAttributes->{"HasOverridingNameGetter"}) {
+ if ($dataNode->extendedAttributes->{"CustomNamedGetter"}) {
&$manualLookupGetterGeneration();
}
push(@getOwnPropertyDescriptorImpl, " }\n");
}
};
-
- if (!$dataNode->extendedAttributes->{"HasOverridingNameGetter"}) {
+
+ if (!$dataNode->extendedAttributes->{"CustomNamedGetter"}) {
&$manualLookupGetterGeneration();
}
-
+
if ($dataNode->extendedAttributes->{"IndexedGetter"} || $dataNode->extendedAttributes->{"HasNumericIndexGetter"}) {
push(@getOwnPropertyDescriptorImpl, " bool ok;\n");
push(@getOwnPropertyDescriptorImpl, " unsigned index = propertyName.toUInt32(ok);\n");
push(@getOwnPropertyDescriptorImpl, " return true;\n");
push(@getOwnPropertyDescriptorImpl, " }\n");
}
-
- if ($dataNode->extendedAttributes->{"NamedGetter"} || $dataNode->extendedAttributes->{"HasOverridingNameGetter"}) {
+
+ if ($dataNode->extendedAttributes->{"NamedGetter"} || $dataNode->extendedAttributes->{"CustomNamedGetter"}) {
push(@getOwnPropertyDescriptorImpl, " if (canGetItemsForName(exec, static_cast<$implClassName*>(thisObject->impl()), propertyName)) {\n");
push(@getOwnPropertyDescriptorImpl, " ${namespaceMaybe}PropertySlot slot;\n");
push(@getOwnPropertyDescriptorImpl, " slot.setCustom(thisObject, nameGetter);\n");
$implIncludes{"wtf/text/AtomicString.h"} = 1;
}
}
-
- if ($dataNode->extendedAttributes->{"HasOverridingNameGetter"}) {
+
+ if ($dataNode->extendedAttributes->{"CustomNamedGetter"}) {
&$manualLookupGetterGeneration();
}
-
+
if ($dataNode->extendedAttributes->{"DelegatingGetOwnPropertySlot"}) {
push(@getOwnPropertyDescriptorImpl, " if (thisObject->getOwnPropertyDescriptorDelegate(exec, propertyName, descriptor))\n");
push(@getOwnPropertyDescriptorImpl, " return true;\n");
}
-
+
if ($hasAttributes) {
if ($inlined) {
die "Cannot inline if NoStaticTables is set." if ($dataNode->extendedAttributes->{"JSNoStaticTables"});
$implIncludes{"${className}Custom.h"} = 1 if !$dataNode->extendedAttributes->{"CustomHeader"} && ($dataNode->extendedAttributes->{"CustomPutFunction"} || $dataNode->extendedAttributes->{"DelegatingPutFunction"});
- my $hasGetter = $numAttributes > 0
+ my $hasGetter = $numAttributes > 0
|| !$dataNode->extendedAttributes->{"OmitConstructor"}
|| $dataNode->extendedAttributes->{"IndexedGetter"}
|| $dataNode->extendedAttributes->{"HasNumericIndexGetter"}
|| $dataNode->extendedAttributes->{"CustomGetOwnPropertySlot"}
|| $dataNode->extendedAttributes->{"DelegatingGetOwnPropertySlot"}
|| $dataNode->extendedAttributes->{"NamedGetter"}
- || $dataNode->extendedAttributes->{"HasOverridingNameGetter"};
+ || $dataNode->extendedAttributes->{"CustomNamedGetter"};
# Getters
if ($hasGetter) {
push(@headerContent, " static bool getOwnPropertySlot(JSC::JSCell*, JSC::ExecState*, const JSC::Identifier& propertyName, JSC::PropertySlot&);\n");
push(@headerContent, " static bool getOwnPropertyDescriptor(JSC::JSObject*, JSC::ExecState*, const JSC::Identifier& propertyName, JSC::PropertyDescriptor&);\n");
- push(@headerContent, " static bool getOwnPropertySlotByIndex(JSC::JSCell*, JSC::ExecState*, unsigned propertyName, JSC::PropertySlot&);\n") if ($dataNode->extendedAttributes->{"IndexedGetter"} || $dataNode->extendedAttributes->{"HasNumericIndexGetter"}) && !$dataNode->extendedAttributes->{"HasOverridingNameGetter"};
+ push(@headerContent, " static bool getOwnPropertySlotByIndex(JSC::JSCell*, JSC::ExecState*, unsigned propertyName, JSC::PropertySlot&);\n") if ($dataNode->extendedAttributes->{"IndexedGetter"} || $dataNode->extendedAttributes->{"HasNumericIndexGetter"}) && !$dataNode->extendedAttributes->{"CustomNamedGetter"};
push(@headerContent, " bool getOwnPropertySlotDelegate(JSC::ExecState*, const JSC::Identifier&, JSC::PropertySlot&);\n") if $dataNode->extendedAttributes->{"DelegatingGetOwnPropertySlot"};
push(@headerContent, " bool getOwnPropertyDescriptorDelegate(JSC::ExecState*, const JSC::Identifier&, JSC::PropertyDescriptor&);\n") if $dataNode->extendedAttributes->{"DelegatingGetOwnPropertySlot"};
$structureFlags{"JSC::OverridesGetOwnPropertySlot"} = 1;
push(@headerContent, " JSC::JSValue getByIndex(JSC::ExecState*, unsigned index);\n");
}
-
+
# Index setter
if ($dataNode->extendedAttributes->{"CustomIndexedSetter"}) {
push(@headerContent, " void indexSetter(JSC::ExecState*, unsigned index, JSC::JSValue);\n");
}
# Name getter
- if ($dataNode->extendedAttributes->{"NamedGetter"} || $dataNode->extendedAttributes->{"HasOverridingNameGetter"}) {
+ if ($dataNode->extendedAttributes->{"NamedGetter"} || $dataNode->extendedAttributes->{"CustomNamedGetter"}) {
push(@headerContent, "private:\n");
push(@headerContent, " static bool canGetItemsForName(JSC::ExecState*, $implClassName*, const JSC::Identifier&);\n");
push(@headerContent, " static JSC::JSValue nameGetter(JSC::ExecState*, JSC::JSValue, const JSC::Identifier&);\n");
push(@implContent, "}\n\n");
}
- my $hasGetter = $numAttributes > 0
+ my $hasGetter = $numAttributes > 0
|| !$dataNode->extendedAttributes->{"OmitConstructor"}
|| $dataNode->extendedAttributes->{"IndexedGetter"}
|| $dataNode->extendedAttributes->{"HasNumericIndexGetter"}
|| $dataNode->extendedAttributes->{"DelegatingGetOwnPropertySlot"}
|| $dataNode->extendedAttributes->{"CustomGetOwnPropertySlot"}
|| $dataNode->extendedAttributes->{"NamedGetter"}
- || $dataNode->extendedAttributes->{"HasOverridingNameGetter"};
+ || $dataNode->extendedAttributes->{"CustomNamedGetter"};
# Attributes
if ($hasGetter) {
push(@implContent, "}\n\n");
}
- if (($dataNode->extendedAttributes->{"IndexedGetter"} || $dataNode->extendedAttributes->{"HasNumericIndexGetter"})
- && !$dataNode->extendedAttributes->{"HasOverridingNameGetter"}) {
+ if (($dataNode->extendedAttributes->{"IndexedGetter"} || $dataNode->extendedAttributes->{"HasNumericIndexGetter"})
+ && !$dataNode->extendedAttributes->{"CustomNamedGetter"}) {
push(@implContent, "bool ${className}::getOwnPropertySlotByIndex(JSCell* cell, ExecState* exec, unsigned propertyName, PropertySlot& slot)\n");
push(@implContent, "{\n");
push(@implContent, " ${className}* thisObject = jsCast<${className}*>(cell);\n");
my $interfaceName = $dataNode->name;
my $hasCustomIndexedGetter = $dataNode->extendedAttributes->{"IndexedGetter"} || $dataNode->extendedAttributes->{"CustomGetOwnPropertySlot"};
my $hasCustomIndexedSetter = $dataNode->extendedAttributes->{"CustomIndexedSetter"} && !$dataNode->extendedAttributes->{"HasNumericIndexGetter"};
- my $hasCustomNamedGetter = $dataNode->extendedAttributes->{"NamedGetter"} || $dataNode->extendedAttributes->{"HasOverridingNameGetter"} || $dataNode->extendedAttributes->{"CustomGetOwnPropertySlot"};
+ my $hasCustomNamedGetter = $dataNode->extendedAttributes->{"NamedGetter"} || $dataNode->extendedAttributes->{"CustomNamedGetter"} || $dataNode->extendedAttributes->{"CustomGetOwnPropertySlot"};
my $hasCustomNamedSetter = $dataNode->extendedAttributes->{"DelegatingPutFunction"};
my $hasCustomDeleters = $dataNode->extendedAttributes->{"CustomDeleteProperty"};
my $hasCustomEnumerator = $dataNode->extendedAttributes->{"CustomGetPropertyNames"};
my $dataNode = shift;
my $namedPropertyGetter = shift;
my $interfaceName = $dataNode->name;
- my $hasCustomGetter = $dataNode->extendedAttributes->{"HasOverridingNameGetter"} || $dataNode->extendedAttributes->{"CustomGetOwnPropertySlot"};
+ my $hasCustomNamedGetter = $dataNode->extendedAttributes->{"CustomNamedGetter"} || $dataNode->extendedAttributes->{"CustomGetOwnPropertySlot"};
# FIXME: Remove hard-coded HTMLOptionsCollection reference by changing HTMLOptionsCollection to not inherit
# from HTMLCollection per W3C spec (http://www.w3.org/TR/2003/REC-DOM-Level-2-HTML-20030109/html.html#HTMLOptionsCollection).
if ($interfaceName eq "HTMLOptionsCollection") {
$interfaceName = "HTMLCollection";
- $hasCustomGetter = 1;
+ $hasCustomNamedGetter = 1;
}
if ($interfaceName eq "HTMLAppletElement" || $interfaceName eq "HTMLEmbedElement" || $interfaceName eq "HTMLObjectElement") {
- $hasCustomGetter = 1;
+ $hasCustomNamedGetter = 1;
}
if ($interfaceName eq "HTMLDocument") {
- $hasCustomGetter = 0;
+ $hasCustomNamedGetter = 0;
}
- my $hasGetter = $dataNode->extendedAttributes->{"NamedGetter"} || $hasCustomGetter;
+ my $hasGetter = $dataNode->extendedAttributes->{"NamedGetter"} || $hasCustomNamedGetter;
if (!$hasGetter) {
return;
}
$namedPropertyGetter = $codeGenerator->FindSuperMethod($dataNode, "namedItem");
}
- if ($namedPropertyGetter && $namedPropertyGetter->type ne "Node" && !$namedPropertyGetter->extendedAttributes->{"Custom"} && !$hasCustomGetter) {
+ if ($namedPropertyGetter && $namedPropertyGetter->type ne "Node" && !$namedPropertyGetter->extendedAttributes->{"Custom"} && !$hasCustomNamedGetter) {
AddToImplIncludes("V8Collection.h");
my $type = $namedPropertyGetter->type;
push(@implContent, <<END);
*/
#include "config.h"
-#include "WebDOMTestOverridingNameGetter.h"
+#include "WebDOMTestCustomNamedGetter.h"
#include "KURL.h"
-#include "TestOverridingNameGetter.h"
+#include "TestCustomNamedGetter.h"
#include "WebDOMString.h"
#include "WebExceptionHandler.h"
#include "wtf/text/AtomicString.h"
#include <wtf/GetPtr.h>
#include <wtf/RefPtr.h>
-struct WebDOMTestOverridingNameGetter::WebDOMTestOverridingNameGetterPrivate {
- WebDOMTestOverridingNameGetterPrivate(WebCore::TestOverridingNameGetter* object = 0)
+struct WebDOMTestCustomNamedGetter::WebDOMTestCustomNamedGetterPrivate {
+ WebDOMTestCustomNamedGetterPrivate(WebCore::TestCustomNamedGetter* object = 0)
: impl(object)
{
}
- RefPtr<WebCore::TestOverridingNameGetter> impl;
+ RefPtr<WebCore::TestCustomNamedGetter> impl;
};
-WebDOMTestOverridingNameGetter::WebDOMTestOverridingNameGetter()
+WebDOMTestCustomNamedGetter::WebDOMTestCustomNamedGetter()
: WebDOMObject()
, m_impl(0)
{
}
-WebDOMTestOverridingNameGetter::WebDOMTestOverridingNameGetter(WebCore::TestOverridingNameGetter* impl)
+WebDOMTestCustomNamedGetter::WebDOMTestCustomNamedGetter(WebCore::TestCustomNamedGetter* impl)
: WebDOMObject()
- , m_impl(new WebDOMTestOverridingNameGetterPrivate(impl))
+ , m_impl(new WebDOMTestCustomNamedGetterPrivate(impl))
{
}
-WebDOMTestOverridingNameGetter::WebDOMTestOverridingNameGetter(const WebDOMTestOverridingNameGetter& copy)
+WebDOMTestCustomNamedGetter::WebDOMTestCustomNamedGetter(const WebDOMTestCustomNamedGetter& copy)
: WebDOMObject()
{
- m_impl = copy.impl() ? new WebDOMTestOverridingNameGetterPrivate(copy.impl()) : 0;
+ m_impl = copy.impl() ? new WebDOMTestCustomNamedGetterPrivate(copy.impl()) : 0;
}
-WebDOMTestOverridingNameGetter& WebDOMTestOverridingNameGetter::operator=(const WebDOMTestOverridingNameGetter& copy)
+WebDOMTestCustomNamedGetter& WebDOMTestCustomNamedGetter::operator=(const WebDOMTestCustomNamedGetter& copy)
{
delete m_impl;
- m_impl = copy.impl() ? new WebDOMTestOverridingNameGetterPrivate(copy.impl()) : 0;
+ m_impl = copy.impl() ? new WebDOMTestCustomNamedGetterPrivate(copy.impl()) : 0;
return *this;
}
-WebCore::TestOverridingNameGetter* WebDOMTestOverridingNameGetter::impl() const
+WebCore::TestCustomNamedGetter* WebDOMTestCustomNamedGetter::impl() const
{
return m_impl ? WTF::getPtr(m_impl->impl) : 0;
}
-WebDOMTestOverridingNameGetter::~WebDOMTestOverridingNameGetter()
+WebDOMTestCustomNamedGetter::~WebDOMTestCustomNamedGetter()
{
delete m_impl;
m_impl = 0;
}
-void WebDOMTestOverridingNameGetter::anotherFunction(const WebDOMString& str)
+void WebDOMTestCustomNamedGetter::anotherFunction(const WebDOMString& str)
{
if (!impl())
return;
impl()->anotherFunction(str);
}
-WebCore::TestOverridingNameGetter* toWebCore(const WebDOMTestOverridingNameGetter& wrapper)
+WebCore::TestCustomNamedGetter* toWebCore(const WebDOMTestCustomNamedGetter& wrapper)
{
return wrapper.impl();
}
-WebDOMTestOverridingNameGetter toWebKit(WebCore::TestOverridingNameGetter* value)
+WebDOMTestCustomNamedGetter toWebKit(WebCore::TestCustomNamedGetter* value)
{
- return WebDOMTestOverridingNameGetter(value);
+ return WebDOMTestCustomNamedGetter(value);
}
* Boston, MA 02110-1301, USA.
*/
-#ifndef WebDOMTestOverridingNameGetter_h
-#define WebDOMTestOverridingNameGetter_h
+#ifndef WebDOMTestCustomNamedGetter_h
+#define WebDOMTestCustomNamedGetter_h
#include <WebDOMObject.h>
#include <WebDOMString.h>
namespace WebCore {
-class TestOverridingNameGetter;
+class TestCustomNamedGetter;
};
-class WebDOMTestOverridingNameGetter : public WebDOMObject {
+class WebDOMTestCustomNamedGetter : public WebDOMObject {
public:
- WebDOMTestOverridingNameGetter();
- explicit WebDOMTestOverridingNameGetter(WebCore::TestOverridingNameGetter*);
- WebDOMTestOverridingNameGetter(const WebDOMTestOverridingNameGetter&);
- WebDOMTestOverridingNameGetter& operator=(const WebDOMTestOverridingNameGetter&);
- virtual ~WebDOMTestOverridingNameGetter();
+ WebDOMTestCustomNamedGetter();
+ explicit WebDOMTestCustomNamedGetter(WebCore::TestCustomNamedGetter*);
+ WebDOMTestCustomNamedGetter(const WebDOMTestCustomNamedGetter&);
+ WebDOMTestCustomNamedGetter& operator=(const WebDOMTestCustomNamedGetter&);
+ virtual ~WebDOMTestCustomNamedGetter();
void anotherFunction(const WebDOMString& str);
- WebCore::TestOverridingNameGetter* impl() const;
+ WebCore::TestCustomNamedGetter* impl() const;
protected:
- struct WebDOMTestOverridingNameGetterPrivate;
- WebDOMTestOverridingNameGetterPrivate* m_impl;
+ struct WebDOMTestCustomNamedGetterPrivate;
+ WebDOMTestCustomNamedGetterPrivate* m_impl;
};
-WebCore::TestOverridingNameGetter* toWebCore(const WebDOMTestOverridingNameGetter&);
-WebDOMTestOverridingNameGetter toWebKit(WebCore::TestOverridingNameGetter*);
+WebCore::TestCustomNamedGetter* toWebCore(const WebDOMTestCustomNamedGetter&);
+WebDOMTestCustomNamedGetter toWebKit(WebCore::TestCustomNamedGetter*);
#endif
#include "DOMObjectCache.h"
#include "ExceptionCode.h"
#include "JSMainThreadExecState.h"
-#include "TestOverridingNameGetter.h"
+#include "TestCustomNamedGetter.h"
#include "WebKitDOMBinding.h"
#include "gobject/ConvertToUTF8String.h"
-#include "webkit/WebKitDOMTestOverridingNameGetter.h"
-#include "webkit/WebKitDOMTestOverridingNameGetterPrivate.h"
+#include "webkit/WebKitDOMTestCustomNamedGetter.h"
+#include "webkit/WebKitDOMTestCustomNamedGetterPrivate.h"
#include "webkitdefines.h"
#include "webkitglobalsprivate.h"
#include "webkitmarshal.h"
namespace WebKit {
-WebKitDOMTestOverridingNameGetter* kit(WebCore::TestOverridingNameGetter* obj)
+WebKitDOMTestCustomNamedGetter* kit(WebCore::TestCustomNamedGetter* obj)
{
g_return_val_if_fail(obj, 0);
if (gpointer ret = DOMObjectCache::get(obj))
- return static_cast<WebKitDOMTestOverridingNameGetter*>(ret);
+ return static_cast<WebKitDOMTestCustomNamedGetter*>(ret);
- return static_cast<WebKitDOMTestOverridingNameGetter*>(DOMObjectCache::put(obj, WebKit::wrapTestOverridingNameGetter(obj)));
+ return static_cast<WebKitDOMTestCustomNamedGetter*>(DOMObjectCache::put(obj, WebKit::wrapTestCustomNamedGetter(obj)));
}
} // namespace WebKit //
void
-webkit_dom_test_overriding_name_getter_another_function(WebKitDOMTestOverridingNameGetter* self, const gchar* str)
+webkit_dom_test_custom_named_getter_another_function(WebKitDOMTestCustomNamedGetter* self, const gchar* str)
{
g_return_if_fail(self);
WebCore::JSMainThreadNullState state;
- WebCore::TestOverridingNameGetter * item = WebKit::core(self);
+ WebCore::TestCustomNamedGetter * item = WebKit::core(self);
g_return_if_fail(str);
WTF::String converted_str = WTF::String::fromUTF8(str);
item->anotherFunction(converted_str);
}
-G_DEFINE_TYPE(WebKitDOMTestOverridingNameGetter, webkit_dom_test_overriding_name_getter, WEBKIT_TYPE_DOM_OBJECT)
+G_DEFINE_TYPE(WebKitDOMTestCustomNamedGetter, webkit_dom_test_custom_named_getter, WEBKIT_TYPE_DOM_OBJECT)
namespace WebKit {
-WebCore::TestOverridingNameGetter* core(WebKitDOMTestOverridingNameGetter* request)
+WebCore::TestCustomNamedGetter* core(WebKitDOMTestCustomNamedGetter* request)
{
g_return_val_if_fail(request, 0);
- WebCore::TestOverridingNameGetter* coreObject = static_cast<WebCore::TestOverridingNameGetter*>(WEBKIT_DOM_OBJECT(request)->coreObject);
+ WebCore::TestCustomNamedGetter* coreObject = static_cast<WebCore::TestCustomNamedGetter*>(WEBKIT_DOM_OBJECT(request)->coreObject);
g_return_val_if_fail(coreObject, 0);
return coreObject;
};
-static void webkit_dom_test_overriding_name_getter_finalize(GObject* object)
+static void webkit_dom_test_custom_named_getter_finalize(GObject* object)
{
WebKitDOMObject* dom_object = WEBKIT_DOM_OBJECT(object);
if (dom_object->coreObject) {
- WebCore::TestOverridingNameGetter* coreObject = static_cast<WebCore::TestOverridingNameGetter *>(dom_object->coreObject);
+ WebCore::TestCustomNamedGetter* coreObject = static_cast<WebCore::TestCustomNamedGetter *>(dom_object->coreObject);
WebKit::DOMObjectCache::forget(coreObject);
coreObject->deref();
dom_object->coreObject = NULL;
}
- G_OBJECT_CLASS(webkit_dom_test_overriding_name_getter_parent_class)->finalize(object);
+ G_OBJECT_CLASS(webkit_dom_test_custom_named_getter_parent_class)->finalize(object);
}
-static void webkit_dom_test_overriding_name_getter_set_property(GObject* object, guint prop_id, const GValue* value, GParamSpec* pspec)
+static void webkit_dom_test_custom_named_getter_set_property(GObject* object, guint prop_id, const GValue* value, GParamSpec* pspec)
{
WebCore::JSMainThreadNullState state;
switch (prop_id) {
}
-static void webkit_dom_test_overriding_name_getter_get_property(GObject* object, guint prop_id, GValue* value, GParamSpec* pspec)
+static void webkit_dom_test_custom_named_getter_get_property(GObject* object, guint prop_id, GValue* value, GParamSpec* pspec)
{
WebCore::JSMainThreadNullState state;
switch (prop_id) {
}
-static void webkit_dom_test_overriding_name_getter_constructed(GObject* object)
+static void webkit_dom_test_custom_named_getter_constructed(GObject* object)
{
- if (G_OBJECT_CLASS(webkit_dom_test_overriding_name_getter_parent_class)->constructed)
- G_OBJECT_CLASS(webkit_dom_test_overriding_name_getter_parent_class)->constructed(object);
+ if (G_OBJECT_CLASS(webkit_dom_test_custom_named_getter_parent_class)->constructed)
+ G_OBJECT_CLASS(webkit_dom_test_custom_named_getter_parent_class)->constructed(object);
}
-static void webkit_dom_test_overriding_name_getter_class_init(WebKitDOMTestOverridingNameGetterClass* requestClass)
+static void webkit_dom_test_custom_named_getter_class_init(WebKitDOMTestCustomNamedGetterClass* requestClass)
{
GObjectClass *gobjectClass = G_OBJECT_CLASS(requestClass);
- gobjectClass->finalize = webkit_dom_test_overriding_name_getter_finalize;
- gobjectClass->set_property = webkit_dom_test_overriding_name_getter_set_property;
- gobjectClass->get_property = webkit_dom_test_overriding_name_getter_get_property;
- gobjectClass->constructed = webkit_dom_test_overriding_name_getter_constructed;
+ gobjectClass->finalize = webkit_dom_test_custom_named_getter_finalize;
+ gobjectClass->set_property = webkit_dom_test_custom_named_getter_set_property;
+ gobjectClass->get_property = webkit_dom_test_custom_named_getter_get_property;
+ gobjectClass->constructed = webkit_dom_test_custom_named_getter_constructed;
}
-static void webkit_dom_test_overriding_name_getter_init(WebKitDOMTestOverridingNameGetter* request)
+static void webkit_dom_test_custom_named_getter_init(WebKitDOMTestCustomNamedGetter* request)
{
}
namespace WebKit {
-WebKitDOMTestOverridingNameGetter* wrapTestOverridingNameGetter(WebCore::TestOverridingNameGetter* coreObject)
+WebKitDOMTestCustomNamedGetter* wrapTestCustomNamedGetter(WebCore::TestCustomNamedGetter* coreObject)
{
g_return_val_if_fail(coreObject, 0);
*/
coreObject->ref();
- return WEBKIT_DOM_TEST_OVERRIDING_NAME_GETTER(g_object_new(WEBKIT_TYPE_DOM_TEST_OVERRIDING_NAME_GETTER,
+ return WEBKIT_DOM_TEST_CUSTOM_NAMED_GETTER(g_object_new(WEBKIT_TYPE_DOM_TEST_CUSTOM_NAMED_GETTER,
"core-object", coreObject, NULL));
}
} // namespace WebKit
--- /dev/null
+/*
+ This file is part of the WebKit open source project.
+ This file has been generated by generate-bindings.pl. DO NOT MODIFY!
+
+ This library is free software; you can redistribute it and/or
+ modify it under the terms of the GNU Library General Public
+ License as published by the Free Software Foundation; either
+ version 2 of the License, or (at your option) any later version.
+
+ This library is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ Library General Public License for more details.
+
+ You should have received a copy of the GNU Library General Public License
+ along with this library; see the file COPYING.LIB. If not, write to
+ the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+ Boston, MA 02110-1301, USA.
+*/
+
+#ifndef WebKitDOMTestCustomNamedGetter_h
+#define WebKitDOMTestCustomNamedGetter_h
+
+#include "webkit/webkitdomdefines.h"
+#include <glib-object.h>
+#include <webkit/webkitdefines.h>
+#include "webkit/WebKitDOMObject.h"
+
+
+G_BEGIN_DECLS
+#define WEBKIT_TYPE_DOM_TEST_CUSTOM_NAMED_GETTER (webkit_dom_test_custom_named_getter_get_type())
+#define WEBKIT_DOM_TEST_CUSTOM_NAMED_GETTER(obj) (G_TYPE_CHECK_INSTANCE_CAST((obj), WEBKIT_TYPE_DOM_TEST_CUSTOM_NAMED_GETTER, WebKitDOMTestCustomNamedGetter))
+#define WEBKIT_DOM_TEST_CUSTOM_NAMED_GETTER_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST((klass), WEBKIT_TYPE_DOM_TEST_CUSTOM_NAMED_GETTER, WebKitDOMTestCustomNamedGetterClass)
+#define WEBKIT_DOM_IS_TEST_CUSTOM_NAMED_GETTER(obj) (G_TYPE_CHECK_INSTANCE_TYPE((obj), WEBKIT_TYPE_DOM_TEST_CUSTOM_NAMED_GETTER))
+#define WEBKIT_DOM_IS_TEST_CUSTOM_NAMED_GETTER_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE((klass), WEBKIT_TYPE_DOM_TEST_CUSTOM_NAMED_GETTER))
+#define WEBKIT_DOM_TEST_CUSTOM_NAMED_GETTER_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS((obj), WEBKIT_TYPE_DOM_TEST_CUSTOM_NAMED_GETTER, WebKitDOMTestCustomNamedGetterClass))
+
+struct _WebKitDOMTestCustomNamedGetter {
+ WebKitDOMObject parent_instance;
+};
+
+struct _WebKitDOMTestCustomNamedGetterClass {
+ WebKitDOMObjectClass parent_class;
+};
+
+WEBKIT_API GType
+webkit_dom_test_custom_named_getter_get_type (void);
+
+/**
+ * webkit_dom_test_custom_named_getter_another_function:
+ * @self: A #WebKitDOMTestCustomNamedGetter
+ * @str: A #gchar
+ *
+ * Returns:
+ *
+**/
+WEBKIT_API void
+webkit_dom_test_custom_named_getter_another_function(WebKitDOMTestCustomNamedGetter* self, const gchar* str);
+
+G_END_DECLS
+
+#endif /* WebKitDOMTestCustomNamedGetter_h */
Boston, MA 02110-1301, USA.
*/
-#ifndef WEB_KIT_DOM_TEST_OVERRIDING_NAME_GETTER_PRIVATE_H
-#define WEB_KIT_DOM_TEST_OVERRIDING_NAME_GETTER_PRIVATE_H
+#ifndef WEB_KIT_DOM_TEST_CUSTOM_NAMED_GETTER_PRIVATE_H
+#define WEB_KIT_DOM_TEST_CUSTOM_NAMED_GETTER_PRIVATE_H
#include <glib-object.h>
#include <webkit/WebKitDOMObject.h>
-#include "TestOverridingNameGetter.h"
+#include "TestCustomNamedGetter.h"
namespace WebKit {
- WebKitDOMTestOverridingNameGetter *
- wrapTestOverridingNameGetter(WebCore::TestOverridingNameGetter *coreObject);
+ WebKitDOMTestCustomNamedGetter *
+ wrapTestCustomNamedGetter(WebCore::TestCustomNamedGetter *coreObject);
- WebCore::TestOverridingNameGetter *
- core(WebKitDOMTestOverridingNameGetter *request);
+ WebCore::TestCustomNamedGetter *
+ core(WebKitDOMTestCustomNamedGetter *request);
- WebKitDOMTestOverridingNameGetter*
- kit(WebCore::TestOverridingNameGetter* node);
+ WebKitDOMTestCustomNamedGetter*
+ kit(WebCore::TestCustomNamedGetter* node);
} // namespace WebKit
-#endif /* WEB_KIT_DOM_TEST_OVERRIDING_NAME_GETTER_PRIVATE_H */
+#endif /* WEB_KIT_DOM_TEST_CUSTOM_NAMED_GETTER_PRIVATE_H */
+++ /dev/null
-/*
- This file is part of the WebKit open source project.
- This file has been generated by generate-bindings.pl. DO NOT MODIFY!
-
- This library is free software; you can redistribute it and/or
- modify it under the terms of the GNU Library General Public
- License as published by the Free Software Foundation; either
- version 2 of the License, or (at your option) any later version.
-
- This library is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- Library General Public License for more details.
-
- You should have received a copy of the GNU Library General Public License
- along with this library; see the file COPYING.LIB. If not, write to
- the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
- Boston, MA 02110-1301, USA.
-*/
-
-#ifndef WebKitDOMTestOverridingNameGetter_h
-#define WebKitDOMTestOverridingNameGetter_h
-
-#include "webkit/webkitdomdefines.h"
-#include <glib-object.h>
-#include <webkit/webkitdefines.h>
-#include "webkit/WebKitDOMObject.h"
-
-
-G_BEGIN_DECLS
-#define WEBKIT_TYPE_DOM_TEST_OVERRIDING_NAME_GETTER (webkit_dom_test_overriding_name_getter_get_type())
-#define WEBKIT_DOM_TEST_OVERRIDING_NAME_GETTER(obj) (G_TYPE_CHECK_INSTANCE_CAST((obj), WEBKIT_TYPE_DOM_TEST_OVERRIDING_NAME_GETTER, WebKitDOMTestOverridingNameGetter))
-#define WEBKIT_DOM_TEST_OVERRIDING_NAME_GETTER_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST((klass), WEBKIT_TYPE_DOM_TEST_OVERRIDING_NAME_GETTER, WebKitDOMTestOverridingNameGetterClass)
-#define WEBKIT_DOM_IS_TEST_OVERRIDING_NAME_GETTER(obj) (G_TYPE_CHECK_INSTANCE_TYPE((obj), WEBKIT_TYPE_DOM_TEST_OVERRIDING_NAME_GETTER))
-#define WEBKIT_DOM_IS_TEST_OVERRIDING_NAME_GETTER_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE((klass), WEBKIT_TYPE_DOM_TEST_OVERRIDING_NAME_GETTER))
-#define WEBKIT_DOM_TEST_OVERRIDING_NAME_GETTER_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS((obj), WEBKIT_TYPE_DOM_TEST_OVERRIDING_NAME_GETTER, WebKitDOMTestOverridingNameGetterClass))
-
-struct _WebKitDOMTestOverridingNameGetter {
- WebKitDOMObject parent_instance;
-};
-
-struct _WebKitDOMTestOverridingNameGetterClass {
- WebKitDOMObjectClass parent_class;
-};
-
-WEBKIT_API GType
-webkit_dom_test_overriding_name_getter_get_type (void);
-
-/**
- * webkit_dom_test_overriding_name_getter_another_function:
- * @self: A #WebKitDOMTestOverridingNameGetter
- * @str: A #gchar
- *
- * Returns:
- *
-**/
-WEBKIT_API void
-webkit_dom_test_overriding_name_getter_another_function(WebKitDOMTestOverridingNameGetter* self, const gchar* str);
-
-G_END_DECLS
-
-#endif /* WebKitDOMTestOverridingNameGetter_h */
--- /dev/null
+/*
+ This file is part of the WebKit open source project.
+ This file has been generated by generate-bindings.pl. DO NOT MODIFY!
+
+ This library is free software; you can redistribute it and/or
+ modify it under the terms of the GNU Library General Public
+ License as published by the Free Software Foundation; either
+ version 2 of the License, or (at your option) any later version.
+
+ This library is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ Library General Public License for more details.
+
+ You should have received a copy of the GNU Library General Public License
+ along with this library; see the file COPYING.LIB. If not, write to
+ the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+ Boston, MA 02110-1301, USA.
+*/
+
+#include "config.h"
+#include "JSTestCustomNamedGetter.h"
+
+#include "ExceptionCode.h"
+#include "JSDOMBinding.h"
+#include "TestCustomNamedGetter.h"
+#include "wtf/text/AtomicString.h"
+#include <runtime/Error.h>
+#include <wtf/GetPtr.h>
+
+using namespace JSC;
+
+namespace WebCore {
+
+ASSERT_CLASS_FITS_IN_CELL(JSTestCustomNamedGetter);
+ASSERT_HAS_TRIVIAL_DESTRUCTOR(JSTestCustomNamedGetter);
+
+/* Hash table */
+
+static const HashTableValue JSTestCustomNamedGetterTableValues[] =
+{
+ { "constructor", DontEnum | ReadOnly, (intptr_t)static_cast<PropertySlot::GetValueFunc>(jsTestCustomNamedGetterConstructor), (intptr_t)0, NoIntrinsic },
+ { 0, 0, 0, 0, NoIntrinsic }
+};
+
+static const HashTable JSTestCustomNamedGetterTable = { 2, 1, JSTestCustomNamedGetterTableValues, 0 };
+/* Hash table for constructor */
+
+static const HashTableValue JSTestCustomNamedGetterConstructorTableValues[] =
+{
+ { 0, 0, 0, 0, NoIntrinsic }
+};
+
+static const HashTable JSTestCustomNamedGetterConstructorTable = { 1, 0, JSTestCustomNamedGetterConstructorTableValues, 0 };
+ASSERT_HAS_TRIVIAL_DESTRUCTOR(JSTestCustomNamedGetterConstructor);
+
+const ClassInfo JSTestCustomNamedGetterConstructor::s_info = { "TestCustomNamedGetterConstructor", &Base::s_info, &JSTestCustomNamedGetterConstructorTable, 0, CREATE_METHOD_TABLE(JSTestCustomNamedGetterConstructor) };
+
+JSTestCustomNamedGetterConstructor::JSTestCustomNamedGetterConstructor(Structure* structure, JSDOMGlobalObject* globalObject)
+ : DOMConstructorObject(structure, globalObject)
+{
+}
+
+void JSTestCustomNamedGetterConstructor::finishCreation(ExecState* exec, JSDOMGlobalObject* globalObject)
+{
+ Base::finishCreation(exec->globalData());
+ ASSERT(inherits(&s_info));
+ putDirect(exec->globalData(), exec->propertyNames().prototype, JSTestCustomNamedGetterPrototype::self(exec, globalObject), DontDelete | ReadOnly);
+}
+
+bool JSTestCustomNamedGetterConstructor::getOwnPropertySlot(JSCell* cell, ExecState* exec, const Identifier& propertyName, PropertySlot& slot)
+{
+ return getStaticValueSlot<JSTestCustomNamedGetterConstructor, JSDOMWrapper>(exec, &JSTestCustomNamedGetterConstructorTable, static_cast<JSTestCustomNamedGetterConstructor*>(cell), propertyName, slot);
+}
+
+bool JSTestCustomNamedGetterConstructor::getOwnPropertyDescriptor(JSObject* object, ExecState* exec, const Identifier& propertyName, PropertyDescriptor& descriptor)
+{
+ return getStaticValueDescriptor<JSTestCustomNamedGetterConstructor, JSDOMWrapper>(exec, &JSTestCustomNamedGetterConstructorTable, static_cast<JSTestCustomNamedGetterConstructor*>(object), propertyName, descriptor);
+}
+
+/* Hash table for prototype */
+
+static const HashTableValue JSTestCustomNamedGetterPrototypeTableValues[] =
+{
+ { "anotherFunction", DontDelete | JSC::Function, (intptr_t)static_cast<NativeFunction>(jsTestCustomNamedGetterPrototypeFunctionAnotherFunction), (intptr_t)1, NoIntrinsic },
+ { 0, 0, 0, 0, NoIntrinsic }
+};
+
+static const HashTable JSTestCustomNamedGetterPrototypeTable = { 2, 1, JSTestCustomNamedGetterPrototypeTableValues, 0 };
+const ClassInfo JSTestCustomNamedGetterPrototype::s_info = { "TestCustomNamedGetterPrototype", &Base::s_info, &JSTestCustomNamedGetterPrototypeTable, 0, CREATE_METHOD_TABLE(JSTestCustomNamedGetterPrototype) };
+
+JSObject* JSTestCustomNamedGetterPrototype::self(ExecState* exec, JSGlobalObject* globalObject)
+{
+ return getDOMPrototype<JSTestCustomNamedGetter>(exec, globalObject);
+}
+
+bool JSTestCustomNamedGetterPrototype::getOwnPropertySlot(JSCell* cell, ExecState* exec, const Identifier& propertyName, PropertySlot& slot)
+{
+ JSTestCustomNamedGetterPrototype* thisObject = jsCast<JSTestCustomNamedGetterPrototype*>(cell);
+ return getStaticFunctionSlot<JSObject>(exec, &JSTestCustomNamedGetterPrototypeTable, thisObject, propertyName, slot);
+}
+
+bool JSTestCustomNamedGetterPrototype::getOwnPropertyDescriptor(JSObject* object, ExecState* exec, const Identifier& propertyName, PropertyDescriptor& descriptor)
+{
+ JSTestCustomNamedGetterPrototype* thisObject = jsCast<JSTestCustomNamedGetterPrototype*>(object);
+ return getStaticFunctionDescriptor<JSObject>(exec, &JSTestCustomNamedGetterPrototypeTable, thisObject, propertyName, descriptor);
+}
+
+const ClassInfo JSTestCustomNamedGetter::s_info = { "TestCustomNamedGetter", &Base::s_info, &JSTestCustomNamedGetterTable, 0 , CREATE_METHOD_TABLE(JSTestCustomNamedGetter) };
+
+JSTestCustomNamedGetter::JSTestCustomNamedGetter(Structure* structure, JSDOMGlobalObject* globalObject, PassRefPtr<TestCustomNamedGetter> impl)
+ : JSDOMWrapper(structure, globalObject)
+ , m_impl(impl.leakRef())
+{
+}
+
+void JSTestCustomNamedGetter::finishCreation(JSGlobalData& globalData)
+{
+ Base::finishCreation(globalData);
+ ASSERT(inherits(&s_info));
+}
+
+JSObject* JSTestCustomNamedGetter::createPrototype(ExecState* exec, JSGlobalObject* globalObject)
+{
+ return JSTestCustomNamedGetterPrototype::create(exec->globalData(), globalObject, JSTestCustomNamedGetterPrototype::createStructure(globalObject->globalData(), globalObject, globalObject->objectPrototype()));
+}
+
+void JSTestCustomNamedGetter::destroy(JSC::JSCell* cell)
+{
+ JSTestCustomNamedGetter* thisObject = jsCast<JSTestCustomNamedGetter*>(cell);
+ thisObject->releaseImplIfNotNull();
+}
+
+bool JSTestCustomNamedGetter::getOwnPropertySlot(JSCell* cell, ExecState* exec, const Identifier& propertyName, PropertySlot& slot)
+{
+ JSTestCustomNamedGetter* thisObject = jsCast<JSTestCustomNamedGetter*>(cell);
+ ASSERT_GC_OBJECT_INHERITS(thisObject, &s_info);
+ if (canGetItemsForName(exec, static_cast<TestCustomNamedGetter*>(thisObject->impl()), propertyName)) {
+ slot.setCustom(thisObject, thisObject->nameGetter);
+ return true;
+ }
+ return getStaticValueSlot<JSTestCustomNamedGetter, Base>(exec, &JSTestCustomNamedGetterTable, thisObject, propertyName, slot);
+}
+
+bool JSTestCustomNamedGetter::getOwnPropertyDescriptor(JSObject* object, ExecState* exec, const Identifier& propertyName, PropertyDescriptor& descriptor)
+{
+ JSTestCustomNamedGetter* thisObject = jsCast<JSTestCustomNamedGetter*>(object);
+ ASSERT_GC_OBJECT_INHERITS(thisObject, &s_info);
+ if (canGetItemsForName(exec, static_cast<TestCustomNamedGetter*>(thisObject->impl()), propertyName)) {
+ PropertySlot slot;
+ slot.setCustom(thisObject, nameGetter);
+ descriptor.setDescriptor(slot.getValue(exec, propertyName), ReadOnly | DontDelete | DontEnum);
+ return true;
+ }
+ return getStaticValueDescriptor<JSTestCustomNamedGetter, Base>(exec, &JSTestCustomNamedGetterTable, thisObject, propertyName, descriptor);
+}
+
+JSValue jsTestCustomNamedGetterConstructor(ExecState* exec, JSValue slotBase, const Identifier&)
+{
+ JSTestCustomNamedGetter* domObject = static_cast<JSTestCustomNamedGetter*>(asObject(slotBase));
+ return JSTestCustomNamedGetter::getConstructor(exec, domObject->globalObject());
+}
+
+JSValue JSTestCustomNamedGetter::getConstructor(ExecState* exec, JSGlobalObject* globalObject)
+{
+ return getDOMConstructor<JSTestCustomNamedGetterConstructor>(exec, static_cast<JSDOMGlobalObject*>(globalObject));
+}
+
+EncodedJSValue JSC_HOST_CALL jsTestCustomNamedGetterPrototypeFunctionAnotherFunction(ExecState* exec)
+{
+ JSValue thisValue = exec->hostThisValue();
+ if (!thisValue.inherits(&JSTestCustomNamedGetter::s_info))
+ return throwVMTypeError(exec);
+ JSTestCustomNamedGetter* castedThis = static_cast<JSTestCustomNamedGetter*>(asObject(thisValue));
+ ASSERT_GC_OBJECT_INHERITS(castedThis, &JSTestCustomNamedGetter::s_info);
+ TestCustomNamedGetter* impl = static_cast<TestCustomNamedGetter*>(castedThis->impl());
+ if (exec->argumentCount() < 1)
+ return throwVMError(exec, createTypeError(exec, "Not enough arguments"));
+ const String& str(ustringToString(MAYBE_MISSING_PARAMETER(exec, 0, MissingIsUndefined).isEmpty() ? UString() : MAYBE_MISSING_PARAMETER(exec, 0, MissingIsUndefined).toString(exec)->value(exec)));
+ if (exec->hadException())
+ return JSValue::encode(jsUndefined());
+ impl->anotherFunction(str);
+ return JSValue::encode(jsUndefined());
+}
+
+static inline bool isObservable(JSTestCustomNamedGetter* jsTestCustomNamedGetter)
+{
+ if (jsTestCustomNamedGetter->hasCustomProperties())
+ return true;
+ return false;
+}
+
+bool JSTestCustomNamedGetterOwner::isReachableFromOpaqueRoots(JSC::Handle<JSC::Unknown> handle, void*, SlotVisitor& visitor)
+{
+ JSTestCustomNamedGetter* jsTestCustomNamedGetter = static_cast<JSTestCustomNamedGetter*>(handle.get().asCell());
+ if (!isObservable(jsTestCustomNamedGetter))
+ return false;
+ UNUSED_PARAM(visitor);
+ return false;
+}
+
+void JSTestCustomNamedGetterOwner::finalize(JSC::Handle<JSC::Unknown> handle, void* context)
+{
+ JSTestCustomNamedGetter* jsTestCustomNamedGetter = static_cast<JSTestCustomNamedGetter*>(handle.get().asCell());
+ DOMWrapperWorld* world = static_cast<DOMWrapperWorld*>(context);
+ uncacheWrapper(world, jsTestCustomNamedGetter->impl(), jsTestCustomNamedGetter);
+ jsTestCustomNamedGetter->releaseImpl();
+}
+
+JSC::JSValue toJS(JSC::ExecState* exec, JSDOMGlobalObject* globalObject, TestCustomNamedGetter* impl)
+{
+ return wrap<JSTestCustomNamedGetter>(exec, globalObject, impl);
+}
+
+TestCustomNamedGetter* toTestCustomNamedGetter(JSC::JSValue value)
+{
+ return value.inherits(&JSTestCustomNamedGetter::s_info) ? static_cast<JSTestCustomNamedGetter*>(asObject(value))->impl() : 0;
+}
+
+}
Boston, MA 02110-1301, USA.
*/
-#ifndef JSTestOverridingNameGetter_h
-#define JSTestOverridingNameGetter_h
+#ifndef JSTestCustomNamedGetter_h
+#define JSTestCustomNamedGetter_h
#include "JSDOMBinding.h"
-#include "TestOverridingNameGetter.h"
+#include "TestCustomNamedGetter.h"
#include <runtime/JSGlobalObject.h>
#include <runtime/JSObject.h>
#include <runtime/ObjectPrototype.h>
namespace WebCore {
-class JSTestOverridingNameGetter : public JSDOMWrapper {
+class JSTestCustomNamedGetter : public JSDOMWrapper {
public:
typedef JSDOMWrapper Base;
- static JSTestOverridingNameGetter* create(JSC::Structure* structure, JSDOMGlobalObject* globalObject, PassRefPtr<TestOverridingNameGetter> impl)
+ static JSTestCustomNamedGetter* create(JSC::Structure* structure, JSDOMGlobalObject* globalObject, PassRefPtr<TestCustomNamedGetter> impl)
{
- JSTestOverridingNameGetter* ptr = new (NotNull, JSC::allocateCell<JSTestOverridingNameGetter>(globalObject->globalData().heap)) JSTestOverridingNameGetter(structure, globalObject, impl);
+ JSTestCustomNamedGetter* ptr = new (NotNull, JSC::allocateCell<JSTestCustomNamedGetter>(globalObject->globalData().heap)) JSTestCustomNamedGetter(structure, globalObject, impl);
ptr->finishCreation(globalObject->globalData());
return ptr;
}
}
static JSC::JSValue getConstructor(JSC::ExecState*, JSC::JSGlobalObject*);
- TestOverridingNameGetter* impl() const { return m_impl; }
+ TestCustomNamedGetter* impl() const { return m_impl; }
void releaseImpl() { m_impl->deref(); m_impl = 0; }
void releaseImplIfNotNull() { if (m_impl) { m_impl->deref(); m_impl = 0; } }
private:
- TestOverridingNameGetter* m_impl;
+ TestCustomNamedGetter* m_impl;
protected:
- JSTestOverridingNameGetter(JSC::Structure*, JSDOMGlobalObject*, PassRefPtr<TestOverridingNameGetter>);
+ JSTestCustomNamedGetter(JSC::Structure*, JSDOMGlobalObject*, PassRefPtr<TestCustomNamedGetter>);
void finishCreation(JSC::JSGlobalData&);
static const unsigned StructureFlags = JSC::OverridesGetOwnPropertySlot | Base::StructureFlags;
private:
- static bool canGetItemsForName(JSC::ExecState*, TestOverridingNameGetter*, const JSC::Identifier&);
+ static bool canGetItemsForName(JSC::ExecState*, TestCustomNamedGetter*, const JSC::Identifier&);
static JSC::JSValue nameGetter(JSC::ExecState*, JSC::JSValue, const JSC::Identifier&);
};
-class JSTestOverridingNameGetterOwner : public JSC::WeakHandleOwner {
+class JSTestCustomNamedGetterOwner : public JSC::WeakHandleOwner {
virtual bool isReachableFromOpaqueRoots(JSC::Handle<JSC::Unknown>, void* context, JSC::SlotVisitor&);
virtual void finalize(JSC::Handle<JSC::Unknown>, void* context);
};
-inline JSC::WeakHandleOwner* wrapperOwner(DOMWrapperWorld*, TestOverridingNameGetter*)
+inline JSC::WeakHandleOwner* wrapperOwner(DOMWrapperWorld*, TestCustomNamedGetter*)
{
- DEFINE_STATIC_LOCAL(JSTestOverridingNameGetterOwner, jsTestOverridingNameGetterOwner, ());
- return &jsTestOverridingNameGetterOwner;
+ DEFINE_STATIC_LOCAL(JSTestCustomNamedGetterOwner, jsTestCustomNamedGetterOwner, ());
+ return &jsTestCustomNamedGetterOwner;
}
-inline void* wrapperContext(DOMWrapperWorld* world, TestOverridingNameGetter*)
+inline void* wrapperContext(DOMWrapperWorld* world, TestCustomNamedGetter*)
{
return world;
}
-JSC::JSValue toJS(JSC::ExecState*, JSDOMGlobalObject*, TestOverridingNameGetter*);
-TestOverridingNameGetter* toTestOverridingNameGetter(JSC::JSValue);
+JSC::JSValue toJS(JSC::ExecState*, JSDOMGlobalObject*, TestCustomNamedGetter*);
+TestCustomNamedGetter* toTestCustomNamedGetter(JSC::JSValue);
-class JSTestOverridingNameGetterPrototype : public JSC::JSNonFinalObject {
+class JSTestCustomNamedGetterPrototype : public JSC::JSNonFinalObject {
public:
typedef JSC::JSNonFinalObject Base;
static JSC::JSObject* self(JSC::ExecState*, JSC::JSGlobalObject*);
- static JSTestOverridingNameGetterPrototype* create(JSC::JSGlobalData& globalData, JSC::JSGlobalObject* globalObject, JSC::Structure* structure)
+ static JSTestCustomNamedGetterPrototype* create(JSC::JSGlobalData& globalData, JSC::JSGlobalObject* globalObject, JSC::Structure* structure)
{
- JSTestOverridingNameGetterPrototype* ptr = new (NotNull, JSC::allocateCell<JSTestOverridingNameGetterPrototype>(globalData.heap)) JSTestOverridingNameGetterPrototype(globalData, globalObject, structure);
+ JSTestCustomNamedGetterPrototype* ptr = new (NotNull, JSC::allocateCell<JSTestCustomNamedGetterPrototype>(globalData.heap)) JSTestCustomNamedGetterPrototype(globalData, globalObject, structure);
ptr->finishCreation(globalData);
return ptr;
}
}
private:
- JSTestOverridingNameGetterPrototype(JSC::JSGlobalData& globalData, JSC::JSGlobalObject*, JSC::Structure* structure) : JSC::JSNonFinalObject(globalData, structure) { }
+ JSTestCustomNamedGetterPrototype(JSC::JSGlobalData& globalData, JSC::JSGlobalObject*, JSC::Structure* structure) : JSC::JSNonFinalObject(globalData, structure) { }
protected:
static const unsigned StructureFlags = JSC::OverridesGetOwnPropertySlot | Base::StructureFlags;
};
-class JSTestOverridingNameGetterConstructor : public DOMConstructorObject {
+class JSTestCustomNamedGetterConstructor : public DOMConstructorObject {
private:
- JSTestOverridingNameGetterConstructor(JSC::Structure*, JSDOMGlobalObject*);
+ JSTestCustomNamedGetterConstructor(JSC::Structure*, JSDOMGlobalObject*);
void finishCreation(JSC::ExecState*, JSDOMGlobalObject*);
public:
typedef DOMConstructorObject Base;
- static JSTestOverridingNameGetterConstructor* create(JSC::ExecState* exec, JSC::Structure* structure, JSDOMGlobalObject* globalObject)
+ static JSTestCustomNamedGetterConstructor* create(JSC::ExecState* exec, JSC::Structure* structure, JSDOMGlobalObject* globalObject)
{
- JSTestOverridingNameGetterConstructor* ptr = new (NotNull, JSC::allocateCell<JSTestOverridingNameGetterConstructor>(*exec->heap())) JSTestOverridingNameGetterConstructor(structure, globalObject);
+ JSTestCustomNamedGetterConstructor* ptr = new (NotNull, JSC::allocateCell<JSTestCustomNamedGetterConstructor>(*exec->heap())) JSTestCustomNamedGetterConstructor(structure, globalObject);
ptr->finishCreation(exec, globalObject);
return ptr;
}
// Functions
-JSC::EncodedJSValue JSC_HOST_CALL jsTestOverridingNameGetterPrototypeFunctionAnotherFunction(JSC::ExecState*);
+JSC::EncodedJSValue JSC_HOST_CALL jsTestCustomNamedGetterPrototypeFunctionAnotherFunction(JSC::ExecState*);
// Attributes
-JSC::JSValue jsTestOverridingNameGetterConstructor(JSC::ExecState*, JSC::JSValue, const JSC::Identifier&);
+JSC::JSValue jsTestCustomNamedGetterConstructor(JSC::ExecState*, JSC::JSValue, const JSC::Identifier&);
} // namespace WebCore
+++ /dev/null
-/*
- This file is part of the WebKit open source project.
- This file has been generated by generate-bindings.pl. DO NOT MODIFY!
-
- This library is free software; you can redistribute it and/or
- modify it under the terms of the GNU Library General Public
- License as published by the Free Software Foundation; either
- version 2 of the License, or (at your option) any later version.
-
- This library is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- Library General Public License for more details.
-
- You should have received a copy of the GNU Library General Public License
- along with this library; see the file COPYING.LIB. If not, write to
- the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
- Boston, MA 02110-1301, USA.
-*/
-
-#include "config.h"
-#include "JSTestOverridingNameGetter.h"
-
-#include "ExceptionCode.h"
-#include "JSDOMBinding.h"
-#include "TestOverridingNameGetter.h"
-#include "wtf/text/AtomicString.h"
-#include <runtime/Error.h>
-#include <wtf/GetPtr.h>
-
-using namespace JSC;
-
-namespace WebCore {
-
-ASSERT_CLASS_FITS_IN_CELL(JSTestOverridingNameGetter);
-ASSERT_HAS_TRIVIAL_DESTRUCTOR(JSTestOverridingNameGetter);
-
-/* Hash table */
-
-static const HashTableValue JSTestOverridingNameGetterTableValues[] =
-{
- { "constructor", DontEnum | ReadOnly, (intptr_t)static_cast<PropertySlot::GetValueFunc>(jsTestOverridingNameGetterConstructor), (intptr_t)0, NoIntrinsic },
- { 0, 0, 0, 0, NoIntrinsic }
-};
-
-static const HashTable JSTestOverridingNameGetterTable = { 2, 1, JSTestOverridingNameGetterTableValues, 0 };
-/* Hash table for constructor */
-
-static const HashTableValue JSTestOverridingNameGetterConstructorTableValues[] =
-{
- { 0, 0, 0, 0, NoIntrinsic }
-};
-
-static const HashTable JSTestOverridingNameGetterConstructorTable = { 1, 0, JSTestOverridingNameGetterConstructorTableValues, 0 };
-ASSERT_HAS_TRIVIAL_DESTRUCTOR(JSTestOverridingNameGetterConstructor);
-
-const ClassInfo JSTestOverridingNameGetterConstructor::s_info = { "TestOverridingNameGetterConstructor", &Base::s_info, &JSTestOverridingNameGetterConstructorTable, 0, CREATE_METHOD_TABLE(JSTestOverridingNameGetterConstructor) };
-
-JSTestOverridingNameGetterConstructor::JSTestOverridingNameGetterConstructor(Structure* structure, JSDOMGlobalObject* globalObject)
- : DOMConstructorObject(structure, globalObject)
-{
-}
-
-void JSTestOverridingNameGetterConstructor::finishCreation(ExecState* exec, JSDOMGlobalObject* globalObject)
-{
- Base::finishCreation(exec->globalData());
- ASSERT(inherits(&s_info));
- putDirect(exec->globalData(), exec->propertyNames().prototype, JSTestOverridingNameGetterPrototype::self(exec, globalObject), DontDelete | ReadOnly);
-}
-
-bool JSTestOverridingNameGetterConstructor::getOwnPropertySlot(JSCell* cell, ExecState* exec, const Identifier& propertyName, PropertySlot& slot)
-{
- return getStaticValueSlot<JSTestOverridingNameGetterConstructor, JSDOMWrapper>(exec, &JSTestOverridingNameGetterConstructorTable, static_cast<JSTestOverridingNameGetterConstructor*>(cell), propertyName, slot);
-}
-
-bool JSTestOverridingNameGetterConstructor::getOwnPropertyDescriptor(JSObject* object, ExecState* exec, const Identifier& propertyName, PropertyDescriptor& descriptor)
-{
- return getStaticValueDescriptor<JSTestOverridingNameGetterConstructor, JSDOMWrapper>(exec, &JSTestOverridingNameGetterConstructorTable, static_cast<JSTestOverridingNameGetterConstructor*>(object), propertyName, descriptor);
-}
-
-/* Hash table for prototype */
-
-static const HashTableValue JSTestOverridingNameGetterPrototypeTableValues[] =
-{
- { "anotherFunction", DontDelete | JSC::Function, (intptr_t)static_cast<NativeFunction>(jsTestOverridingNameGetterPrototypeFunctionAnotherFunction), (intptr_t)1, NoIntrinsic },
- { 0, 0, 0, 0, NoIntrinsic }
-};
-
-static const HashTable JSTestOverridingNameGetterPrototypeTable = { 2, 1, JSTestOverridingNameGetterPrototypeTableValues, 0 };
-const ClassInfo JSTestOverridingNameGetterPrototype::s_info = { "TestOverridingNameGetterPrototype", &Base::s_info, &JSTestOverridingNameGetterPrototypeTable, 0, CREATE_METHOD_TABLE(JSTestOverridingNameGetterPrototype) };
-
-JSObject* JSTestOverridingNameGetterPrototype::self(ExecState* exec, JSGlobalObject* globalObject)
-{
- return getDOMPrototype<JSTestOverridingNameGetter>(exec, globalObject);
-}
-
-bool JSTestOverridingNameGetterPrototype::getOwnPropertySlot(JSCell* cell, ExecState* exec, const Identifier& propertyName, PropertySlot& slot)
-{
- JSTestOverridingNameGetterPrototype* thisObject = jsCast<JSTestOverridingNameGetterPrototype*>(cell);
- return getStaticFunctionSlot<JSObject>(exec, &JSTestOverridingNameGetterPrototypeTable, thisObject, propertyName, slot);
-}
-
-bool JSTestOverridingNameGetterPrototype::getOwnPropertyDescriptor(JSObject* object, ExecState* exec, const Identifier& propertyName, PropertyDescriptor& descriptor)
-{
- JSTestOverridingNameGetterPrototype* thisObject = jsCast<JSTestOverridingNameGetterPrototype*>(object);
- return getStaticFunctionDescriptor<JSObject>(exec, &JSTestOverridingNameGetterPrototypeTable, thisObject, propertyName, descriptor);
-}
-
-const ClassInfo JSTestOverridingNameGetter::s_info = { "TestOverridingNameGetter", &Base::s_info, &JSTestOverridingNameGetterTable, 0 , CREATE_METHOD_TABLE(JSTestOverridingNameGetter) };
-
-JSTestOverridingNameGetter::JSTestOverridingNameGetter(Structure* structure, JSDOMGlobalObject* globalObject, PassRefPtr<TestOverridingNameGetter> impl)
- : JSDOMWrapper(structure, globalObject)
- , m_impl(impl.leakRef())
-{
-}
-
-void JSTestOverridingNameGetter::finishCreation(JSGlobalData& globalData)
-{
- Base::finishCreation(globalData);
- ASSERT(inherits(&s_info));
-}
-
-JSObject* JSTestOverridingNameGetter::createPrototype(ExecState* exec, JSGlobalObject* globalObject)
-{
- return JSTestOverridingNameGetterPrototype::create(exec->globalData(), globalObject, JSTestOverridingNameGetterPrototype::createStructure(globalObject->globalData(), globalObject, globalObject->objectPrototype()));
-}
-
-void JSTestOverridingNameGetter::destroy(JSC::JSCell* cell)
-{
- JSTestOverridingNameGetter* thisObject = jsCast<JSTestOverridingNameGetter*>(cell);
- thisObject->releaseImplIfNotNull();
-}
-
-bool JSTestOverridingNameGetter::getOwnPropertySlot(JSCell* cell, ExecState* exec, const Identifier& propertyName, PropertySlot& slot)
-{
- JSTestOverridingNameGetter* thisObject = jsCast<JSTestOverridingNameGetter*>(cell);
- ASSERT_GC_OBJECT_INHERITS(thisObject, &s_info);
- if (canGetItemsForName(exec, static_cast<TestOverridingNameGetter*>(thisObject->impl()), propertyName)) {
- slot.setCustom(thisObject, thisObject->nameGetter);
- return true;
- }
- return getStaticValueSlot<JSTestOverridingNameGetter, Base>(exec, &JSTestOverridingNameGetterTable, thisObject, propertyName, slot);
-}
-
-bool JSTestOverridingNameGetter::getOwnPropertyDescriptor(JSObject* object, ExecState* exec, const Identifier& propertyName, PropertyDescriptor& descriptor)
-{
- JSTestOverridingNameGetter* thisObject = jsCast<JSTestOverridingNameGetter*>(object);
- ASSERT_GC_OBJECT_INHERITS(thisObject, &s_info);
- if (canGetItemsForName(exec, static_cast<TestOverridingNameGetter*>(thisObject->impl()), propertyName)) {
- PropertySlot slot;
- slot.setCustom(thisObject, nameGetter);
- descriptor.setDescriptor(slot.getValue(exec, propertyName), ReadOnly | DontDelete | DontEnum);
- return true;
- }
- return getStaticValueDescriptor<JSTestOverridingNameGetter, Base>(exec, &JSTestOverridingNameGetterTable, thisObject, propertyName, descriptor);
-}
-
-JSValue jsTestOverridingNameGetterConstructor(ExecState* exec, JSValue slotBase, const Identifier&)
-{
- JSTestOverridingNameGetter* domObject = static_cast<JSTestOverridingNameGetter*>(asObject(slotBase));
- return JSTestOverridingNameGetter::getConstructor(exec, domObject->globalObject());
-}
-
-JSValue JSTestOverridingNameGetter::getConstructor(ExecState* exec, JSGlobalObject* globalObject)
-{
- return getDOMConstructor<JSTestOverridingNameGetterConstructor>(exec, static_cast<JSDOMGlobalObject*>(globalObject));
-}
-
-EncodedJSValue JSC_HOST_CALL jsTestOverridingNameGetterPrototypeFunctionAnotherFunction(ExecState* exec)
-{
- JSValue thisValue = exec->hostThisValue();
- if (!thisValue.inherits(&JSTestOverridingNameGetter::s_info))
- return throwVMTypeError(exec);
- JSTestOverridingNameGetter* castedThis = static_cast<JSTestOverridingNameGetter*>(asObject(thisValue));
- ASSERT_GC_OBJECT_INHERITS(castedThis, &JSTestOverridingNameGetter::s_info);
- TestOverridingNameGetter* impl = static_cast<TestOverridingNameGetter*>(castedThis->impl());
- if (exec->argumentCount() < 1)
- return throwVMError(exec, createTypeError(exec, "Not enough arguments"));
- const String& str(ustringToString(MAYBE_MISSING_PARAMETER(exec, 0, MissingIsUndefined).isEmpty() ? UString() : MAYBE_MISSING_PARAMETER(exec, 0, MissingIsUndefined).toString(exec)->value(exec)));
- if (exec->hadException())
- return JSValue::encode(jsUndefined());
- impl->anotherFunction(str);
- return JSValue::encode(jsUndefined());
-}
-
-static inline bool isObservable(JSTestOverridingNameGetter* jsTestOverridingNameGetter)
-{
- if (jsTestOverridingNameGetter->hasCustomProperties())
- return true;
- return false;
-}
-
-bool JSTestOverridingNameGetterOwner::isReachableFromOpaqueRoots(JSC::Handle<JSC::Unknown> handle, void*, SlotVisitor& visitor)
-{
- JSTestOverridingNameGetter* jsTestOverridingNameGetter = static_cast<JSTestOverridingNameGetter*>(handle.get().asCell());
- if (!isObservable(jsTestOverridingNameGetter))
- return false;
- UNUSED_PARAM(visitor);
- return false;
-}
-
-void JSTestOverridingNameGetterOwner::finalize(JSC::Handle<JSC::Unknown> handle, void* context)
-{
- JSTestOverridingNameGetter* jsTestOverridingNameGetter = static_cast<JSTestOverridingNameGetter*>(handle.get().asCell());
- DOMWrapperWorld* world = static_cast<DOMWrapperWorld*>(context);
- uncacheWrapper(world, jsTestOverridingNameGetter->impl(), jsTestOverridingNameGetter);
- jsTestOverridingNameGetter->releaseImpl();
-}
-
-JSC::JSValue toJS(JSC::ExecState* exec, JSDOMGlobalObject* globalObject, TestOverridingNameGetter* impl)
-{
- return wrap<JSTestOverridingNameGetter>(exec, globalObject, impl);
-}
-
-TestOverridingNameGetter* toTestOverridingNameGetter(JSC::JSValue value)
-{
- return value.inherits(&JSTestOverridingNameGetter::s_info) ? static_cast<JSTestOverridingNameGetter*>(asObject(value))->impl() : 0;
-}
-
-}
@class NSString;
-@interface DOMTestOverridingNameGetter : DOMObject
+@interface DOMTestCustomNamedGetter : DOMObject
- (void)anotherFunction:(NSString *)str;
@end
#import "config.h"
#import "DOMInternal.h"
-#import "DOMTestOverridingNameGetter.h"
+#import "DOMTestCustomNamedGetter.h"
#import "DOMBlobInternal.h"
#import "DOMCSSRuleInternal.h"
#import "DOMEventInternal.h"
#import "DOMNodeInternal.h"
#import "DOMStyleSheetInternal.h"
-#import "DOMTestOverridingNameGetterInternal.h"
+#import "DOMTestCustomNamedGetterInternal.h"
#import "ExceptionHandlers.h"
#import "JSMainThreadExecState.h"
#import "KURL.h"
-#import "TestOverridingNameGetter.h"
+#import "TestCustomNamedGetter.h"
#import "ThreadCheck.h"
#import "WebCoreObjCExtras.h"
#import "WebScriptObjectPrivate.h"
#import <wtf/GetPtr.h>
-#define IMPL reinterpret_cast<WebCore::TestOverridingNameGetter*>(_internal)
+#define IMPL reinterpret_cast<WebCore::TestCustomNamedGetter*>(_internal)
-@implementation DOMTestOverridingNameGetter
+@implementation DOMTestCustomNamedGetter
- (void)dealloc
{
- if (WebCoreObjCScheduleDeallocateOnMainThread([DOMTestOverridingNameGetter class], self))
+ if (WebCoreObjCScheduleDeallocateOnMainThread([DOMTestCustomNamedGetter class], self))
return;
if (_internal)
@end
-WebCore::TestOverridingNameGetter* core(DOMTestOverridingNameGetter *wrapper)
+WebCore::TestCustomNamedGetter* core(DOMTestCustomNamedGetter *wrapper)
{
- return wrapper ? reinterpret_cast<WebCore::TestOverridingNameGetter*>(wrapper->_internal) : 0;
+ return wrapper ? reinterpret_cast<WebCore::TestCustomNamedGetter*>(wrapper->_internal) : 0;
}
-DOMTestOverridingNameGetter *kit(WebCore::TestOverridingNameGetter* value)
+DOMTestCustomNamedGetter *kit(WebCore::TestCustomNamedGetter* value)
{
{ DOM_ASSERT_MAIN_THREAD(); WebCoreThreadViolationCheckRoundOne(); };
if (!value)
return nil;
- if (DOMTestOverridingNameGetter *wrapper = getDOMWrapper(value))
+ if (DOMTestCustomNamedGetter *wrapper = getDOMWrapper(value))
return [[wrapper retain] autorelease];
- DOMTestOverridingNameGetter *wrapper = [[DOMTestOverridingNameGetter alloc] _init];
+ DOMTestCustomNamedGetter *wrapper = [[DOMTestCustomNamedGetter alloc] _init];
wrapper->_internal = reinterpret_cast<DOMObjectInternal*>(value);
value->ref();
addDOMWrapper(wrapper, value);
* OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
-#import <WebCore/DOMTestOverridingNameGetter.h>
+#import <WebCore/DOMTestCustomNamedGetter.h>
#if WEBKIT_VERSION_MAX_ALLOWED >= WEBKIT_VERSION_LATEST
namespace WebCore {
- class TestOverridingNameGetter;
+ class TestCustomNamedGetter;
}
-WebCore::TestOverridingNameGetter* core(DOMTestOverridingNameGetter *);
-DOMTestOverridingNameGetter *kit(WebCore::TestOverridingNameGetter*);
+WebCore::TestCustomNamedGetter* core(DOMTestCustomNamedGetter *);
+DOMTestCustomNamedGetter *kit(WebCore::TestCustomNamedGetter*);
#endif
module events {
interface [
- HasOverridingNameGetter
- ] TestOverridingNameGetter {
+ CustomNamedGetter
+ ] TestCustomNamedGetter {
void anotherFunction(in DOMString str);
};
*/
#include "config.h"
-#include "V8TestOverridingNameGetter.h"
+#include "V8TestCustomNamedGetter.h"
#include "ExceptionCode.h"
#include "RuntimeEnabledFeatures.h"
namespace WebCore {
-WrapperTypeInfo V8TestOverridingNameGetter::info = { V8TestOverridingNameGetter::GetTemplate, V8TestOverridingNameGetter::derefObject, 0, 0 };
+WrapperTypeInfo V8TestCustomNamedGetter::info = { V8TestCustomNamedGetter::GetTemplate, V8TestCustomNamedGetter::derefObject, 0, 0 };
-namespace TestOverridingNameGetterInternal {
+namespace TestCustomNamedGetterInternal {
template <typename T> void V8_USE(T) { }
static v8::Handle<v8::Value> anotherFunctionCallback(const v8::Arguments& args)
{
- INC_STATS("DOM.TestOverridingNameGetter.anotherFunction");
+ INC_STATS("DOM.TestCustomNamedGetter.anotherFunction");
if (args.Length() < 1)
return throwError("Not enough arguments", V8Proxy::TypeError);
- TestOverridingNameGetter* imp = V8TestOverridingNameGetter::toNative(args.Holder());
+ TestCustomNamedGetter* imp = V8TestCustomNamedGetter::toNative(args.Holder());
STRING_TO_V8PARAMETER_EXCEPTION_BLOCK(V8Parameter<>, str, MAYBE_MISSING_PARAMETER(args, 0, MissingIsUndefined));
imp->anotherFunction(str);
return v8::Handle<v8::Value>();
}
-} // namespace TestOverridingNameGetterInternal
+} // namespace TestCustomNamedGetterInternal
-static const BatchedCallback TestOverridingNameGetterCallbacks[] = {
- {"anotherFunction", TestOverridingNameGetterInternal::anotherFunctionCallback},
+static const BatchedCallback TestCustomNamedGetterCallbacks[] = {
+ {"anotherFunction", TestCustomNamedGetterInternal::anotherFunctionCallback},
};
-static v8::Persistent<v8::FunctionTemplate> ConfigureV8TestOverridingNameGetterTemplate(v8::Persistent<v8::FunctionTemplate> desc)
+static v8::Persistent<v8::FunctionTemplate> ConfigureV8TestCustomNamedGetterTemplate(v8::Persistent<v8::FunctionTemplate> desc)
{
desc->ReadOnlyPrototype();
v8::Local<v8::Signature> defaultSignature;
- defaultSignature = configureTemplate(desc, "TestOverridingNameGetter", v8::Persistent<v8::FunctionTemplate>(), V8TestOverridingNameGetter::internalFieldCount,
+ defaultSignature = configureTemplate(desc, "TestCustomNamedGetter", v8::Persistent<v8::FunctionTemplate>(), V8TestCustomNamedGetter::internalFieldCount,
0, 0,
- TestOverridingNameGetterCallbacks, WTF_ARRAY_LENGTH(TestOverridingNameGetterCallbacks));
+ TestCustomNamedGetterCallbacks, WTF_ARRAY_LENGTH(TestCustomNamedGetterCallbacks));
UNUSED_PARAM(defaultSignature); // In some cases, it will not be used.
v8::Local<v8::ObjectTemplate> instance = desc->InstanceTemplate();
v8::Local<v8::ObjectTemplate> proto = desc->PrototypeTemplate();
UNUSED_PARAM(instance); // In some cases, it will not be used.
UNUSED_PARAM(proto); // In some cases, it will not be used.
- desc->InstanceTemplate()->SetNamedPropertyHandler(V8TestOverridingNameGetter::namedPropertyGetter, 0, 0, 0, 0);
+ desc->InstanceTemplate()->SetNamedPropertyHandler(V8TestCustomNamedGetter::namedPropertyGetter, 0, 0, 0, 0);
// Custom toString template
desc->Set(getToStringName(), getToStringTemplate());
return desc;
}
-v8::Persistent<v8::FunctionTemplate> V8TestOverridingNameGetter::GetRawTemplate()
+v8::Persistent<v8::FunctionTemplate> V8TestCustomNamedGetter::GetRawTemplate()
{
V8BindingPerIsolateData* data = V8BindingPerIsolateData::current();
V8BindingPerIsolateData::TemplateMap::iterator result = data->rawTemplateMap().find(&info);
return templ;
}
-v8::Persistent<v8::FunctionTemplate> V8TestOverridingNameGetter::GetTemplate()
+v8::Persistent<v8::FunctionTemplate> V8TestCustomNamedGetter::GetTemplate()
{
V8BindingPerIsolateData* data = V8BindingPerIsolateData::current();
V8BindingPerIsolateData::TemplateMap::iterator result = data->templateMap().find(&info);
v8::HandleScope handleScope;
v8::Persistent<v8::FunctionTemplate> templ =
- ConfigureV8TestOverridingNameGetterTemplate(GetRawTemplate());
+ ConfigureV8TestCustomNamedGetterTemplate(GetRawTemplate());
data->templateMap().add(&info, templ);
return templ;
}
-bool V8TestOverridingNameGetter::HasInstance(v8::Handle<v8::Value> value)
+bool V8TestCustomNamedGetter::HasInstance(v8::Handle<v8::Value> value)
{
return GetRawTemplate()->HasInstance(value);
}
-v8::Handle<v8::Object> V8TestOverridingNameGetter::wrapSlow(TestOverridingNameGetter* impl)
+v8::Handle<v8::Object> V8TestCustomNamedGetter::wrapSlow(TestCustomNamedGetter* impl)
{
v8::Handle<v8::Object> wrapper;
V8Proxy* proxy = 0;
return wrapper;
}
-void V8TestOverridingNameGetter::derefObject(void* object)
+void V8TestCustomNamedGetter::derefObject(void* object)
{
- static_cast<TestOverridingNameGetter*>(object)->deref();
+ static_cast<TestCustomNamedGetter*>(object)->deref();
}
} // namespace WebCore
Boston, MA 02111-1307, USA.
*/
-#ifndef V8TestOverridingNameGetter_h
-#define V8TestOverridingNameGetter_h
+#ifndef V8TestCustomNamedGetter_h
+#define V8TestCustomNamedGetter_h
-#include "TestOverridingNameGetter.h"
+#include "TestCustomNamedGetter.h"
#include "V8DOMWrapper.h"
#include "WrapperTypeInfo.h"
#include <v8.h>
namespace WebCore {
-class V8TestOverridingNameGetter {
+class V8TestCustomNamedGetter {
public:
static const bool hasDependentLifetime = false;
static bool HasInstance(v8::Handle<v8::Value>);
static v8::Persistent<v8::FunctionTemplate> GetRawTemplate();
static v8::Persistent<v8::FunctionTemplate> GetTemplate();
- static TestOverridingNameGetter* toNative(v8::Handle<v8::Object> object)
+ static TestCustomNamedGetter* toNative(v8::Handle<v8::Object> object)
{
- return reinterpret_cast<TestOverridingNameGetter*>(object->GetPointerFromInternalField(v8DOMWrapperObjectIndex));
+ return reinterpret_cast<TestCustomNamedGetter*>(object->GetPointerFromInternalField(v8DOMWrapperObjectIndex));
}
- inline static v8::Handle<v8::Object> wrap(TestOverridingNameGetter*);
+ inline static v8::Handle<v8::Object> wrap(TestCustomNamedGetter*);
static void derefObject(void*);
static WrapperTypeInfo info;
static v8::Handle<v8::Value> namedPropertyGetter(v8::Local<v8::String>, const v8::AccessorInfo&);
static const int internalFieldCount = v8DefaultWrapperInternalFieldCount + 0;
- static v8::Handle<v8::Object> existingWrapper(TestOverridingNameGetter*);
+ static v8::Handle<v8::Object> existingWrapper(TestCustomNamedGetter*);
private:
- static v8::Handle<v8::Object> wrapSlow(TestOverridingNameGetter*);
+ static v8::Handle<v8::Object> wrapSlow(TestCustomNamedGetter*);
};
-ALWAYS_INLINE v8::Handle<v8::Object> V8TestOverridingNameGetter::existingWrapper(TestOverridingNameGetter* impl)
+ALWAYS_INLINE v8::Handle<v8::Object> V8TestCustomNamedGetter::existingWrapper(TestCustomNamedGetter* impl)
{
return getDOMObjectMap().get(impl);
}
-v8::Handle<v8::Object> V8TestOverridingNameGetter::wrap(TestOverridingNameGetter* impl)
+v8::Handle<v8::Object> V8TestCustomNamedGetter::wrap(TestCustomNamedGetter* impl)
{
v8::Handle<v8::Object> wrapper = existingWrapper(impl);
if (!wrapper.IsEmpty())
return wrapper;
- return V8TestOverridingNameGetter::wrapSlow(impl);
+ return V8TestCustomNamedGetter::wrapSlow(impl);
}
-inline v8::Handle<v8::Value> toV8(TestOverridingNameGetter* impl)
+inline v8::Handle<v8::Value> toV8(TestCustomNamedGetter* impl)
{
if (!impl)
return v8::Null();
- return V8TestOverridingNameGetter::wrap(impl);
+ return V8TestCustomNamedGetter::wrap(impl);
}
-inline v8::Handle<v8::Value> toV8(PassRefPtr< TestOverridingNameGetter > impl)
+inline v8::Handle<v8::Value> toV8(PassRefPtr< TestCustomNamedGetter > impl)
{
return toV8(impl.get());
}
}
-#endif // V8TestOverridingNameGetter_h
+#endif // V8TestCustomNamedGetter_h
module html {
interface [
- HasOverridingNameGetter
+ CustomNamedGetter
] HTMLDocument : Document {
[JSCustom, V8Custom] void open();
void close();
interface [
IndexedGetter,
- HasOverridingNameGetter
+ CustomNamedGetter
] HTMLFormElement : HTMLElement {
readonly attribute HTMLCollection elements;
readonly attribute long length;
module html {
interface [
- HasOverridingNameGetter
+ CustomNamedGetter
] HTMLFrameSetElement : HTMLElement {
attribute [Reflect] DOMString cols;
attribute [Reflect] DOMString rows;
projects / profile / ivi / webkit-efl.git / commitdiff