Diff
Modified: trunk/Source/WebCore/ChangeLog (148689 => 148690)
--- trunk/Source/WebCore/ChangeLog 2013-04-18 18:08:43 UTC (rev 148689)
+++ trunk/Source/WebCore/ChangeLog 2013-04-18 18:14:45 UTC (rev 148690)
@@ -1,3 +1,24 @@
+2013-04-18 Oliver Hunt <[email protected]>
+
+ Fix windows build by moving template definition to JSDOMBinding.h
+
+ * bindings/js/JSDOMBinding.h:
+ (WebCore):
+ * bindings/scripts/CodeGeneratorJS.pm:
+ (GenerateImplementation):
+ * bindings/scripts/test/JS/JSTestActiveDOMObject.cpp:
+ * bindings/scripts/test/JS/JSTestCustomNamedGetter.cpp:
+ * bindings/scripts/test/JS/JSTestEventConstructor.cpp:
+ * bindings/scripts/test/JS/JSTestEventTarget.cpp:
+ * bindings/scripts/test/JS/JSTestException.cpp:
+ * bindings/scripts/test/JS/JSTestInterface.cpp:
+ * bindings/scripts/test/JS/JSTestMediaQueryListListener.cpp:
+ * bindings/scripts/test/JS/JSTestNamedConstructor.cpp:
+ * bindings/scripts/test/JS/JSTestObj.cpp:
+ * bindings/scripts/test/JS/JSTestOverloadedConstructors.cpp:
+ * bindings/scripts/test/JS/JSTestSerializedScriptValueInterface.cpp:
+ * bindings/scripts/test/JS/JSTestTypedefs.cpp:
+
2013-04-18 Eric Carlson <[email protected]>
Forced subtitles never rendered
Modified: trunk/Source/WebCore/bindings/js/JSDOMBinding.h (148689 => 148690)
--- trunk/Source/WebCore/bindings/js/JSDOMBinding.h 2013-04-18 18:08:43 UTC (rev 148689)
+++ trunk/Source/WebCore/bindings/js/JSDOMBinding.h 2013-04-18 18:14:45 UTC (rev 148690)
@@ -546,6 +546,18 @@
public:
static const bool value = sizeof(dummy(static_cast<Base*>(0))) == sizeof(YesType);
};
+ template <typename T, bool hasReportCostFunction = HasMemoryCostMemberFunction<T>::value > struct ReportMemoryCost;
+ template <typename T> struct ReportMemoryCost<T, true> {
+ static void reportMemoryCost(JSC::ExecState* exec, T* impl)
+ {
+ exec->heap()->reportExtraMemoryCost(impl->memoryCost());
+ }
+ };
+ template <typename T> struct ReportMemoryCost<T, false> {
+ static void reportMemoryCost(JSC::ExecState*, T*)
+ {
+ }
+ };
} // namespace WebCore
Modified: trunk/Source/WebCore/bindings/scripts/CodeGeneratorJS.pm (148689 => 148690)
--- trunk/Source/WebCore/bindings/scripts/CodeGeneratorJS.pm 2013-04-18 18:08:43 UTC (rev 148689)
+++ trunk/Source/WebCore/bindings/scripts/CodeGeneratorJS.pm 2013-04-18 18:14:45 UTC (rev 148690)
@@ -2714,20 +2714,6 @@
#endif
#endif
END
-push(@implContent, <<END);
-template <typename T, bool hasReportCostFunction = HasMemoryCostMemberFunction<T>::value > struct ReportMemoryCost;
-template <typename T> struct ReportMemoryCost<T, true> {
- static void reportMemoryCost(ExecState* exec, T* impl)
- {
- exec->heap()->reportExtraMemoryCost(impl->memoryCost());
- }
-};
-template <typename T> struct ReportMemoryCost<T, false> {
- static void reportMemoryCost(ExecState*, T*)
- {
- }
-};
-END
push(@implContent, "JSC::JSValue toJS(JSC::ExecState* exec, JSDOMGlobalObject* globalObject, $implType* impl)\n");
push(@implContent, "{\n");
Modified: trunk/Source/WebCore/bindings/scripts/test/JS/JSTestActiveDOMObject.cpp (148689 => 148690)
--- trunk/Source/WebCore/bindings/scripts/test/JS/JSTestActiveDOMObject.cpp 2013-04-18 18:08:43 UTC (rev 148689)
+++ trunk/Source/WebCore/bindings/scripts/test/JS/JSTestActiveDOMObject.cpp 2013-04-18 18:14:45 UTC (rev 148690)
@@ -243,18 +243,6 @@
extern "C" { extern void* _ZTVN7WebCore19TestActiveDOMObjectE[]; }
#endif
#endif
-template <typename T, bool hasReportCostFunction = HasMemoryCostMemberFunction<T>::value > struct ReportMemoryCost;
-template <typename T> struct ReportMemoryCost<T, true> {
- static void reportMemoryCost(ExecState* exec, T* impl)
- {
- exec->heap()->reportExtraMemoryCost(impl->memoryCost());
- }
-};
-template <typename T> struct ReportMemoryCost<T, false> {
- static void reportMemoryCost(ExecState*, T*)
- {
- }
-};
JSC::JSValue toJS(JSC::ExecState* exec, JSDOMGlobalObject* globalObject, TestActiveDOMObject* impl)
{
if (!impl)
Modified: trunk/Source/WebCore/bindings/scripts/test/JS/JSTestCustomNamedGetter.cpp (148689 => 148690)
--- trunk/Source/WebCore/bindings/scripts/test/JS/JSTestCustomNamedGetter.cpp 2013-04-18 18:08:43 UTC (rev 148689)
+++ trunk/Source/WebCore/bindings/scripts/test/JS/JSTestCustomNamedGetter.cpp 2013-04-18 18:14:45 UTC (rev 148690)
@@ -227,18 +227,6 @@
extern "C" { extern void* _ZTVN7WebCore21TestCustomNamedGetterE[]; }
#endif
#endif
-template <typename T, bool hasReportCostFunction = HasMemoryCostMemberFunction<T>::value > struct ReportMemoryCost;
-template <typename T> struct ReportMemoryCost<T, true> {
- static void reportMemoryCost(ExecState* exec, T* impl)
- {
- exec->heap()->reportExtraMemoryCost(impl->memoryCost());
- }
-};
-template <typename T> struct ReportMemoryCost<T, false> {
- static void reportMemoryCost(ExecState*, T*)
- {
- }
-};
JSC::JSValue toJS(JSC::ExecState* exec, JSDOMGlobalObject* globalObject, TestCustomNamedGetter* impl)
{
if (!impl)
Modified: trunk/Source/WebCore/bindings/scripts/test/JS/JSTestEventConstructor.cpp (148689 => 148690)
--- trunk/Source/WebCore/bindings/scripts/test/JS/JSTestEventConstructor.cpp 2013-04-18 18:08:43 UTC (rev 148689)
+++ trunk/Source/WebCore/bindings/scripts/test/JS/JSTestEventConstructor.cpp 2013-04-18 18:14:45 UTC (rev 148690)
@@ -242,18 +242,6 @@
extern "C" { extern void* _ZTVN7WebCore20TestEventConstructorE[]; }
#endif
#endif
-template <typename T, bool hasReportCostFunction = HasMemoryCostMemberFunction<T>::value > struct ReportMemoryCost;
-template <typename T> struct ReportMemoryCost<T, true> {
- static void reportMemoryCost(ExecState* exec, T* impl)
- {
- exec->heap()->reportExtraMemoryCost(impl->memoryCost());
- }
-};
-template <typename T> struct ReportMemoryCost<T, false> {
- static void reportMemoryCost(ExecState*, T*)
- {
- }
-};
JSC::JSValue toJS(JSC::ExecState* exec, JSDOMGlobalObject* globalObject, TestEventConstructor* impl)
{
if (!impl)
Modified: trunk/Source/WebCore/bindings/scripts/test/JS/JSTestEventTarget.cpp (148689 => 148690)
--- trunk/Source/WebCore/bindings/scripts/test/JS/JSTestEventTarget.cpp 2013-04-18 18:08:43 UTC (rev 148689)
+++ trunk/Source/WebCore/bindings/scripts/test/JS/JSTestEventTarget.cpp 2013-04-18 18:14:45 UTC (rev 148690)
@@ -348,18 +348,6 @@
extern "C" { extern void* _ZTVN7WebCore15TestEventTargetE[]; }
#endif
#endif
-template <typename T, bool hasReportCostFunction = HasMemoryCostMemberFunction<T>::value > struct ReportMemoryCost;
-template <typename T> struct ReportMemoryCost<T, true> {
- static void reportMemoryCost(ExecState* exec, T* impl)
- {
- exec->heap()->reportExtraMemoryCost(impl->memoryCost());
- }
-};
-template <typename T> struct ReportMemoryCost<T, false> {
- static void reportMemoryCost(ExecState*, T*)
- {
- }
-};
JSC::JSValue toJS(JSC::ExecState* exec, JSDOMGlobalObject* globalObject, TestEventTarget* impl)
{
if (!impl)
Modified: trunk/Source/WebCore/bindings/scripts/test/JS/JSTestException.cpp (148689 => 148690)
--- trunk/Source/WebCore/bindings/scripts/test/JS/JSTestException.cpp 2013-04-18 18:08:43 UTC (rev 148689)
+++ trunk/Source/WebCore/bindings/scripts/test/JS/JSTestException.cpp 2013-04-18 18:14:45 UTC (rev 148690)
@@ -184,18 +184,6 @@
extern "C" { extern void* _ZTVN7WebCore13TestExceptionE[]; }
#endif
#endif
-template <typename T, bool hasReportCostFunction = HasMemoryCostMemberFunction<T>::value > struct ReportMemoryCost;
-template <typename T> struct ReportMemoryCost<T, true> {
- static void reportMemoryCost(ExecState* exec, T* impl)
- {
- exec->heap()->reportExtraMemoryCost(impl->memoryCost());
- }
-};
-template <typename T> struct ReportMemoryCost<T, false> {
- static void reportMemoryCost(ExecState*, T*)
- {
- }
-};
JSC::JSValue toJS(JSC::ExecState* exec, JSDOMGlobalObject* globalObject, TestException* impl)
{
if (!impl)
Modified: trunk/Source/WebCore/bindings/scripts/test/JS/JSTestInterface.cpp (148689 => 148690)
--- trunk/Source/WebCore/bindings/scripts/test/JS/JSTestInterface.cpp 2013-04-18 18:08:43 UTC (rev 148689)
+++ trunk/Source/WebCore/bindings/scripts/test/JS/JSTestInterface.cpp 2013-04-18 18:14:45 UTC (rev 148690)
@@ -499,18 +499,6 @@
jsTestInterface->releaseImpl();
}
-template <typename T, bool hasReportCostFunction = HasMemoryCostMemberFunction<T>::value > struct ReportMemoryCost;
-template <typename T> struct ReportMemoryCost<T, true> {
- static void reportMemoryCost(ExecState* exec, T* impl)
- {
- exec->heap()->reportExtraMemoryCost(impl->memoryCost());
- }
-};
-template <typename T> struct ReportMemoryCost<T, false> {
- static void reportMemoryCost(ExecState*, T*)
- {
- }
-};
JSC::JSValue toJS(JSC::ExecState* exec, JSDOMGlobalObject* globalObject, TestInterface* impl)
{
if (!impl)
Modified: trunk/Source/WebCore/bindings/scripts/test/JS/JSTestMediaQueryListListener.cpp (148689 => 148690)
--- trunk/Source/WebCore/bindings/scripts/test/JS/JSTestMediaQueryListListener.cpp 2013-04-18 18:08:43 UTC (rev 148689)
+++ trunk/Source/WebCore/bindings/scripts/test/JS/JSTestMediaQueryListListener.cpp 2013-04-18 18:14:45 UTC (rev 148690)
@@ -205,18 +205,6 @@
extern "C" { extern void* _ZTVN7WebCore26TestMediaQueryListListenerE[]; }
#endif
#endif
-template <typename T, bool hasReportCostFunction = HasMemoryCostMemberFunction<T>::value > struct ReportMemoryCost;
-template <typename T> struct ReportMemoryCost<T, true> {
- static void reportMemoryCost(ExecState* exec, T* impl)
- {
- exec->heap()->reportExtraMemoryCost(impl->memoryCost());
- }
-};
-template <typename T> struct ReportMemoryCost<T, false> {
- static void reportMemoryCost(ExecState*, T*)
- {
- }
-};
JSC::JSValue toJS(JSC::ExecState* exec, JSDOMGlobalObject* globalObject, TestMediaQueryListListener* impl)
{
if (!impl)
Modified: trunk/Source/WebCore/bindings/scripts/test/JS/JSTestNamedConstructor.cpp (148689 => 148690)
--- trunk/Source/WebCore/bindings/scripts/test/JS/JSTestNamedConstructor.cpp 2013-04-18 18:08:43 UTC (rev 148689)
+++ trunk/Source/WebCore/bindings/scripts/test/JS/JSTestNamedConstructor.cpp 2013-04-18 18:14:45 UTC (rev 148690)
@@ -219,18 +219,6 @@
extern "C" { extern void* _ZTVN7WebCore20TestNamedConstructorE[]; }
#endif
#endif
-template <typename T, bool hasReportCostFunction = HasMemoryCostMemberFunction<T>::value > struct ReportMemoryCost;
-template <typename T> struct ReportMemoryCost<T, true> {
- static void reportMemoryCost(ExecState* exec, T* impl)
- {
- exec->heap()->reportExtraMemoryCost(impl->memoryCost());
- }
-};
-template <typename T> struct ReportMemoryCost<T, false> {
- static void reportMemoryCost(ExecState*, T*)
- {
- }
-};
JSC::JSValue toJS(JSC::ExecState* exec, JSDOMGlobalObject* globalObject, TestNamedConstructor* impl)
{
if (!impl)
Modified: trunk/Source/WebCore/bindings/scripts/test/JS/JSTestObj.cpp (148689 => 148690)
--- trunk/Source/WebCore/bindings/scripts/test/JS/JSTestObj.cpp 2013-04-18 18:08:43 UTC (rev 148689)
+++ trunk/Source/WebCore/bindings/scripts/test/JS/JSTestObj.cpp 2013-04-18 18:14:45 UTC (rev 148690)
@@ -3089,18 +3089,6 @@
extern "C" { extern void* _ZTVN7WebCore7TestObjE[]; }
#endif
#endif
-template <typename T, bool hasReportCostFunction = HasMemoryCostMemberFunction<T>::value > struct ReportMemoryCost;
-template <typename T> struct ReportMemoryCost<T, true> {
- static void reportMemoryCost(ExecState* exec, T* impl)
- {
- exec->heap()->reportExtraMemoryCost(impl->memoryCost());
- }
-};
-template <typename T> struct ReportMemoryCost<T, false> {
- static void reportMemoryCost(ExecState*, T*)
- {
- }
-};
JSC::JSValue toJS(JSC::ExecState* exec, JSDOMGlobalObject* globalObject, TestObj* impl)
{
if (!impl)
Modified: trunk/Source/WebCore/bindings/scripts/test/JS/JSTestOverloadedConstructors.cpp (148689 => 148690)
--- trunk/Source/WebCore/bindings/scripts/test/JS/JSTestOverloadedConstructors.cpp 2013-04-18 18:08:43 UTC (rev 148689)
+++ trunk/Source/WebCore/bindings/scripts/test/JS/JSTestOverloadedConstructors.cpp 2013-04-18 18:14:45 UTC (rev 148690)
@@ -249,18 +249,6 @@
extern "C" { extern void* _ZTVN7WebCore26TestOverloadedConstructorsE[]; }
#endif
#endif
-template <typename T, bool hasReportCostFunction = HasMemoryCostMemberFunction<T>::value > struct ReportMemoryCost;
-template <typename T> struct ReportMemoryCost<T, true> {
- static void reportMemoryCost(ExecState* exec, T* impl)
- {
- exec->heap()->reportExtraMemoryCost(impl->memoryCost());
- }
-};
-template <typename T> struct ReportMemoryCost<T, false> {
- static void reportMemoryCost(ExecState*, T*)
- {
- }
-};
JSC::JSValue toJS(JSC::ExecState* exec, JSDOMGlobalObject* globalObject, TestOverloadedConstructors* impl)
{
if (!impl)
Modified: trunk/Source/WebCore/bindings/scripts/test/JS/JSTestSerializedScriptValueInterface.cpp (148689 => 148690)
--- trunk/Source/WebCore/bindings/scripts/test/JS/JSTestSerializedScriptValueInterface.cpp 2013-04-18 18:08:43 UTC (rev 148689)
+++ trunk/Source/WebCore/bindings/scripts/test/JS/JSTestSerializedScriptValueInterface.cpp 2013-04-18 18:14:45 UTC (rev 148690)
@@ -397,18 +397,6 @@
extern "C" { extern void* _ZTVN7WebCore34TestSerializedScriptValueInterfaceE[]; }
#endif
#endif
-template <typename T, bool hasReportCostFunction = HasMemoryCostMemberFunction<T>::value > struct ReportMemoryCost;
-template <typename T> struct ReportMemoryCost<T, true> {
- static void reportMemoryCost(ExecState* exec, T* impl)
- {
- exec->heap()->reportExtraMemoryCost(impl->memoryCost());
- }
-};
-template <typename T> struct ReportMemoryCost<T, false> {
- static void reportMemoryCost(ExecState*, T*)
- {
- }
-};
JSC::JSValue toJS(JSC::ExecState* exec, JSDOMGlobalObject* globalObject, TestSerializedScriptValueInterface* impl)
{
if (!impl)
Modified: trunk/Source/WebCore/bindings/scripts/test/JS/JSTestTypedefs.cpp (148689 => 148690)
--- trunk/Source/WebCore/bindings/scripts/test/JS/JSTestTypedefs.cpp 2013-04-18 18:08:43 UTC (rev 148689)
+++ trunk/Source/WebCore/bindings/scripts/test/JS/JSTestTypedefs.cpp 2013-04-18 18:14:45 UTC (rev 148690)
@@ -635,18 +635,6 @@
extern "C" { extern void* _ZTVN7WebCore12TestTypedefsE[]; }
#endif
#endif
-template <typename T, bool hasReportCostFunction = HasMemoryCostMemberFunction<T>::value > struct ReportMemoryCost;
-template <typename T> struct ReportMemoryCost<T, true> {
- static void reportMemoryCost(ExecState* exec, T* impl)
- {
- exec->heap()->reportExtraMemoryCost(impl->memoryCost());
- }
-};
-template <typename T> struct ReportMemoryCost<T, false> {
- static void reportMemoryCost(ExecState*, T*)
- {
- }
-};
JSC::JSValue toJS(JSC::ExecState* exec, JSDOMGlobalObject* globalObject, TestTypedefs* impl)
{
if (!impl)
