Diff
Modified: trunk/Source/WebCore/ChangeLog (194099 => 194100)
--- trunk/Source/WebCore/ChangeLog 2015-12-15 08:11:07 UTC (rev 194099)
+++ trunk/Source/WebCore/ChangeLog 2015-12-15 08:55:23 UTC (rev 194100)
@@ -1,3 +1,35 @@
+2015-12-15 Youenn Fablet <[email protected]>
+
+ WebIDL generator should support the possibility for C++ classes to have a JS Builtin constructor
+ https://bugs.webkit.org/show_bug.cgi?id=152171
+
+ Reviewed by Darin Adler.
+
+ Reintroducing JSBuiltinConstructor keyword as a way to run automatically a JS builtin initialization function
+ to process the arguments passed to the DOM C++ constructor.
+
+ Specialized createJSObject for those classes.
+
+ Fixing typo in TestCustomConstructor.idl.
+
+ Covered by binding tests.
+
+ * bindings/scripts/CodeGeneratorJS.pm:
+ (GenerateConstructorDefinition):
+ (IsConstructable):
+ (IsJSBuiltinConstructor):
+ (AddJSBuiltinIncludesIfNeeded):
+ * bindings/scripts/test/GObject/WebKitDOMTestClassWithJSBuiltinConstructor.cpp: Added.
+ * bindings/scripts/test/GObject/WebKitDOMTestClassWithJSBuiltinConstructor.h: Added.
+ * bindings/scripts/test/GObject/WebKitDOMTestClassWithJSBuiltinConstructorPrivate.h: Added.
+ * bindings/scripts/test/JS/JSTestClassWithJSBuiltinConstructor.cpp: Added.
+ * bindings/scripts/test/JS/JSTestClassWithJSBuiltinConstructor.h: Added.
+ * bindings/scripts/test/ObjC/DOMTestClassWithJSBuiltinConstructor.h: Added.
+ * bindings/scripts/test/ObjC/DOMTestClassWithJSBuiltinConstructor.mm: Added.
+ * bindings/scripts/test/ObjC/DOMTestClassWithJSBuiltinConstructorInternal.h: Added.
+ * bindings/scripts/test/TestClassWithJSBuiltinConstructor.idl: Copied from Source/WebCore/bindings/scripts/test/TestCustomConstructor.idl.
+ * bindings/scripts/test/TestCustomConstructor.idl:
+
2015-12-14 Andreas Kling <[email protected]>
ResourceUsageOverlay should show GC timers.
Modified: trunk/Source/WebCore/bindings/scripts/CodeGeneratorJS.pm (194099 => 194100)
--- trunk/Source/WebCore/bindings/scripts/CodeGeneratorJS.pm 2015-12-15 08:11:07 UTC (rev 194099)
+++ trunk/Source/WebCore/bindings/scripts/CodeGeneratorJS.pm 2015-12-15 08:55:23 UTC (rev 194100)
@@ -4727,8 +4727,21 @@
my $generatingNamedConstructor = shift;
my $function = shift;
- return if IsJSBuiltinConstructor($interface);
+ if (IsJSBuiltinConstructor($interface)) {
+ if ($interface->extendedAttributes->{"JSBuiltinConstructor"}) {
+ # FIXME: Add support for ConstructorCallWith
+ push(@$outputArray, <<END);
+template<> JSC::JSObject* ${className}Constructor::createJSObject()
+{
+ return ${className}::create(getDOMStructure<${className}>(globalObject()->vm(), *globalObject()), globalObject(), ${interfaceName}::create());
+}
+
+END
+ }
+ return;
+ }
+
my $constructorClassName = $generatingNamedConstructor ? "${className}NamedConstructor" : "${className}Constructor";
if (IsConstructable($interface)) {
@@ -5034,7 +5047,7 @@
{
my $interface = shift;
- return HasCustomConstructor($interface) || $interface->extendedAttributes->{"Constructor"} || $interface->extendedAttributes->{"NamedConstructor"} || $interface->extendedAttributes->{"ConstructorTemplate"};
+ return HasCustomConstructor($interface) || $interface->extendedAttributes->{"Constructor"} || $interface->extendedAttributes->{"NamedConstructor"} || $interface->extendedAttributes->{"ConstructorTemplate"} || $interface->extendedAttributes->{"JSBuiltinConstructor"};
}
sub HeaderNeedsPrototypeDeclaration
@@ -5082,6 +5095,7 @@
return 0 if $interface->extendedAttributes->{"CustomConstructor"};
return 1 if $interface->extendedAttributes->{"JSBuiltin"};
+ return 1 if $interface->extendedAttributes->{"JSBuiltinConstructor"};
return 0;
}
@@ -5112,7 +5126,7 @@
{
my $interface = shift;
- if ($interface->extendedAttributes->{"JSBuiltin"}) {
+ if ($interface->extendedAttributes->{"JSBuiltin"} || $interface->extendedAttributes->{"JSBuiltinConstructor"}) {
AddToImplIncludes($interface->name . "Builtins.h");
return;
}
Added: trunk/Source/WebCore/bindings/scripts/test/GObject/WebKitDOMTestClassWithJSBuiltinConstructor.cpp (0 => 194100)
--- trunk/Source/WebCore/bindings/scripts/test/GObject/WebKitDOMTestClassWithJSBuiltinConstructor.cpp (rev 0)
+++ trunk/Source/WebCore/bindings/scripts/test/GObject/WebKitDOMTestClassWithJSBuiltinConstructor.cpp 2015-12-15 08:55:23 UTC (rev 194100)
@@ -0,0 +1,104 @@
+/*
+ * 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 "WebKitDOMTestClassWithJSBuiltinConstructor.h"
+
+#include "CSSImportRule.h"
+#include "DOMObjectCache.h"
+#include "Document.h"
+#include "ExceptionCode.h"
+#include "ExceptionCodeDescription.h"
+#include "JSMainThreadExecState.h"
+#include "WebKitDOMPrivate.h"
+#include "WebKitDOMTestClassWithJSBuiltinConstructorPrivate.h"
+#include "gobject/ConvertToUTF8String.h"
+#include <wtf/GetPtr.h>
+#include <wtf/RefPtr.h>
+
+#define WEBKIT_DOM_TEST_CLASS_WITH_JS_BUILTIN_CONSTRUCTOR_GET_PRIVATE(obj) G_TYPE_INSTANCE_GET_PRIVATE(obj, WEBKIT_DOM_TYPE_TEST_CLASS_WITH_JS_BUILTIN_CONSTRUCTOR, WebKitDOMTestClassWithJSBuiltinConstructorPrivate)
+
+typedef struct _WebKitDOMTestClassWithJSBuiltinConstructorPrivate {
+ RefPtr<WebCore::TestClassWithJSBuiltinConstructor> coreObject;
+} WebKitDOMTestClassWithJSBuiltinConstructorPrivate;
+
+namespace WebKit {
+
+WebKitDOMTestClassWithJSBuiltinConstructor* kit(WebCore::TestClassWithJSBuiltinConstructor* obj)
+{
+ if (!obj)
+ return 0;
+
+ if (gpointer ret = DOMObjectCache::get(obj))
+ return WEBKIT_DOM_TEST_CLASS_WITH_JS_BUILTIN_CONSTRUCTOR(ret);
+
+ return wrapTestClassWithJSBuiltinConstructor(obj);
+}
+
+WebCore::TestClassWithJSBuiltinConstructor* core(WebKitDOMTestClassWithJSBuiltinConstructor* request)
+{
+ return request ? static_cast<WebCore::TestClassWithJSBuiltinConstructor*>(WEBKIT_DOM_OBJECT(request)->coreObject) : 0;
+}
+
+WebKitDOMTestClassWithJSBuiltinConstructor* wrapTestClassWithJSBuiltinConstructor(WebCore::TestClassWithJSBuiltinConstructor* coreObject)
+{
+ ASSERT(coreObject);
+ return WEBKIT_DOM_TEST_CLASS_WITH_JS_BUILTIN_CONSTRUCTOR(g_object_new(WEBKIT_DOM_TYPE_TEST_CLASS_WITH_JS_BUILTIN_CONSTRUCTOR, "core-object", coreObject, nullptr));
+}
+
+} // namespace WebKit
+
+G_DEFINE_TYPE(WebKitDOMTestClassWithJSBuiltinConstructor, webkit_dom_test_class_with_js_builtin_constructor, WEBKIT_DOM_TYPE_OBJECT)
+
+static void webkit_dom_test_class_with_js_builtin_constructor_finalize(GObject* object)
+{
+ WebKitDOMTestClassWithJSBuiltinConstructorPrivate* priv = WEBKIT_DOM_TEST_CLASS_WITH_JS_BUILTIN_CONSTRUCTOR_GET_PRIVATE(object);
+
+ WebKit::DOMObjectCache::forget(priv->coreObject.get());
+
+ priv->~WebKitDOMTestClassWithJSBuiltinConstructorPrivate();
+ G_OBJECT_CLASS(webkit_dom_test_class_with_js_builtin_constructor_parent_class)->finalize(object);
+}
+
+static GObject* webkit_dom_test_class_with_js_builtin_constructor_constructor(GType type, guint constructPropertiesCount, GObjectConstructParam* constructProperties)
+{
+ GObject* object = G_OBJECT_CLASS(webkit_dom_test_class_with_js_builtin_constructor_parent_class)->constructor(type, constructPropertiesCount, constructProperties);
+
+ WebKitDOMTestClassWithJSBuiltinConstructorPrivate* priv = WEBKIT_DOM_TEST_CLASS_WITH_JS_BUILTIN_CONSTRUCTOR_GET_PRIVATE(object);
+ priv->coreObject = static_cast<WebCore::TestClassWithJSBuiltinConstructor*>(WEBKIT_DOM_OBJECT(object)->coreObject);
+ WebKit::DOMObjectCache::put(priv->coreObject.get(), object);
+
+ return object;
+}
+
+static void webkit_dom_test_class_with_js_builtin_constructor_class_init(WebKitDOMTestClassWithJSBuiltinConstructorClass* requestClass)
+{
+ GObjectClass* gobjectClass = G_OBJECT_CLASS(requestClass);
+ g_type_class_add_private(gobjectClass, sizeof(WebKitDOMTestClassWithJSBuiltinConstructorPrivate));
+ gobjectClass->constructor = webkit_dom_test_class_with_js_builtin_constructor_constructor;
+ gobjectClass->finalize = webkit_dom_test_class_with_js_builtin_constructor_finalize;
+}
+
+static void webkit_dom_test_class_with_js_builtin_constructor_init(WebKitDOMTestClassWithJSBuiltinConstructor* request)
+{
+ WebKitDOMTestClassWithJSBuiltinConstructorPrivate* priv = WEBKIT_DOM_TEST_CLASS_WITH_JS_BUILTIN_CONSTRUCTOR_GET_PRIVATE(request);
+ new (priv) WebKitDOMTestClassWithJSBuiltinConstructorPrivate();
+}
+
Added: trunk/Source/WebCore/bindings/scripts/test/GObject/WebKitDOMTestClassWithJSBuiltinConstructor.h (0 => 194100)
--- trunk/Source/WebCore/bindings/scripts/test/GObject/WebKitDOMTestClassWithJSBuiltinConstructor.h (rev 0)
+++ trunk/Source/WebCore/bindings/scripts/test/GObject/WebKitDOMTestClassWithJSBuiltinConstructor.h 2015-12-15 08:55:23 UTC (rev 194100)
@@ -0,0 +1,53 @@
+/*
+ * 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 WebKitDOMTestClassWithJSBuiltinConstructor_h
+#define WebKitDOMTestClassWithJSBuiltinConstructor_h
+
+#ifdef WEBKIT_DOM_USE_UNSTABLE_API
+
+#include <glib-object.h>
+#include <webkitdom/WebKitDOMObject.h>
+#include <webkitdom/webkitdomdefines-unstable.h>
+
+G_BEGIN_DECLS
+
+#define WEBKIT_DOM_TYPE_TEST_CLASS_WITH_JS_BUILTIN_CONSTRUCTOR (webkit_dom_test_class_with_js_builtin_constructor_get_type())
+#define WEBKIT_DOM_TEST_CLASS_WITH_JS_BUILTIN_CONSTRUCTOR(obj) (G_TYPE_CHECK_INSTANCE_CAST((obj), WEBKIT_DOM_TYPE_TEST_CLASS_WITH_JS_BUILTIN_CONSTRUCTOR, WebKitDOMTestClassWithJSBuiltinConstructor))
+#define WEBKIT_DOM_TEST_CLASS_WITH_JS_BUILTIN_CONSTRUCTOR_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST((klass), WEBKIT_DOM_TYPE_TEST_CLASS_WITH_JS_BUILTIN_CONSTRUCTOR, WebKitDOMTestClassWithJSBuiltinConstructorClass)
+#define WEBKIT_DOM_IS_TEST_CLASS_WITH_JS_BUILTIN_CONSTRUCTOR(obj) (G_TYPE_CHECK_INSTANCE_TYPE((obj), WEBKIT_DOM_TYPE_TEST_CLASS_WITH_JS_BUILTIN_CONSTRUCTOR))
+#define WEBKIT_DOM_IS_TEST_CLASS_WITH_JS_BUILTIN_CONSTRUCTOR_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE((klass), WEBKIT_DOM_TYPE_TEST_CLASS_WITH_JS_BUILTIN_CONSTRUCTOR))
+#define WEBKIT_DOM_TEST_CLASS_WITH_JS_BUILTIN_CONSTRUCTOR_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS((obj), WEBKIT_DOM_TYPE_TEST_CLASS_WITH_JS_BUILTIN_CONSTRUCTOR, WebKitDOMTestClassWithJSBuiltinConstructorClass))
+
+struct _WebKitDOMTestClassWithJSBuiltinConstructor {
+ WebKitDOMObject parent_instance;
+};
+
+struct _WebKitDOMTestClassWithJSBuiltinConstructorClass {
+ WebKitDOMObjectClass parent_class;
+};
+
+WEBKIT_API GType
+webkit_dom_test_class_with_js_builtin_constructor_get_type(void);
+
+G_END_DECLS
+
+#endif /* WEBKIT_DOM_USE_UNSTABLE_API */
+#endif /* WebKitDOMTestClassWithJSBuiltinConstructor_h */
Added: trunk/Source/WebCore/bindings/scripts/test/GObject/WebKitDOMTestClassWithJSBuiltinConstructorPrivate.h (0 => 194100)
--- trunk/Source/WebCore/bindings/scripts/test/GObject/WebKitDOMTestClassWithJSBuiltinConstructorPrivate.h (rev 0)
+++ trunk/Source/WebCore/bindings/scripts/test/GObject/WebKitDOMTestClassWithJSBuiltinConstructorPrivate.h 2015-12-15 08:55:23 UTC (rev 194100)
@@ -0,0 +1,33 @@
+/*
+ * 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 WebKitDOMTestClassWithJSBuiltinConstructorPrivate_h
+#define WebKitDOMTestClassWithJSBuiltinConstructorPrivate_h
+
+#include "TestClassWithJSBuiltinConstructor.h"
+#include <webkitdom/WebKitDOMTestClassWithJSBuiltinConstructor.h>
+
+namespace WebKit {
+WebKitDOMTestClassWithJSBuiltinConstructor* wrapTestClassWithJSBuiltinConstructor(WebCore::TestClassWithJSBuiltinConstructor*);
+WebKitDOMTestClassWithJSBuiltinConstructor* kit(WebCore::TestClassWithJSBuiltinConstructor*);
+WebCore::TestClassWithJSBuiltinConstructor* core(WebKitDOMTestClassWithJSBuiltinConstructor*);
+} // namespace WebKit
+
+#endif /* WebKitDOMTestClassWithJSBuiltinConstructorPrivate_h */
Added: trunk/Source/WebCore/bindings/scripts/test/JS/JSTestClassWithJSBuiltinConstructor.cpp (0 => 194100)
--- trunk/Source/WebCore/bindings/scripts/test/JS/JSTestClassWithJSBuiltinConstructor.cpp (rev 0)
+++ trunk/Source/WebCore/bindings/scripts/test/JS/JSTestClassWithJSBuiltinConstructor.cpp 2015-12-15 08:55:23 UTC (rev 194100)
@@ -0,0 +1,206 @@
+/*
+ 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 "JSTestClassWithJSBuiltinConstructor.h"
+
+#include "JSDOMBinding.h"
+#include "JSDOMConstructor.h"
+#include "TestClassWithJSBuiltinConstructorBuiltins.h"
+#include <wtf/GetPtr.h>
+
+using namespace JSC;
+
+namespace WebCore {
+
+// Attributes
+
+JSC::EncodedJSValue jsTestClassWithJSBuiltinConstructorConstructor(JSC::ExecState*, JSC::JSObject*, JSC::EncodedJSValue, JSC::PropertyName);
+
+class JSTestClassWithJSBuiltinConstructorPrototype : public JSC::JSNonFinalObject {
+public:
+ typedef JSC::JSNonFinalObject Base;
+ static JSTestClassWithJSBuiltinConstructorPrototype* create(JSC::VM& vm, JSC::JSGlobalObject* globalObject, JSC::Structure* structure)
+ {
+ JSTestClassWithJSBuiltinConstructorPrototype* ptr = new (NotNull, JSC::allocateCell<JSTestClassWithJSBuiltinConstructorPrototype>(vm.heap)) JSTestClassWithJSBuiltinConstructorPrototype(vm, globalObject, structure);
+ ptr->finishCreation(vm);
+ return ptr;
+ }
+
+ DECLARE_INFO;
+ static JSC::Structure* createStructure(JSC::VM& vm, JSC::JSGlobalObject* globalObject, JSC::JSValue prototype)
+ {
+ return JSC::Structure::create(vm, globalObject, prototype, JSC::TypeInfo(JSC::ObjectType, StructureFlags), info());
+ }
+
+private:
+ JSTestClassWithJSBuiltinConstructorPrototype(JSC::VM& vm, JSC::JSGlobalObject*, JSC::Structure* structure)
+ : JSC::JSNonFinalObject(vm, structure)
+ {
+ }
+
+ void finishCreation(JSC::VM&);
+};
+
+typedef JSBuiltinConstructor<JSTestClassWithJSBuiltinConstructor> JSTestClassWithJSBuiltinConstructorConstructor;
+
+template<> JSC::JSObject* JSTestClassWithJSBuiltinConstructorConstructor::createJSObject()
+{
+ return JSTestClassWithJSBuiltinConstructor::create(getDOMStructure<JSTestClassWithJSBuiltinConstructor>(globalObject()->vm(), *globalObject()), globalObject(), TestClassWithJSBuiltinConstructor::create());
+}
+
+template<> void JSTestClassWithJSBuiltinConstructorConstructor::initializeProperties(VM& vm, JSDOMGlobalObject& globalObject)
+{
+ putDirect(vm, vm.propertyNames->prototype, JSTestClassWithJSBuiltinConstructor::getPrototype(vm, &globalObject), DontDelete | ReadOnly | DontEnum);
+ putDirect(vm, vm.propertyNames->name, jsNontrivialString(&vm, String(ASCIILiteral("TestClassWithJSBuiltinConstructor"))), ReadOnly | DontEnum);
+ putDirect(vm, vm.propertyNames->length, jsNumber(0), ReadOnly | DontEnum);
+}
+
+template<> FunctionExecutable* JSTestClassWithJSBuiltinConstructorConstructor::initializeExecutable(VM& vm)
+{
+ return testClassWithJSBuiltinConstructorInitializeTestClassWithJSBuiltinConstructorCodeGenerator(vm);
+}
+
+template<> const ClassInfo JSTestClassWithJSBuiltinConstructorConstructor::s_info = { "TestClassWithJSBuiltinConstructorConstructor", &Base::s_info, 0, CREATE_METHOD_TABLE(JSTestClassWithJSBuiltinConstructorConstructor) };
+
+/* Hash table for prototype */
+
+static const HashTableValue JSTestClassWithJSBuiltinConstructorPrototypeTableValues[] =
+{
+ { "constructor", DontEnum | ReadOnly, NoIntrinsic, { (intptr_t)static_cast<PropertySlot::GetValueFunc>(jsTestClassWithJSBuiltinConstructorConstructor), (intptr_t) static_cast<PutPropertySlot::PutValueFunc>(0) } },
+};
+
+const ClassInfo JSTestClassWithJSBuiltinConstructorPrototype::s_info = { "TestClassWithJSBuiltinConstructorPrototype", &Base::s_info, 0, CREATE_METHOD_TABLE(JSTestClassWithJSBuiltinConstructorPrototype) };
+
+void JSTestClassWithJSBuiltinConstructorPrototype::finishCreation(VM& vm)
+{
+ Base::finishCreation(vm);
+ reifyStaticProperties(vm, JSTestClassWithJSBuiltinConstructorPrototypeTableValues, *this);
+}
+
+const ClassInfo JSTestClassWithJSBuiltinConstructor::s_info = { "TestClassWithJSBuiltinConstructor", &Base::s_info, 0, CREATE_METHOD_TABLE(JSTestClassWithJSBuiltinConstructor) };
+
+JSTestClassWithJSBuiltinConstructor::JSTestClassWithJSBuiltinConstructor(Structure* structure, JSDOMGlobalObject& globalObject, Ref<TestClassWithJSBuiltinConstructor>&& impl)
+ : JSDOMWrapper<TestClassWithJSBuiltinConstructor>(structure, globalObject, WTF::move(impl))
+{
+}
+
+JSObject* JSTestClassWithJSBuiltinConstructor::createPrototype(VM& vm, JSGlobalObject* globalObject)
+{
+ return JSTestClassWithJSBuiltinConstructorPrototype::create(vm, globalObject, JSTestClassWithJSBuiltinConstructorPrototype::createStructure(vm, globalObject, globalObject->objectPrototype()));
+}
+
+JSObject* JSTestClassWithJSBuiltinConstructor::getPrototype(VM& vm, JSGlobalObject* globalObject)
+{
+ return getDOMPrototype<JSTestClassWithJSBuiltinConstructor>(vm, globalObject);
+}
+
+void JSTestClassWithJSBuiltinConstructor::destroy(JSC::JSCell* cell)
+{
+ JSTestClassWithJSBuiltinConstructor* thisObject = static_cast<JSTestClassWithJSBuiltinConstructor*>(cell);
+ thisObject->JSTestClassWithJSBuiltinConstructor::~JSTestClassWithJSBuiltinConstructor();
+}
+
+EncodedJSValue jsTestClassWithJSBuiltinConstructorConstructor(ExecState* state, JSObject* baseValue, EncodedJSValue, PropertyName)
+{
+ JSTestClassWithJSBuiltinConstructorPrototype* domObject = jsDynamicCast<JSTestClassWithJSBuiltinConstructorPrototype*>(baseValue);
+ if (!domObject)
+ return throwVMTypeError(state);
+ return JSValue::encode(JSTestClassWithJSBuiltinConstructor::getConstructor(state->vm(), domObject->globalObject()));
+}
+
+JSValue JSTestClassWithJSBuiltinConstructor::getConstructor(VM& vm, JSGlobalObject* globalObject)
+{
+ return getDOMConstructor<JSTestClassWithJSBuiltinConstructorConstructor>(vm, *jsCast<JSDOMGlobalObject*>(globalObject));
+}
+
+void JSTestClassWithJSBuiltinConstructor::visitChildren(JSCell* cell, SlotVisitor& visitor)
+{
+ auto* thisObject = jsCast<JSTestClassWithJSBuiltinConstructor*>(cell);
+ ASSERT_GC_OBJECT_INHERITS(thisObject, info());
+ Base::visitChildren(thisObject, visitor);
+}
+
+bool JSTestClassWithJSBuiltinConstructorOwner::isReachableFromOpaqueRoots(JSC::Handle<JSC::Unknown> handle, void*, SlotVisitor& visitor)
+{
+ UNUSED_PARAM(handle);
+ UNUSED_PARAM(visitor);
+ return false;
+}
+
+void JSTestClassWithJSBuiltinConstructorOwner::finalize(JSC::Handle<JSC::Unknown> handle, void* context)
+{
+ auto* jsTestClassWithJSBuiltinConstructor = jsCast<JSTestClassWithJSBuiltinConstructor*>(handle.slot()->asCell());
+ auto& world = *static_cast<DOMWrapperWorld*>(context);
+ uncacheWrapper(world, &jsTestClassWithJSBuiltinConstructor->wrapped(), jsTestClassWithJSBuiltinConstructor);
+}
+
+#if ENABLE(BINDING_INTEGRITY)
+#if PLATFORM(WIN)
+#pragma warning(disable: 4483)
+extern "C" { extern void (*const __identifier("??_7TestClassWithJSBuiltinConstructor@WebCore@@6B@")[])(); }
+#else
+extern "C" { extern void* _ZTVN7WebCore33TestClassWithJSBuiltinConstructorE[]; }
+#endif
+#endif
+
+JSC::JSValue toJSNewlyCreated(JSC::ExecState*, JSDOMGlobalObject* globalObject, TestClassWithJSBuiltinConstructor* impl)
+{
+ if (!impl)
+ return jsNull();
+ return createNewWrapper<JSTestClassWithJSBuiltinConstructor>(globalObject, impl);
+}
+
+JSC::JSValue toJS(JSC::ExecState*, JSDOMGlobalObject* globalObject, TestClassWithJSBuiltinConstructor* impl)
+{
+ if (!impl)
+ return jsNull();
+ if (JSValue result = getExistingWrapper<JSTestClassWithJSBuiltinConstructor>(globalObject, impl))
+ return result;
+
+#if ENABLE(BINDING_INTEGRITY)
+ void* actualVTablePointer = *(reinterpret_cast<void**>(impl));
+#if PLATFORM(WIN)
+ void* expectedVTablePointer = reinterpret_cast<void*>(__identifier("??_7TestClassWithJSBuiltinConstructor@WebCore@@6B@"));
+#else
+ void* expectedVTablePointer = &_ZTVN7WebCore33TestClassWithJSBuiltinConstructorE[2];
+#if COMPILER(CLANG)
+ // If this fails TestClassWithJSBuiltinConstructor does not have a vtable, so you need to add the
+ // ImplementationLacksVTable attribute to the interface definition
+ COMPILE_ASSERT(__is_polymorphic(TestClassWithJSBuiltinConstructor), TestClassWithJSBuiltinConstructor_is_not_polymorphic);
+#endif
+#endif
+ // If you hit this assertion you either have a use after free bug, or
+ // TestClassWithJSBuiltinConstructor has subclasses. If TestClassWithJSBuiltinConstructor has subclasses that get passed
+ // to toJS() we currently require TestClassWithJSBuiltinConstructor you to opt out of binding hardening
+ // by adding the SkipVTableValidation attribute to the interface IDL definition
+ RELEASE_ASSERT(actualVTablePointer == expectedVTablePointer);
+#endif
+ return createNewWrapper<JSTestClassWithJSBuiltinConstructor>(globalObject, impl);
+}
+
+TestClassWithJSBuiltinConstructor* JSTestClassWithJSBuiltinConstructor::toWrapped(JSC::JSValue value)
+{
+ if (auto* wrapper = jsDynamicCast<JSTestClassWithJSBuiltinConstructor*>(value))
+ return &wrapper->wrapped();
+ return nullptr;
+}
+
+}
Added: trunk/Source/WebCore/bindings/scripts/test/JS/JSTestClassWithJSBuiltinConstructor.h (0 => 194100)
--- trunk/Source/WebCore/bindings/scripts/test/JS/JSTestClassWithJSBuiltinConstructor.h (rev 0)
+++ trunk/Source/WebCore/bindings/scripts/test/JS/JSTestClassWithJSBuiltinConstructor.h 2015-12-15 08:55:23 UTC (rev 194100)
@@ -0,0 +1,85 @@
+/*
+ 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 JSTestClassWithJSBuiltinConstructor_h
+#define JSTestClassWithJSBuiltinConstructor_h
+
+#include "JSDOMWrapper.h"
+#include "TestClassWithJSBuiltinConstructor.h"
+#include <wtf/NeverDestroyed.h>
+
+namespace WebCore {
+
+class JSTestClassWithJSBuiltinConstructor : public JSDOMWrapper<TestClassWithJSBuiltinConstructor> {
+public:
+ typedef JSDOMWrapper<TestClassWithJSBuiltinConstructor> Base;
+ static JSTestClassWithJSBuiltinConstructor* create(JSC::Structure* structure, JSDOMGlobalObject* globalObject, Ref<TestClassWithJSBuiltinConstructor>&& impl)
+ {
+ JSTestClassWithJSBuiltinConstructor* ptr = new (NotNull, JSC::allocateCell<JSTestClassWithJSBuiltinConstructor>(globalObject->vm().heap)) JSTestClassWithJSBuiltinConstructor(structure, *globalObject, WTF::move(impl));
+ ptr->finishCreation(globalObject->vm());
+ return ptr;
+ }
+
+ static JSC::JSObject* createPrototype(JSC::VM&, JSC::JSGlobalObject*);
+ static JSC::JSObject* getPrototype(JSC::VM&, JSC::JSGlobalObject*);
+ static TestClassWithJSBuiltinConstructor* toWrapped(JSC::JSValue);
+ static void destroy(JSC::JSCell*);
+
+ DECLARE_INFO;
+
+ static JSC::Structure* createStructure(JSC::VM& vm, JSC::JSGlobalObject* globalObject, JSC::JSValue prototype)
+ {
+ return JSC::Structure::create(vm, globalObject, prototype, JSC::TypeInfo(JSC::ObjectType, StructureFlags), info());
+ }
+
+ static JSC::JSValue getConstructor(JSC::VM&, JSC::JSGlobalObject*);
+ static void visitChildren(JSCell*, JSC::SlotVisitor&);
+
+protected:
+ JSTestClassWithJSBuiltinConstructor(JSC::Structure*, JSDOMGlobalObject&, Ref<TestClassWithJSBuiltinConstructor>&&);
+
+ void finishCreation(JSC::VM& vm)
+ {
+ Base::finishCreation(vm);
+ ASSERT(inherits(info()));
+ }
+
+};
+
+class JSTestClassWithJSBuiltinConstructorOwner : public JSC::WeakHandleOwner {
+public:
+ 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&, TestClassWithJSBuiltinConstructor*)
+{
+ static NeverDestroyed<JSTestClassWithJSBuiltinConstructorOwner> owner;
+ return &owner.get();
+}
+
+JSC::JSValue toJS(JSC::ExecState*, JSDOMGlobalObject*, TestClassWithJSBuiltinConstructor*);
+inline JSC::JSValue toJS(JSC::ExecState* state, JSDOMGlobalObject* globalObject, TestClassWithJSBuiltinConstructor& impl) { return toJS(state, globalObject, &impl); }
+JSC::JSValue toJSNewlyCreated(JSC::ExecState*, JSDOMGlobalObject*, TestClassWithJSBuiltinConstructor*);
+
+
+} // namespace WebCore
+
+#endif
Added: trunk/Source/WebCore/bindings/scripts/test/ObjC/DOMTestClassWithJSBuiltinConstructor.h (0 => 194100)
--- trunk/Source/WebCore/bindings/scripts/test/ObjC/DOMTestClassWithJSBuiltinConstructor.h (rev 0)
+++ trunk/Source/WebCore/bindings/scripts/test/ObjC/DOMTestClassWithJSBuiltinConstructor.h 2015-12-15 08:55:23 UTC (rev 194100)
@@ -0,0 +1,31 @@
+/*
+ * Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009 Apple Inc. All rights reserved.
+ * Copyright (C) 2006 Samuel Weinig <[email protected]>
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY APPLE INC. ``AS IS'' AND ANY
+ * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+ * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR
+ * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
+ * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+ * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+ * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY
+ * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#import <WebCore/DOMObject.h>
+
+WEBKIT_CLASS_AVAILABLE_MAC(9876_5)
+WEBCORE_EXPORT @interface DOMTestClassWithJSBuiltinConstructor : DOMObject
+@end
Added: trunk/Source/WebCore/bindings/scripts/test/ObjC/DOMTestClassWithJSBuiltinConstructor.mm (0 => 194100)
--- trunk/Source/WebCore/bindings/scripts/test/ObjC/DOMTestClassWithJSBuiltinConstructor.mm (rev 0)
+++ trunk/Source/WebCore/bindings/scripts/test/ObjC/DOMTestClassWithJSBuiltinConstructor.mm 2015-12-15 08:55:23 UTC (rev 194100)
@@ -0,0 +1,75 @@
+/*
+ * This file is part of the WebKit open source project.
+ * This file has been generated by generate-bindings.pl. DO NOT MODIFY!
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY APPLE INC. ``AS IS'' AND ANY
+ * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+ * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR
+ * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
+ * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+ * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+ * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY
+ * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#import "config.h"
+#import "DOMInternal.h"
+
+#import "DOMTestClassWithJSBuiltinConstructor.h"
+
+#import "DOMNodeInternal.h"
+#import "DOMTestClassWithJSBuiltinConstructorInternal.h"
+#import "ExceptionHandlers.h"
+#import "JSMainThreadExecState.h"
+#import "TestClassWithJSBuiltinConstructor.h"
+#import "ThreadCheck.h"
+#import "WebCoreObjCExtras.h"
+#import "WebScriptObjectPrivate.h"
+#import <wtf/GetPtr.h>
+
+#define IMPL reinterpret_cast<WebCore::TestClassWithJSBuiltinConstructor*>(_internal)
+
+@implementation DOMTestClassWithJSBuiltinConstructor
+
+- (void)dealloc
+{
+ if (WebCoreObjCScheduleDeallocateOnMainThread([DOMTestClassWithJSBuiltinConstructor class], self))
+ return;
+
+ if (_internal)
+ IMPL->deref();
+ [super dealloc];
+}
+
+@end
+
+WebCore::TestClassWithJSBuiltinConstructor* core(DOMTestClassWithJSBuiltinConstructor *wrapper)
+{
+ return wrapper ? reinterpret_cast<WebCore::TestClassWithJSBuiltinConstructor*>(wrapper->_internal) : 0;
+}
+
+DOMTestClassWithJSBuiltinConstructor *kit(WebCore::TestClassWithJSBuiltinConstructor* value)
+{
+ WebCoreThreadViolationCheckRoundOne();
+ if (!value)
+ return nil;
+ if (DOMTestClassWithJSBuiltinConstructor *wrapper = getDOMWrapper(value))
+ return [[wrapper retain] autorelease];
+ DOMTestClassWithJSBuiltinConstructor *wrapper = [[DOMTestClassWithJSBuiltinConstructor alloc] _init];
+ wrapper->_internal = reinterpret_cast<DOMObjectInternal*>(value);
+ value->ref();
+ addDOMWrapper(wrapper, value);
+ return [wrapper autorelease];
+}
Added: trunk/Source/WebCore/bindings/scripts/test/ObjC/DOMTestClassWithJSBuiltinConstructorInternal.h (0 => 194100)
--- trunk/Source/WebCore/bindings/scripts/test/ObjC/DOMTestClassWithJSBuiltinConstructorInternal.h (rev 0)
+++ trunk/Source/WebCore/bindings/scripts/test/ObjC/DOMTestClassWithJSBuiltinConstructorInternal.h 2015-12-15 08:55:23 UTC (rev 194100)
@@ -0,0 +1,34 @@
+/*
+ * This file is part of the WebKit open source project.
+ * This file has been generated by generate-bindings.pl. DO NOT MODIFY!
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY APPLE INC. ``AS IS'' AND ANY
+ * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+ * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR
+ * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
+ * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+ * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+ * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY
+ * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#import <WebCore/DOMTestClassWithJSBuiltinConstructor.h>
+
+namespace WebCore {
+class TestClassWithJSBuiltinConstructor;
+}
+
+WEBCORE_EXPORT WebCore::TestClassWithJSBuiltinConstructor* core(DOMTestClassWithJSBuiltinConstructor *);
+WEBCORE_EXPORT DOMTestClassWithJSBuiltinConstructor *kit(WebCore::TestClassWithJSBuiltinConstructor*);
Copied: trunk/Source/WebCore/bindings/scripts/test/TestClassWithJSBuiltinConstructor.idl (from rev 194095, trunk/Source/WebCore/bindings/scripts/test/TestCustomConstructor.idl) (0 => 194100)
--- trunk/Source/WebCore/bindings/scripts/test/TestClassWithJSBuiltinConstructor.idl (rev 0)
+++ trunk/Source/WebCore/bindings/scripts/test/TestClassWithJSBuiltinConstructor.idl 2015-12-15 08:55:23 UTC (rev 194100)
@@ -0,0 +1,32 @@
+/*
+ * Copyright (C) 2015 Canon Inc.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted, provided that the following conditions
+ * are required to be met:
+ *
+ * 1. Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ * 3. Neither the name of Canon Inc. nor the names of
+ * its contributors may be used to endorse or promote products derived
+ * from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY CANON INC. AND ITS CONTRIBUTORS "AS IS" AND ANY
+ * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ * DISCLAIMED. IN NO EVENT SHALL CANON INC. AND ITS CONTRIBUTORS BE LIABLE FOR
+ * ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+ * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+ * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
+ * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+[
+ JSBuiltinConstructor
+] interface TestClassWithJSBuiltinConstructor {
+};
Modified: trunk/Source/WebCore/bindings/scripts/test/TestCustomConstructor.idl (194099 => 194100)
--- trunk/Source/WebCore/bindings/scripts/test/TestCustomConstructor.idl 2015-12-15 08:11:07 UTC (rev 194099)
+++ trunk/Source/WebCore/bindings/scripts/test/TestCustomConstructor.idl 2015-12-15 08:55:23 UTC (rev 194100)
@@ -28,8 +28,6 @@
[
CustomConstructor,
- JSBuiltIn,
NoInterfaceObject
] interface TestCustomConstructorWithNoInterfaceObject {
};
-
