Modified: trunk/Source/WebCore/ChangeLog (208688 => 208689)
--- trunk/Source/WebCore/ChangeLog 2016-11-14 17:55:57 UTC (rev 208688)
+++ trunk/Source/WebCore/ChangeLog 2016-11-14 17:59:08 UTC (rev 208689)
@@ -1,3 +1,13 @@
+2016-11-14 Chris Dumez <cdu...@apple.com>
+
+ Fix the !ENABLE(FETCH_API) build after r208613
+ https://bugs.webkit.org/show_bug.cgi?id=164713
+
+ Reviewed by Youenn Fablet.
+
+ * bindings/scripts/CodeGeneratorJS.pm:
+ (GenerateImplementation):
+
2016-11-13 Darin Adler <da...@apple.com>
Remove many includes of ExceptionCode.h
Modified: trunk/Source/WebCore/bindings/scripts/CodeGeneratorJS.pm (208688 => 208689)
--- trunk/Source/WebCore/bindings/scripts/CodeGeneratorJS.pm 2016-11-14 17:55:57 UTC (rev 208688)
+++ trunk/Source/WebCore/bindings/scripts/CodeGeneratorJS.pm 2016-11-14 17:59:08 UTC (rev 208689)
@@ -2930,13 +2930,13 @@
push(@implContent, "#endif\n") if $conditionalString;
}
- my $firstPrivateFunction = 1;
foreach my $function (@{$interface->functions}) {
next unless ($function->extendedAttributes->{PrivateIdentifier});
AddToImplIncludes("WebCoreJSClientData.h");
- push(@implContent, " JSVMClientData& clientData = *static_cast<JSVMClientData*>(vm.clientData);\n") if $firstPrivateFunction;
- $firstPrivateFunction = 0;
- push(@implContent, " putDirect(vm, clientData.builtinNames()." . $function->name . "PrivateName(), JSFunction::create(vm, globalObject(), 0, String(), " . GetFunctionName($interface, $className, $function) . "), ReadOnly | DontEnum);\n");
+ my $conditionalString = $codeGenerator->GenerateConditionalString($function);
+ push(@implContent, "#if ${conditionalString}\n") if $conditionalString;
+ push(@implContent, " putDirect(vm, static_cast<JSVMClientData*>(vm.clientData)->builtinNames()." . $function->name . "PrivateName(), JSFunction::create(vm, globalObject(), 0, String(), " . GetFunctionName($interface, $className, $function) . "), ReadOnly | DontEnum);\n");
+ push(@implContent, "#endif\n") if $conditionalString;
}
if ($interface->iterable) {
Modified: trunk/Source/WebCore/bindings/scripts/test/JS/JSTestObj.cpp (208688 => 208689)
--- trunk/Source/WebCore/bindings/scripts/test/JS/JSTestObj.cpp 2016-11-14 17:55:57 UTC (rev 208688)
+++ trunk/Source/WebCore/bindings/scripts/test/JS/JSTestObj.cpp 2016-11-14 17:59:08 UTC (rev 208689)
@@ -1734,9 +1734,8 @@
JSObject::deleteProperty(this, globalObject()->globalExec(), propertyName);
}
#endif
- JSVMClientData& clientData = *static_cast<JSVMClientData*>(vm.clientData);
- putDirect(vm, clientData.builtinNames().privateMethodPrivateName(), JSFunction::create(vm, globalObject(), 0, String(), jsTestObjPrototypeFunctionPrivateMethod), ReadOnly | DontEnum);
- putDirect(vm, clientData.builtinNames().publicAndPrivateMethodPrivateName(), JSFunction::create(vm, globalObject(), 0, String(), jsTestObjPrototypeFunctionPublicAndPrivateMethod), ReadOnly | DontEnum);
+ putDirect(vm, static_cast<JSVMClientData*>(vm.clientData)->builtinNames().privateMethodPrivateName(), JSFunction::create(vm, globalObject(), 0, String(), jsTestObjPrototypeFunctionPrivateMethod), ReadOnly | DontEnum);
+ putDirect(vm, static_cast<JSVMClientData*>(vm.clientData)->builtinNames().publicAndPrivateMethodPrivateName(), JSFunction::create(vm, globalObject(), 0, String(), jsTestObjPrototypeFunctionPublicAndPrivateMethod), ReadOnly | DontEnum);
if (RuntimeEnabledFeatures::sharedFeatures().domIteratorEnabled())
addValueIterableMethods(*globalObject(), *this);
JSObject& unscopables = *constructEmptyObject(globalObject()->globalExec(), globalObject()->nullPrototypeObjectStructure());
