Diff
Modified: trunk/Source/_javascript_Core/ChangeLog (203553 => 203554)
--- trunk/Source/_javascript_Core/ChangeLog 2016-07-22 05:33:01 UTC (rev 203553)
+++ trunk/Source/_javascript_Core/ChangeLog 2016-07-22 08:32:12 UTC (rev 203554)
@@ -1,3 +1,31 @@
+2016-07-22 Youenn Fablet <you...@apple.com>
+
+ run-builtins-generator-tests should be able to test WebCore builtins wrapper with more than one file
+ https://bugs.webkit.org/show_bug.cgi?id=159921
+
+ Reviewed by Brian Burg.
+
+ Updated built-in generator to generate only wrapper files when passed the --wrappers-only option.
+ When this option is used, wrapper files are generated but no individual file is generated.
+ When this option is not used, individual files are generated but not wrapper file is generated.
+ This allows the builtin generator test runner to generate a single WebCore-Wrappers.h-result generated for all
+ WebCore test files, like used for real in WebCore.
+ Previously wrapper code was generated individually for each WebCore test file.
+
+ Added new built-in test file to cover the case of concatenating several guards in generated WebCore wrapper files.
+
+ * Scripts/generate-js-builtins.py:
+ (concatenated_output_filename): Compute a decent name for wrapper files in case of test mode.
+ (generate_bindings_for_builtins_files): When --wrappers-only is activated, this generates only the wrapper files, not the individual files.
+ * Scripts/tests/builtins/WebCore-AnotherGuardedInternalBuiltin-Separate.js: Added.
+ * Scripts/tests/builtins/expected/WebCore-AnotherGuardedInternalBuiltin-Separate.js-result: Added.
+ * Scripts/tests/builtins/expected/WebCore-ArbitraryConditionalGuard-Separate.js-result: Removed wrapper code.
+ * Scripts/tests/builtins/expected/WebCore-GuardedBuiltin-Separate.js-result: Ditto.
+ * Scripts/tests/builtins/expected/WebCore-GuardedInternalBuiltin-Separate.js-result: Ditto.
+ * Scripts/tests/builtins/expected/WebCore-UnguardedBuiltin-Separate.js-result: Ditto.
+ * Scripts/tests/builtins/expected/WebCore-xmlCasingTest-Separate.js-result: Removed wrapper code.
+ * Scripts/tests/builtins/expected/WebCoreJSBuiltins.h-result: Added, contains wrapper code for all WebCore valid test cases.
+
2016-07-21 Saam Barati <sbar...@apple.com>
callOperation(.) variants in the DFG that explicitly take a tag/payload register should take a JSValueRegs instead
Modified: trunk/Source/_javascript_Core/Scripts/generate-js-builtins.py (203553 => 203554)
--- trunk/Source/_javascript_Core/Scripts/generate-js-builtins.py 2016-07-22 05:33:01 UTC (rev 203553)
+++ trunk/Source/_javascript_Core/Scripts/generate-js-builtins.py 2016-07-22 08:32:12 UTC (rev 203554)
@@ -37,15 +37,20 @@
from lazywriter import LazyFileWriter
-import builtins
from builtins import *
+def concatenated_output_filename(builtins_files, framework_name, generate_only_wrapper_files):
+ if generate_only_wrapper_files:
+ return framework_name + 'JSBuiltins.h-result'
+ return os.path.basename(builtins_files[0]) + '-result'
+
+
def generate_bindings_for_builtins_files(builtins_files=[],
output_path=None,
concatenate_output=False,
combined_output=False,
- generate_wrapper_files=False,
+ generate_only_wrapper_files=False,
framework_name="",
force_output=False):
@@ -71,16 +76,16 @@
generators.append(BuiltinsCombinedImplementationGenerator(model))
else:
log.debug("Using generator style: single files for each builtin.")
- for object in model.objects:
- generators.append(BuiltinsSeparateHeaderGenerator(model, object))
- generators.append(BuiltinsSeparateImplementationGenerator(model, object))
-
- if generate_wrapper_files:
+ if generate_only_wrapper_files:
generators.append(BuiltinsWrapperHeaderGenerator(model))
generators.append(BuiltinsWrapperImplementationGenerator(model))
generators.append(BuiltinsInternalsWrapperHeaderGenerator(model))
generators.append(BuiltinsInternalsWrapperImplementationGenerator(model))
+ else:
+ for object in model.objects:
+ generators.append(BuiltinsSeparateHeaderGenerator(model, object))
+ generators.append(BuiltinsSeparateImplementationGenerator(model, object))
log.debug("")
log.debug("Generating bindings for builtins.")
@@ -107,9 +112,9 @@
output_file.close()
if concatenate_output:
- filename = os.path.join(os.path.basename(builtins_files[0]) + '-result')
+ filename = concatenated_output_filename(builtins_files, framework_name, generate_only_wrapper_files)
output_filepath = os.path.join(output_path, filename)
- log.debug("Writing file: %s" % output_filepath)
+ log.debug("Writing file: %s" % output_filepath)
output_file = LazyFileWriter(output_filepath, force_output)
output_file.write('\n'.join(test_result_file_contents))
output_file.close()
@@ -122,7 +127,7 @@
cli_parser.add_option("--framework", type="choice", choices=allowed_framework_names, help="Destination framework for generated files.")
cli_parser.add_option("--force", action="" help="Force output of generated scripts, even if nothing changed.")
cli_parser.add_option("--combined", action="" help="Produce one .h/.cpp file instead of producing one per builtin object.")
- cli_parser.add_option("--wrappers", action="" help="Produce .h/.cpp wrapper files to ease integration of the builtins.")
+ cli_parser.add_option("--wrappers-only", action="" help="Produce .h/.cpp wrapper files to ease integration of the builtins.")
cli_parser.add_option("-v", "--debug", action="" help="Log extra output for debugging the generator itself.")
cli_parser.add_option("-t", "--test", action="" help="Enable test mode.")
@@ -147,7 +152,7 @@
'output_path': arg_options.output_directory,
'framework_name': arg_options.framework,
'combined_output': arg_options.combined,
- 'generate_wrapper_files': arg_options.wrappers,
+ 'generate_only_wrapper_files': arg_options.wrappers_only,
'force_output': arg_options.force,
'concatenate_output': arg_options.test,
}
Added: trunk/Source/_javascript_Core/Scripts/tests/builtins/WebCore-AnotherGuardedInternalBuiltin-Separate.js (0 => 203554)
--- trunk/Source/_javascript_Core/Scripts/tests/builtins/WebCore-AnotherGuardedInternalBuiltin-Separate.js (rev 0)
+++ trunk/Source/_javascript_Core/Scripts/tests/builtins/WebCore-AnotherGuardedInternalBuiltin-Separate.js 2016-07-22 08:32:12 UTC (rev 203554)
@@ -0,0 +1,34 @@
+/*
+ * Copyright (C) 2016 Apple Inc. All rights reserved.
+ *
+ * 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.
+ */
+
+// @conditional=ENABLE(FETCH_API)
+// @internal
+
+function letsFetch()
+{
+ "use strict";
+
+ return @fetchRequest(new @Request("yes"));
+}
Added: trunk/Source/_javascript_Core/Scripts/tests/builtins/expected/WebCore-AnotherGuardedInternalBuiltin-Separate.js-result (0 => 203554)
--- trunk/Source/_javascript_Core/Scripts/tests/builtins/expected/WebCore-AnotherGuardedInternalBuiltin-Separate.js-result (rev 0)
+++ trunk/Source/_javascript_Core/Scripts/tests/builtins/expected/WebCore-AnotherGuardedInternalBuiltin-Separate.js-result 2016-07-22 08:32:12 UTC (rev 203554)
@@ -0,0 +1,227 @@
+### Begin File: AnotherGuardedInternalBuiltinBuiltins.h
+/*
+ * Copyright (c) 2016 Apple Inc. All rights reserved.
+ *
+ * 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. 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 APPLE INC. OR 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.
+ *
+ */
+
+// DO NOT EDIT THIS FILE. It is automatically generated from _javascript_ files for
+// builtins by the script: Source/_javascript_Core/Scripts/generate-js-builtins.py
+
+#pragma once
+
+#if ENABLE(FETCH_API)
+
+#include <builtins/BuiltinUtils.h>
+#include <bytecode/UnlinkedFunctionExecutable.h>
+#include <runtime/Identifier.h>
+#include <runtime/JSFunction.h>
+
+namespace JSC {
+class FunctionExecutable;
+}
+
+namespace WebCore {
+
+/* AnotherGuardedInternalBuiltin */
+extern const char* s_anotherGuardedInternalBuiltinLetsFetchCode;
+extern const int s_anotherGuardedInternalBuiltinLetsFetchCodeLength;
+extern const JSC::ConstructAbility s_anotherGuardedInternalBuiltinLetsFetchCodeConstructAbility;
+
+#define WEBCORE_FOREACH_ANOTHERGUARDEDINTERNALBUILTIN_BUILTIN_DATA(macro) \
+ macro(letsFetch, anotherGuardedInternalBuiltinLetsFetch, 0) \
+
+#define WEBCORE_BUILTIN_ANOTHERGUARDEDINTERNALBUILTIN_LETSFETCH 1
+
+#define WEBCORE_FOREACH_ANOTHERGUARDEDINTERNALBUILTIN_BUILTIN_CODE(macro) \
+ macro(anotherGuardedInternalBuiltinLetsFetchCode, letsFetch, s_anotherGuardedInternalBuiltinLetsFetchCodeLength) \
+
+#define WEBCORE_FOREACH_ANOTHERGUARDEDINTERNALBUILTIN_BUILTIN_FUNCTION_NAME(macro) \
+ macro(letsFetch) \
+
+#define DECLARE_BUILTIN_GENERATOR(codeName, functionName, argumentCount) \
+ JSC::FunctionExecutable* codeName##Generator(JSC::VM&);
+
+WEBCORE_FOREACH_ANOTHERGUARDEDINTERNALBUILTIN_BUILTIN_CODE(DECLARE_BUILTIN_GENERATOR)
+#undef DECLARE_BUILTIN_GENERATOR
+
+class AnotherGuardedInternalBuiltinBuiltinsWrapper : private JSC::WeakHandleOwner {
+public:
+ explicit AnotherGuardedInternalBuiltinBuiltinsWrapper(JSC::VM* vm)
+ : m_vm(*vm)
+ WEBCORE_FOREACH_ANOTHERGUARDEDINTERNALBUILTIN_BUILTIN_FUNCTION_NAME(INITIALIZE_BUILTIN_NAMES)
+#define INITIALIZE_BUILTIN_SOURCE_MEMBERS(name, functionName, length) , m_##name##Source(JSC::makeSource(StringImpl::createFromLiteral(s_##name, length)))
+ WEBCORE_FOREACH_ANOTHERGUARDEDINTERNALBUILTIN_BUILTIN_CODE(INITIALIZE_BUILTIN_SOURCE_MEMBERS)
+#undef INITIALIZE_BUILTIN_SOURCE_MEMBERS
+ {
+ }
+
+#define EXPOSE_BUILTIN_EXECUTABLES(name, functionName, length) \
+ JSC::UnlinkedFunctionExecutable* name##Executable(); \
+ const JSC::SourceCode& name##Source() const { return m_##name##Source; }
+ WEBCORE_FOREACH_ANOTHERGUARDEDINTERNALBUILTIN_BUILTIN_CODE(EXPOSE_BUILTIN_EXECUTABLES)
+#undef EXPOSE_BUILTIN_EXECUTABLES
+
+ WEBCORE_FOREACH_ANOTHERGUARDEDINTERNALBUILTIN_BUILTIN_FUNCTION_NAME(DECLARE_BUILTIN_IDENTIFIER_ACCESSOR)
+
+ void exportNames();
+
+private:
+ JSC::VM& m_vm;
+
+ WEBCORE_FOREACH_ANOTHERGUARDEDINTERNALBUILTIN_BUILTIN_FUNCTION_NAME(DECLARE_BUILTIN_NAMES)
+
+#define DECLARE_BUILTIN_SOURCE_MEMBERS(name, functionName, length) \
+ JSC::SourceCode m_##name##Source;\
+ JSC::Weak<JSC::UnlinkedFunctionExecutable> m_##name##Executable;
+ WEBCORE_FOREACH_ANOTHERGUARDEDINTERNALBUILTIN_BUILTIN_CODE(DECLARE_BUILTIN_SOURCE_MEMBERS)
+#undef DECLARE_BUILTIN_SOURCE_MEMBERS
+
+};
+
+#define DEFINE_BUILTIN_EXECUTABLES(name, functionName, length) \
+inline JSC::UnlinkedFunctionExecutable* AnotherGuardedInternalBuiltinBuiltinsWrapper::name##Executable() \
+{\
+ if (!m_##name##Executable)\
+ m_##name##Executable = JSC::Weak<JSC::UnlinkedFunctionExecutable>(JSC::createBuiltinExecutable(m_vm, m_##name##Source, functionName##PublicName(), s_##name##ConstructAbility), this, &m_##name##Executable);\
+ return m_##name##Executable.get();\
+}
+WEBCORE_FOREACH_ANOTHERGUARDEDINTERNALBUILTIN_BUILTIN_CODE(DEFINE_BUILTIN_EXECUTABLES)
+#undef DEFINE_BUILTIN_EXECUTABLES
+
+inline void AnotherGuardedInternalBuiltinBuiltinsWrapper::exportNames()
+{
+#define EXPORT_FUNCTION_NAME(name) m_vm.propertyNames->appendExternalName(name##PublicName(), name##PrivateName());
+ WEBCORE_FOREACH_ANOTHERGUARDEDINTERNALBUILTIN_BUILTIN_FUNCTION_NAME(EXPORT_FUNCTION_NAME)
+#undef EXPORT_FUNCTION_NAME
+}
+
+class AnotherGuardedInternalBuiltinBuiltinFunctions {
+public:
+ explicit AnotherGuardedInternalBuiltinBuiltinFunctions(JSC::VM& vm) : m_vm(vm) { }
+
+ void init(JSC::JSGlobalObject&);
+ void visit(JSC::SlotVisitor&);
+
+public:
+ JSC::VM& m_vm;
+
+#define DECLARE_BUILTIN_SOURCE_MEMBERS(functionName) \
+ JSC::WriteBarrier<JSC::JSFunction> m_##functionName##Function;
+ WEBCORE_FOREACH_ANOTHERGUARDEDINTERNALBUILTIN_BUILTIN_FUNCTION_NAME(DECLARE_BUILTIN_SOURCE_MEMBERS)
+#undef DECLARE_BUILTIN_SOURCE_MEMBERS
+};
+
+inline void AnotherGuardedInternalBuiltinBuiltinFunctions::init(JSC::JSGlobalObject& globalObject)
+{
+#define EXPORT_FUNCTION(codeName, functionName, length)\
+ m_##functionName##Function.set(m_vm, &globalObject, JSC::JSFunction::createBuiltinFunction(m_vm, codeName##Generator(m_vm), &globalObject));
+ WEBCORE_FOREACH_ANOTHERGUARDEDINTERNALBUILTIN_BUILTIN_CODE(EXPORT_FUNCTION)
+#undef EXPORT_FUNCTION
+}
+
+inline void AnotherGuardedInternalBuiltinBuiltinFunctions::visit(JSC::SlotVisitor& visitor)
+{
+#define VISIT_FUNCTION(name) visitor.append(&m_##name##Function);
+ WEBCORE_FOREACH_ANOTHERGUARDEDINTERNALBUILTIN_BUILTIN_FUNCTION_NAME(VISIT_FUNCTION)
+#undef VISIT_FUNCTION
+}
+
+
+} // namespace WebCore
+
+#endif // ENABLE(FETCH_API)
+### End File: AnotherGuardedInternalBuiltinBuiltins.h
+
+### Begin File: AnotherGuardedInternalBuiltinBuiltins.cpp
+/*
+ * Copyright (c) 2016 Apple Inc. All rights reserved.
+ *
+ * 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. 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 APPLE INC. OR 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.
+ *
+ */
+
+// DO NOT EDIT THIS FILE. It is automatically generated from _javascript_ files for
+// builtins by the script: Source/_javascript_Core/Scripts/generate-js-builtins.py
+
+#include "config.h"
+#include "AnotherGuardedInternalBuiltinBuiltins.h"
+
+#if ENABLE(FETCH_API)
+
+#include "WebCoreJSClientData.h"
+#include <runtime/Executable.h>
+#include <runtime/Intrinsic.h>
+#include <runtime/JSCJSValueInlines.h>
+#include <runtime/JSCellInlines.h>
+#include <runtime/StructureInlines.h>
+#include <runtime/VM.h>
+
+namespace WebCore {
+
+const JSC::ConstructAbility s_anotherGuardedInternalBuiltinLetsFetchCodeConstructAbility = JSC::ConstructAbility::CannotConstruct;
+const int s_anotherGuardedInternalBuiltinLetsFetchCodeLength = 82;
+static const JSC::Intrinsic s_anotherGuardedInternalBuiltinLetsFetchCodeIntrinsic = JSC::NoIntrinsic;
+const char* s_anotherGuardedInternalBuiltinLetsFetchCode =
+ "(function ()\n" \
+ "{\n" \
+ " \"use strict\";\n" \
+ " return @fetchRequest(new @Request(\"yes\"));\n" \
+ "})\n" \
+;
+
+
+#define DEFINE_BUILTIN_GENERATOR(codeName, functionName, argumentCount) \
+JSC::FunctionExecutable* codeName##Generator(JSC::VM& vm) \
+{\
+ JSVMClientData* clientData = static_cast<JSVMClientData*>(vm.clientData); \
+ return clientData->builtinFunctions().anotherGuardedInternalBuiltinBuiltins().codeName##Executable()->link(vm, clientData->builtinFunctions().anotherGuardedInternalBuiltinBuiltins().codeName##Source(), Nullopt, s_##codeName##Intrinsic); \
+}
+WEBCORE_FOREACH_ANOTHERGUARDEDINTERNALBUILTIN_BUILTIN_CODE(DEFINE_BUILTIN_GENERATOR)
+#undef DEFINE_BUILTIN_GENERATOR
+
+
+} // namespace WebCore
+
+#endif // ENABLE(FETCH_API)
+
+### End File: AnotherGuardedInternalBuiltinBuiltins.cpp
Modified: trunk/Source/_javascript_Core/Scripts/tests/builtins/expected/WebCore-ArbitraryConditionalGuard-Separate.js-result (203553 => 203554)
--- trunk/Source/_javascript_Core/Scripts/tests/builtins/expected/WebCore-ArbitraryConditionalGuard-Separate.js-result 2016-07-22 05:33:01 UTC (rev 203553)
+++ trunk/Source/_javascript_Core/Scripts/tests/builtins/expected/WebCore-ArbitraryConditionalGuard-Separate.js-result 2016-07-22 08:32:12 UTC (rev 203554)
@@ -195,220 +195,3 @@
#endif // ENABLE(STREAMS_API) || USE(CF)
### End File: ArbitraryConditionalGuardBuiltins.cpp
-
-### Begin File: WebCoreJSBuiltins.h
-/*
- * Copyright (c) 2015 Canon Inc. All rights reserved.
- * Copyright (c) 2016 Apple Inc. All rights reserved.
- *
- * 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. 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 APPLE INC. OR 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.
- *
- */
-
-// DO NOT EDIT THIS FILE. It is automatically generated from _javascript_ files for
-// builtins by the script: Source/_javascript_Core/Scripts/generate-js-builtins.py
-
-#pragma once
-
-#include "ArbitraryConditionalGuardBuiltins.h"
-#include <runtime/VM.h>
-
-namespace WebCore {
-
-class JSBuiltinFunctions {
-public:
- explicit JSBuiltinFunctions(JSC::VM& vm)
- : m_vm(vm)
-#if ENABLE(STREAMS_API) || USE(CF)
- , m_arbitraryConditionalGuardBuiltins(&m_vm)
-#endif // ENABLE(STREAMS_API) || USE(CF)
- {
- }
-
-#if ENABLE(STREAMS_API) || USE(CF)
- ArbitraryConditionalGuardBuiltinsWrapper& arbitraryConditionalGuardBuiltins() { return m_arbitraryConditionalGuardBuiltins; }
-#endif // ENABLE(STREAMS_API) || USE(CF)
-
-private:
- JSC::VM& m_vm;
-#if ENABLE(STREAMS_API) || USE(CF)
- ArbitraryConditionalGuardBuiltinsWrapper m_arbitraryConditionalGuardBuiltins;
-#endif // ENABLE(STREAMS_API) || USE(CF)
-};
-
-} // namespace WebCore
-### End File: WebCoreJSBuiltins.h
-
-### Begin File: WebCoreJSBuiltins.cpp
-/*
- * Copyright (c) 2015 Canon Inc. All rights reserved.
- * Copyright (c) 2016 Apple Inc. All rights reserved.
- *
- * 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. 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 APPLE INC. OR 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.
- *
- */
-
-// DO NOT EDIT THIS FILE. It is automatically generated from _javascript_ files for
-// builtins by the script: Source/_javascript_Core/Scripts/generate-js-builtins.py
-
-#include "ArbitraryConditionalGuardBuiltins.cpp"
-### End File: WebCoreJSBuiltins.cpp
-
-### Begin File: WebCoreJSBuiltinInternals.h
-/*
- * Copyright (c) 2015 Canon Inc. All rights reserved.
- * Copyright (c) 2016 Apple Inc. All rights reserved.
- *
- * 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. 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 APPLE INC. OR 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.
- *
- */
-
-// DO NOT EDIT THIS FILE. It is automatically generated from _javascript_ files for
-// builtins by the script: Source/_javascript_Core/Scripts/generate-js-builtins.py
-
-#pragma once
-
-#include <runtime/VM.h>
-
-namespace WebCore {
-
-class JSDOMGlobalObject;
-
-class JSBuiltinInternalFunctions {
-public:
- explicit JSBuiltinInternalFunctions(JSC::VM&);
-
- void visit(JSC::SlotVisitor&);
- void initialize(JSDOMGlobalObject&);
-
-
-private:
- JSC::VM& m_vm;
-};
-
-} // namespace WebCore
-### End File: WebCoreJSBuiltinInternals.h
-
-### Begin File: WebCoreJSBuiltinInternals.cpp
-/*
- * Copyright (c) 2015 Canon Inc. All rights reserved.
- * Copyright (c) 2016 Apple Inc. All rights reserved.
- *
- * 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. 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 APPLE INC. OR 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.
- *
- */
-
-// DO NOT EDIT THIS FILE. It is automatically generated from _javascript_ files for
-// builtins by the script: Source/_javascript_Core/Scripts/generate-js-builtins.py
-
-#include "config.h"
-#include "WebCoreJSBuiltinInternals.h"
-
-#include "JSDOMGlobalObject.h"
-#include "WebCoreJSClientData.h"
-#include <heap/SlotVisitorInlines.h>
-#include <runtime/JSCJSValueInlines.h>
-#include <runtime/StructureInlines.h>
-
-namespace WebCore {
-
-JSBuiltinInternalFunctions::JSBuiltinInternalFunctions(JSC::VM& vm)
- : m_vm(vm)
-{
- UNUSED_PARAM(vm);
-}
-
-void JSBuiltinInternalFunctions::visit(JSC::SlotVisitor& visitor)
-{
- UNUSED_PARAM(visitor);
-}
-
-void JSBuiltinInternalFunctions::initialize(JSDOMGlobalObject& globalObject)
-{
- UNUSED_PARAM(globalObject);
-
- JSVMClientData& clientData = *static_cast<JSVMClientData*>(m_vm.clientData);
- JSDOMGlobalObject::GlobalPropertyInfo staticGlobals[] = {
- };
- globalObject.addStaticGlobals(staticGlobals, WTF_ARRAY_LENGTH(staticGlobals));
- UNUSED_PARAM(clientData);
-}
-
-} // namespace WebCore
-### End File: WebCoreJSBuiltinInternals.cpp
Modified: trunk/Source/_javascript_Core/Scripts/tests/builtins/expected/WebCore-GuardedBuiltin-Separate.js-result (203553 => 203554)
--- trunk/Source/_javascript_Core/Scripts/tests/builtins/expected/WebCore-GuardedBuiltin-Separate.js-result 2016-07-22 05:33:01 UTC (rev 203553)
+++ trunk/Source/_javascript_Core/Scripts/tests/builtins/expected/WebCore-GuardedBuiltin-Separate.js-result 2016-07-22 08:32:12 UTC (rev 203554)
@@ -195,220 +195,3 @@
#endif // ENABLE(STREAMS_API)
### End File: GuardedBuiltinBuiltins.cpp
-
-### Begin File: WebCoreJSBuiltins.h
-/*
- * Copyright (c) 2015 Canon Inc. All rights reserved.
- * Copyright (c) 2016 Apple Inc. All rights reserved.
- *
- * 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. 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 APPLE INC. OR 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.
- *
- */
-
-// DO NOT EDIT THIS FILE. It is automatically generated from _javascript_ files for
-// builtins by the script: Source/_javascript_Core/Scripts/generate-js-builtins.py
-
-#pragma once
-
-#include "GuardedBuiltinBuiltins.h"
-#include <runtime/VM.h>
-
-namespace WebCore {
-
-class JSBuiltinFunctions {
-public:
- explicit JSBuiltinFunctions(JSC::VM& vm)
- : m_vm(vm)
-#if ENABLE(STREAMS_API)
- , m_guardedBuiltinBuiltins(&m_vm)
-#endif // ENABLE(STREAMS_API)
- {
- }
-
-#if ENABLE(STREAMS_API)
- GuardedBuiltinBuiltinsWrapper& guardedBuiltinBuiltins() { return m_guardedBuiltinBuiltins; }
-#endif // ENABLE(STREAMS_API)
-
-private:
- JSC::VM& m_vm;
-#if ENABLE(STREAMS_API)
- GuardedBuiltinBuiltinsWrapper m_guardedBuiltinBuiltins;
-#endif // ENABLE(STREAMS_API)
-};
-
-} // namespace WebCore
-### End File: WebCoreJSBuiltins.h
-
-### Begin File: WebCoreJSBuiltins.cpp
-/*
- * Copyright (c) 2015 Canon Inc. All rights reserved.
- * Copyright (c) 2016 Apple Inc. All rights reserved.
- *
- * 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. 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 APPLE INC. OR 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.
- *
- */
-
-// DO NOT EDIT THIS FILE. It is automatically generated from _javascript_ files for
-// builtins by the script: Source/_javascript_Core/Scripts/generate-js-builtins.py
-
-#include "GuardedBuiltinBuiltins.cpp"
-### End File: WebCoreJSBuiltins.cpp
-
-### Begin File: WebCoreJSBuiltinInternals.h
-/*
- * Copyright (c) 2015 Canon Inc. All rights reserved.
- * Copyright (c) 2016 Apple Inc. All rights reserved.
- *
- * 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. 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 APPLE INC. OR 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.
- *
- */
-
-// DO NOT EDIT THIS FILE. It is automatically generated from _javascript_ files for
-// builtins by the script: Source/_javascript_Core/Scripts/generate-js-builtins.py
-
-#pragma once
-
-#include <runtime/VM.h>
-
-namespace WebCore {
-
-class JSDOMGlobalObject;
-
-class JSBuiltinInternalFunctions {
-public:
- explicit JSBuiltinInternalFunctions(JSC::VM&);
-
- void visit(JSC::SlotVisitor&);
- void initialize(JSDOMGlobalObject&);
-
-
-private:
- JSC::VM& m_vm;
-};
-
-} // namespace WebCore
-### End File: WebCoreJSBuiltinInternals.h
-
-### Begin File: WebCoreJSBuiltinInternals.cpp
-/*
- * Copyright (c) 2015 Canon Inc. All rights reserved.
- * Copyright (c) 2016 Apple Inc. All rights reserved.
- *
- * 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. 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 APPLE INC. OR 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.
- *
- */
-
-// DO NOT EDIT THIS FILE. It is automatically generated from _javascript_ files for
-// builtins by the script: Source/_javascript_Core/Scripts/generate-js-builtins.py
-
-#include "config.h"
-#include "WebCoreJSBuiltinInternals.h"
-
-#include "JSDOMGlobalObject.h"
-#include "WebCoreJSClientData.h"
-#include <heap/SlotVisitorInlines.h>
-#include <runtime/JSCJSValueInlines.h>
-#include <runtime/StructureInlines.h>
-
-namespace WebCore {
-
-JSBuiltinInternalFunctions::JSBuiltinInternalFunctions(JSC::VM& vm)
- : m_vm(vm)
-{
- UNUSED_PARAM(vm);
-}
-
-void JSBuiltinInternalFunctions::visit(JSC::SlotVisitor& visitor)
-{
- UNUSED_PARAM(visitor);
-}
-
-void JSBuiltinInternalFunctions::initialize(JSDOMGlobalObject& globalObject)
-{
- UNUSED_PARAM(globalObject);
-
- JSVMClientData& clientData = *static_cast<JSVMClientData*>(m_vm.clientData);
- JSDOMGlobalObject::GlobalPropertyInfo staticGlobals[] = {
- };
- globalObject.addStaticGlobals(staticGlobals, WTF_ARRAY_LENGTH(staticGlobals));
- UNUSED_PARAM(clientData);
-}
-
-} // namespace WebCore
-### End File: WebCoreJSBuiltinInternals.cpp
Modified: trunk/Source/_javascript_Core/Scripts/tests/builtins/expected/WebCore-GuardedInternalBuiltin-Separate.js-result (203553 => 203554)
--- trunk/Source/_javascript_Core/Scripts/tests/builtins/expected/WebCore-GuardedInternalBuiltin-Separate.js-result 2016-07-22 05:33:01 UTC (rev 203553)
+++ trunk/Source/_javascript_Core/Scripts/tests/builtins/expected/WebCore-GuardedInternalBuiltin-Separate.js-result 2016-07-22 08:32:12 UTC (rev 203554)
@@ -227,252 +227,3 @@
#endif // ENABLE(STREAMS_API)
### End File: GuardedInternalBuiltinBuiltins.cpp
-
-### Begin File: WebCoreJSBuiltins.h
-/*
- * Copyright (c) 2015 Canon Inc. All rights reserved.
- * Copyright (c) 2016 Apple Inc. All rights reserved.
- *
- * 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. 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 APPLE INC. OR 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.
- *
- */
-
-// DO NOT EDIT THIS FILE. It is automatically generated from _javascript_ files for
-// builtins by the script: Source/_javascript_Core/Scripts/generate-js-builtins.py
-
-#pragma once
-
-#include "GuardedInternalBuiltinBuiltins.h"
-#include <runtime/VM.h>
-
-namespace WebCore {
-
-class JSBuiltinFunctions {
-public:
- explicit JSBuiltinFunctions(JSC::VM& vm)
- : m_vm(vm)
-#if ENABLE(STREAMS_API)
- , m_guardedInternalBuiltinBuiltins(&m_vm)
-#endif // ENABLE(STREAMS_API)
- {
-#if ENABLE(STREAMS_API)
- m_guardedInternalBuiltinBuiltins.exportNames();
-#endif // ENABLE(STREAMS_API)
- }
-
-#if ENABLE(STREAMS_API)
- GuardedInternalBuiltinBuiltinsWrapper& guardedInternalBuiltinBuiltins() { return m_guardedInternalBuiltinBuiltins; }
-#endif // ENABLE(STREAMS_API)
-
-private:
- JSC::VM& m_vm;
-#if ENABLE(STREAMS_API)
- GuardedInternalBuiltinBuiltinsWrapper m_guardedInternalBuiltinBuiltins;
-#endif // ENABLE(STREAMS_API)
-};
-
-} // namespace WebCore
-### End File: WebCoreJSBuiltins.h
-
-### Begin File: WebCoreJSBuiltins.cpp
-/*
- * Copyright (c) 2015 Canon Inc. All rights reserved.
- * Copyright (c) 2016 Apple Inc. All rights reserved.
- *
- * 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. 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 APPLE INC. OR 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.
- *
- */
-
-// DO NOT EDIT THIS FILE. It is automatically generated from _javascript_ files for
-// builtins by the script: Source/_javascript_Core/Scripts/generate-js-builtins.py
-
-#include "GuardedInternalBuiltinBuiltins.cpp"
-### End File: WebCoreJSBuiltins.cpp
-
-### Begin File: WebCoreJSBuiltinInternals.h
-/*
- * Copyright (c) 2015 Canon Inc. All rights reserved.
- * Copyright (c) 2016 Apple Inc. All rights reserved.
- *
- * 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. 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 APPLE INC. OR 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.
- *
- */
-
-// DO NOT EDIT THIS FILE. It is automatically generated from _javascript_ files for
-// builtins by the script: Source/_javascript_Core/Scripts/generate-js-builtins.py
-
-#pragma once
-
-#include "GuardedInternalBuiltinBuiltins.h"
-#include <runtime/VM.h>
-
-namespace WebCore {
-
-class JSDOMGlobalObject;
-
-class JSBuiltinInternalFunctions {
-public:
- explicit JSBuiltinInternalFunctions(JSC::VM&);
-
- void visit(JSC::SlotVisitor&);
- void initialize(JSDOMGlobalObject&);
-
-#if ENABLE(STREAMS_API)
- GuardedInternalBuiltinBuiltinFunctions& guardedInternalBuiltin() { return m_guardedInternalBuiltin; }
-#endif // ENABLE(STREAMS_API)
-
-private:
-#if ENABLE(STREAMS_API)
- JSC::VM& m_vm;
-#endif // ENABLE(STREAMS_API)
-#if ENABLE(STREAMS_API)
- GuardedInternalBuiltinBuiltinFunctions m_guardedInternalBuiltin;
-#endif // ENABLE(STREAMS_API)
-};
-
-} // namespace WebCore
-### End File: WebCoreJSBuiltinInternals.h
-
-### Begin File: WebCoreJSBuiltinInternals.cpp
-/*
- * Copyright (c) 2015 Canon Inc. All rights reserved.
- * Copyright (c) 2016 Apple Inc. All rights reserved.
- *
- * 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. 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 APPLE INC. OR 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.
- *
- */
-
-// DO NOT EDIT THIS FILE. It is automatically generated from _javascript_ files for
-// builtins by the script: Source/_javascript_Core/Scripts/generate-js-builtins.py
-
-#include "config.h"
-#include "WebCoreJSBuiltinInternals.h"
-
-#include "JSDOMGlobalObject.h"
-#include "WebCoreJSClientData.h"
-#include <heap/SlotVisitorInlines.h>
-#include <runtime/JSCJSValueInlines.h>
-#include <runtime/StructureInlines.h>
-
-namespace WebCore {
-
-JSBuiltinInternalFunctions::JSBuiltinInternalFunctions(JSC::VM& vm)
-#if ENABLE(STREAMS_API)
- : m_vm(vm)
-#endif // ENABLE(STREAMS_API)
-#if ENABLE(STREAMS_API)
- , m_guardedInternalBuiltin(m_vm)
-#endif // ENABLE(STREAMS_API)
-{
- UNUSED_PARAM(vm);
-}
-
-void JSBuiltinInternalFunctions::visit(JSC::SlotVisitor& visitor)
-{
-#if ENABLE(STREAMS_API)
- m_guardedInternalBuiltin.visit(visitor);
-#endif // ENABLE(STREAMS_API)
- UNUSED_PARAM(visitor);
-}
-
-void JSBuiltinInternalFunctions::initialize(JSDOMGlobalObject& globalObject)
-{
- UNUSED_PARAM(globalObject);
-#if ENABLE(STREAMS_API)
- m_guardedInternalBuiltin.init(globalObject);
-#endif // ENABLE(STREAMS_API)
-
-#if ENABLE(STREAMS_API)
- JSVMClientData& clientData = *static_cast<JSVMClientData*>(m_vm.clientData);
- JSDOMGlobalObject::GlobalPropertyInfo staticGlobals[] = {
-#if ENABLE(STREAMS_API)
-#define DECLARE_GLOBAL_STATIC(name) \
- JSDOMGlobalObject::GlobalPropertyInfo( \
- clientData.builtinFunctions().guardedInternalBuiltinBuiltins().name##PrivateName(), guardedInternalBuiltin().m_##name##Function.get() , JSC::DontDelete | JSC::ReadOnly),
- WEBCORE_FOREACH_GUARDEDINTERNALBUILTIN_BUILTIN_FUNCTION_NAME(DECLARE_GLOBAL_STATIC)
-#undef DECLARE_GLOBAL_STATIC
-#endif // ENABLE(STREAMS_API)
- };
- globalObject.addStaticGlobals(staticGlobals, WTF_ARRAY_LENGTH(staticGlobals));
- UNUSED_PARAM(clientData);
-#endif // ENABLE(STREAMS_API)
-}
-
-} // namespace WebCore
-### End File: WebCoreJSBuiltinInternals.cpp
Modified: trunk/Source/_javascript_Core/Scripts/tests/builtins/expected/WebCore-UnguardedBuiltin-Separate.js-result (203553 => 203554)
--- trunk/Source/_javascript_Core/Scripts/tests/builtins/expected/WebCore-UnguardedBuiltin-Separate.js-result 2016-07-22 05:33:01 UTC (rev 203553)
+++ trunk/Source/_javascript_Core/Scripts/tests/builtins/expected/WebCore-UnguardedBuiltin-Separate.js-result 2016-07-22 08:32:12 UTC (rev 203554)
@@ -186,214 +186,3 @@
} // namespace WebCore
### End File: UnguardedBuiltinBuiltins.cpp
-
-### Begin File: WebCoreJSBuiltins.h
-/*
- * Copyright (c) 2015 Canon Inc. All rights reserved.
- * Copyright (c) 2016 Apple Inc. All rights reserved.
- *
- * 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. 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 APPLE INC. OR 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.
- *
- */
-
-// DO NOT EDIT THIS FILE. It is automatically generated from _javascript_ files for
-// builtins by the script: Source/_javascript_Core/Scripts/generate-js-builtins.py
-
-#pragma once
-
-#include "UnguardedBuiltinBuiltins.h"
-#include <runtime/VM.h>
-
-namespace WebCore {
-
-class JSBuiltinFunctions {
-public:
- explicit JSBuiltinFunctions(JSC::VM& vm)
- : m_vm(vm)
- , m_unguardedBuiltinBuiltins(&m_vm)
- {
- }
-
- UnguardedBuiltinBuiltinsWrapper& unguardedBuiltinBuiltins() { return m_unguardedBuiltinBuiltins; }
-
-private:
- JSC::VM& m_vm;
- UnguardedBuiltinBuiltinsWrapper m_unguardedBuiltinBuiltins;
-};
-
-} // namespace WebCore
-### End File: WebCoreJSBuiltins.h
-
-### Begin File: WebCoreJSBuiltins.cpp
-/*
- * Copyright (c) 2015 Canon Inc. All rights reserved.
- * Copyright (c) 2016 Apple Inc. All rights reserved.
- *
- * 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. 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 APPLE INC. OR 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.
- *
- */
-
-// DO NOT EDIT THIS FILE. It is automatically generated from _javascript_ files for
-// builtins by the script: Source/_javascript_Core/Scripts/generate-js-builtins.py
-
-#include "UnguardedBuiltinBuiltins.cpp"
-### End File: WebCoreJSBuiltins.cpp
-
-### Begin File: WebCoreJSBuiltinInternals.h
-/*
- * Copyright (c) 2015 Canon Inc. All rights reserved.
- * Copyright (c) 2016 Apple Inc. All rights reserved.
- *
- * 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. 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 APPLE INC. OR 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.
- *
- */
-
-// DO NOT EDIT THIS FILE. It is automatically generated from _javascript_ files for
-// builtins by the script: Source/_javascript_Core/Scripts/generate-js-builtins.py
-
-#pragma once
-
-#include <runtime/VM.h>
-
-namespace WebCore {
-
-class JSDOMGlobalObject;
-
-class JSBuiltinInternalFunctions {
-public:
- explicit JSBuiltinInternalFunctions(JSC::VM&);
-
- void visit(JSC::SlotVisitor&);
- void initialize(JSDOMGlobalObject&);
-
-
-private:
- JSC::VM& m_vm;
-};
-
-} // namespace WebCore
-### End File: WebCoreJSBuiltinInternals.h
-
-### Begin File: WebCoreJSBuiltinInternals.cpp
-/*
- * Copyright (c) 2015 Canon Inc. All rights reserved.
- * Copyright (c) 2016 Apple Inc. All rights reserved.
- *
- * 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. 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 APPLE INC. OR 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.
- *
- */
-
-// DO NOT EDIT THIS FILE. It is automatically generated from _javascript_ files for
-// builtins by the script: Source/_javascript_Core/Scripts/generate-js-builtins.py
-
-#include "config.h"
-#include "WebCoreJSBuiltinInternals.h"
-
-#include "JSDOMGlobalObject.h"
-#include "WebCoreJSClientData.h"
-#include <heap/SlotVisitorInlines.h>
-#include <runtime/JSCJSValueInlines.h>
-#include <runtime/StructureInlines.h>
-
-namespace WebCore {
-
-JSBuiltinInternalFunctions::JSBuiltinInternalFunctions(JSC::VM& vm)
- : m_vm(vm)
-{
- UNUSED_PARAM(vm);
-}
-
-void JSBuiltinInternalFunctions::visit(JSC::SlotVisitor& visitor)
-{
- UNUSED_PARAM(visitor);
-}
-
-void JSBuiltinInternalFunctions::initialize(JSDOMGlobalObject& globalObject)
-{
- UNUSED_PARAM(globalObject);
-
- JSVMClientData& clientData = *static_cast<JSVMClientData*>(m_vm.clientData);
- JSDOMGlobalObject::GlobalPropertyInfo staticGlobals[] = {
- };
- globalObject.addStaticGlobals(staticGlobals, WTF_ARRAY_LENGTH(staticGlobals));
- UNUSED_PARAM(clientData);
-}
-
-} // namespace WebCore
-### End File: WebCoreJSBuiltinInternals.cpp
Modified: trunk/Source/_javascript_Core/Scripts/tests/builtins/expected/WebCore-xmlCasingTest-Separate.js-result (203553 => 203554)
--- trunk/Source/_javascript_Core/Scripts/tests/builtins/expected/WebCore-xmlCasingTest-Separate.js-result 2016-07-22 05:33:01 UTC (rev 203553)
+++ trunk/Source/_javascript_Core/Scripts/tests/builtins/expected/WebCore-xmlCasingTest-Separate.js-result 2016-07-22 08:32:12 UTC (rev 203554)
@@ -278,252 +278,3 @@
#endif // ENABLE(STREAMS_API)
### End File: xmlCasingTestBuiltins.cpp
-
-### Begin File: WebCoreJSBuiltins.h
-/*
- * Copyright (c) 2015 Canon Inc. All rights reserved.
- * Copyright (c) 2016 Apple Inc. All rights reserved.
- *
- * 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. 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 APPLE INC. OR 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.
- *
- */
-
-// DO NOT EDIT THIS FILE. It is automatically generated from _javascript_ files for
-// builtins by the script: Source/_javascript_Core/Scripts/generate-js-builtins.py
-
-#pragma once
-
-#include "xmlCasingTestBuiltins.h"
-#include <runtime/VM.h>
-
-namespace WebCore {
-
-class JSBuiltinFunctions {
-public:
- explicit JSBuiltinFunctions(JSC::VM& vm)
- : m_vm(vm)
-#if ENABLE(STREAMS_API)
- , m_xmlCasingTestBuiltins(&m_vm)
-#endif // ENABLE(STREAMS_API)
- {
-#if ENABLE(STREAMS_API)
- m_xmlCasingTestBuiltins.exportNames();
-#endif // ENABLE(STREAMS_API)
- }
-
-#if ENABLE(STREAMS_API)
- XMLCasingTestBuiltinsWrapper& xmlCasingTestBuiltins() { return m_xmlCasingTestBuiltins; }
-#endif // ENABLE(STREAMS_API)
-
-private:
- JSC::VM& m_vm;
-#if ENABLE(STREAMS_API)
- XMLCasingTestBuiltinsWrapper m_xmlCasingTestBuiltins;
-#endif // ENABLE(STREAMS_API)
-};
-
-} // namespace WebCore
-### End File: WebCoreJSBuiltins.h
-
-### Begin File: WebCoreJSBuiltins.cpp
-/*
- * Copyright (c) 2015 Canon Inc. All rights reserved.
- * Copyright (c) 2016 Apple Inc. All rights reserved.
- *
- * 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. 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 APPLE INC. OR 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.
- *
- */
-
-// DO NOT EDIT THIS FILE. It is automatically generated from _javascript_ files for
-// builtins by the script: Source/_javascript_Core/Scripts/generate-js-builtins.py
-
-#include "xmlCasingTestBuiltins.cpp"
-### End File: WebCoreJSBuiltins.cpp
-
-### Begin File: WebCoreJSBuiltinInternals.h
-/*
- * Copyright (c) 2015 Canon Inc. All rights reserved.
- * Copyright (c) 2016 Apple Inc. All rights reserved.
- *
- * 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. 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 APPLE INC. OR 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.
- *
- */
-
-// DO NOT EDIT THIS FILE. It is automatically generated from _javascript_ files for
-// builtins by the script: Source/_javascript_Core/Scripts/generate-js-builtins.py
-
-#pragma once
-
-#include "xmlCasingTestBuiltins.h"
-#include <runtime/VM.h>
-
-namespace WebCore {
-
-class JSDOMGlobalObject;
-
-class JSBuiltinInternalFunctions {
-public:
- explicit JSBuiltinInternalFunctions(JSC::VM&);
-
- void visit(JSC::SlotVisitor&);
- void initialize(JSDOMGlobalObject&);
-
-#if ENABLE(STREAMS_API)
- XMLCasingTestBuiltinFunctions& xmlCasingTest() { return m_xmlCasingTest; }
-#endif // ENABLE(STREAMS_API)
-
-private:
-#if ENABLE(STREAMS_API)
- JSC::VM& m_vm;
-#endif // ENABLE(STREAMS_API)
-#if ENABLE(STREAMS_API)
- XMLCasingTestBuiltinFunctions m_xmlCasingTest;
-#endif // ENABLE(STREAMS_API)
-};
-
-} // namespace WebCore
-### End File: WebCoreJSBuiltinInternals.h
-
-### Begin File: WebCoreJSBuiltinInternals.cpp
-/*
- * Copyright (c) 2015 Canon Inc. All rights reserved.
- * Copyright (c) 2016 Apple Inc. All rights reserved.
- *
- * 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. 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 APPLE INC. OR 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.
- *
- */
-
-// DO NOT EDIT THIS FILE. It is automatically generated from _javascript_ files for
-// builtins by the script: Source/_javascript_Core/Scripts/generate-js-builtins.py
-
-#include "config.h"
-#include "WebCoreJSBuiltinInternals.h"
-
-#include "JSDOMGlobalObject.h"
-#include "WebCoreJSClientData.h"
-#include <heap/SlotVisitorInlines.h>
-#include <runtime/JSCJSValueInlines.h>
-#include <runtime/StructureInlines.h>
-
-namespace WebCore {
-
-JSBuiltinInternalFunctions::JSBuiltinInternalFunctions(JSC::VM& vm)
-#if ENABLE(STREAMS_API)
- : m_vm(vm)
-#endif // ENABLE(STREAMS_API)
-#if ENABLE(STREAMS_API)
- , m_xmlCasingTest(m_vm)
-#endif // ENABLE(STREAMS_API)
-{
- UNUSED_PARAM(vm);
-}
-
-void JSBuiltinInternalFunctions::visit(JSC::SlotVisitor& visitor)
-{
-#if ENABLE(STREAMS_API)
- m_xmlCasingTest.visit(visitor);
-#endif // ENABLE(STREAMS_API)
- UNUSED_PARAM(visitor);
-}
-
-void JSBuiltinInternalFunctions::initialize(JSDOMGlobalObject& globalObject)
-{
- UNUSED_PARAM(globalObject);
-#if ENABLE(STREAMS_API)
- m_xmlCasingTest.init(globalObject);
-#endif // ENABLE(STREAMS_API)
-
-#if ENABLE(STREAMS_API)
- JSVMClientData& clientData = *static_cast<JSVMClientData*>(m_vm.clientData);
- JSDOMGlobalObject::GlobalPropertyInfo staticGlobals[] = {
-#if ENABLE(STREAMS_API)
-#define DECLARE_GLOBAL_STATIC(name) \
- JSDOMGlobalObject::GlobalPropertyInfo( \
- clientData.builtinFunctions().xmlCasingTestBuiltins().name##PrivateName(), xmlCasingTest().m_##name##Function.get() , JSC::DontDelete | JSC::ReadOnly),
- WEBCORE_FOREACH_XMLCASINGTEST_BUILTIN_FUNCTION_NAME(DECLARE_GLOBAL_STATIC)
-#undef DECLARE_GLOBAL_STATIC
-#endif // ENABLE(STREAMS_API)
- };
- globalObject.addStaticGlobals(staticGlobals, WTF_ARRAY_LENGTH(staticGlobals));
- UNUSED_PARAM(clientData);
-#endif // ENABLE(STREAMS_API)
-}
-
-} // namespace WebCore
-### End File: WebCoreJSBuiltinInternals.cpp
Copied: trunk/Source/_javascript_Core/Scripts/tests/builtins/expected/WebCoreJSBuiltins.h-result (from rev 203553, trunk/Source/_javascript_Core/Scripts/tests/builtins/expected/WebCore-GuardedBuiltin-Separate.js-result) (0 => 203554)
--- trunk/Source/_javascript_Core/Scripts/tests/builtins/expected/WebCoreJSBuiltins.h-result (rev 0)
+++ trunk/Source/_javascript_Core/Scripts/tests/builtins/expected/WebCoreJSBuiltins.h-result 2016-07-22 08:32:12 UTC (rev 203554)
@@ -0,0 +1,349 @@
+### Begin File: WebCoreJSBuiltins.h
+/*
+ * Copyright (c) 2015 Canon Inc. All rights reserved.
+ * Copyright (c) 2016 Apple Inc. All rights reserved.
+ *
+ * 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. 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 APPLE INC. OR 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.
+ *
+ */
+
+// DO NOT EDIT THIS FILE. It is automatically generated from _javascript_ files for
+// builtins by the script: Source/_javascript_Core/Scripts/generate-js-builtins.py
+
+#pragma once
+
+#include "AnotherGuardedInternalBuiltinBuiltins.h"
+#include "ArbitraryConditionalGuardBuiltins.h"
+#include "GuardedBuiltinBuiltins.h"
+#include "GuardedInternalBuiltinBuiltins.h"
+#include "UnguardedBuiltinBuiltins.h"
+#include "xmlCasingTestBuiltins.h"
+#include <runtime/VM.h>
+
+namespace WebCore {
+
+class JSBuiltinFunctions {
+public:
+ explicit JSBuiltinFunctions(JSC::VM& vm)
+ : m_vm(vm)
+#if ENABLE(FETCH_API)
+ , m_anotherGuardedInternalBuiltinBuiltins(&m_vm)
+#endif // ENABLE(FETCH_API)
+#if ENABLE(STREAMS_API) || USE(CF)
+ , m_arbitraryConditionalGuardBuiltins(&m_vm)
+#endif // ENABLE(STREAMS_API) || USE(CF)
+#if ENABLE(STREAMS_API)
+ , m_guardedBuiltinBuiltins(&m_vm)
+#endif // ENABLE(STREAMS_API)
+#if ENABLE(STREAMS_API)
+ , m_guardedInternalBuiltinBuiltins(&m_vm)
+#endif // ENABLE(STREAMS_API)
+ , m_unguardedBuiltinBuiltins(&m_vm)
+#if ENABLE(STREAMS_API)
+ , m_xmlCasingTestBuiltins(&m_vm)
+#endif // ENABLE(STREAMS_API)
+ {
+#if ENABLE(FETCH_API)
+ m_anotherGuardedInternalBuiltinBuiltins.exportNames();
+#endif // ENABLE(FETCH_API)
+#if ENABLE(STREAMS_API)
+ m_guardedInternalBuiltinBuiltins.exportNames();
+#endif // ENABLE(STREAMS_API)
+#if ENABLE(STREAMS_API)
+ m_xmlCasingTestBuiltins.exportNames();
+#endif // ENABLE(STREAMS_API)
+ }
+
+#if ENABLE(FETCH_API)
+ AnotherGuardedInternalBuiltinBuiltinsWrapper& anotherGuardedInternalBuiltinBuiltins() { return m_anotherGuardedInternalBuiltinBuiltins; }
+#endif // ENABLE(FETCH_API)
+#if ENABLE(STREAMS_API) || USE(CF)
+ ArbitraryConditionalGuardBuiltinsWrapper& arbitraryConditionalGuardBuiltins() { return m_arbitraryConditionalGuardBuiltins; }
+#endif // ENABLE(STREAMS_API) || USE(CF)
+#if ENABLE(STREAMS_API)
+ GuardedBuiltinBuiltinsWrapper& guardedBuiltinBuiltins() { return m_guardedBuiltinBuiltins; }
+#endif // ENABLE(STREAMS_API)
+#if ENABLE(STREAMS_API)
+ GuardedInternalBuiltinBuiltinsWrapper& guardedInternalBuiltinBuiltins() { return m_guardedInternalBuiltinBuiltins; }
+#endif // ENABLE(STREAMS_API)
+ UnguardedBuiltinBuiltinsWrapper& unguardedBuiltinBuiltins() { return m_unguardedBuiltinBuiltins; }
+#if ENABLE(STREAMS_API)
+ XMLCasingTestBuiltinsWrapper& xmlCasingTestBuiltins() { return m_xmlCasingTestBuiltins; }
+#endif // ENABLE(STREAMS_API)
+
+private:
+ JSC::VM& m_vm;
+#if ENABLE(FETCH_API)
+ AnotherGuardedInternalBuiltinBuiltinsWrapper m_anotherGuardedInternalBuiltinBuiltins;
+#endif // ENABLE(FETCH_API)
+#if ENABLE(STREAMS_API) || USE(CF)
+ ArbitraryConditionalGuardBuiltinsWrapper m_arbitraryConditionalGuardBuiltins;
+#endif // ENABLE(STREAMS_API) || USE(CF)
+#if ENABLE(STREAMS_API)
+ GuardedBuiltinBuiltinsWrapper m_guardedBuiltinBuiltins;
+#endif // ENABLE(STREAMS_API)
+#if ENABLE(STREAMS_API)
+ GuardedInternalBuiltinBuiltinsWrapper m_guardedInternalBuiltinBuiltins;
+#endif // ENABLE(STREAMS_API)
+ UnguardedBuiltinBuiltinsWrapper m_unguardedBuiltinBuiltins;
+#if ENABLE(STREAMS_API)
+ XMLCasingTestBuiltinsWrapper m_xmlCasingTestBuiltins;
+#endif // ENABLE(STREAMS_API)
+};
+
+} // namespace WebCore
+### End File: WebCoreJSBuiltins.h
+
+### Begin File: WebCoreJSBuiltins.cpp
+/*
+ * Copyright (c) 2015 Canon Inc. All rights reserved.
+ * Copyright (c) 2016 Apple Inc. All rights reserved.
+ *
+ * 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. 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 APPLE INC. OR 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.
+ *
+ */
+
+// DO NOT EDIT THIS FILE. It is automatically generated from _javascript_ files for
+// builtins by the script: Source/_javascript_Core/Scripts/generate-js-builtins.py
+
+#include "AnotherGuardedInternalBuiltinBuiltins.cpp"
+#include "ArbitraryConditionalGuardBuiltins.cpp"
+#include "GuardedBuiltinBuiltins.cpp"
+#include "GuardedInternalBuiltinBuiltins.cpp"
+#include "UnguardedBuiltinBuiltins.cpp"
+#include "xmlCasingTestBuiltins.cpp"
+### End File: WebCoreJSBuiltins.cpp
+
+### Begin File: WebCoreJSBuiltinInternals.h
+/*
+ * Copyright (c) 2015 Canon Inc. All rights reserved.
+ * Copyright (c) 2016 Apple Inc. All rights reserved.
+ *
+ * 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. 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 APPLE INC. OR 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.
+ *
+ */
+
+// DO NOT EDIT THIS FILE. It is automatically generated from _javascript_ files for
+// builtins by the script: Source/_javascript_Core/Scripts/generate-js-builtins.py
+
+#pragma once
+
+#include "AnotherGuardedInternalBuiltinBuiltins.h"
+#include "GuardedInternalBuiltinBuiltins.h"
+#include "xmlCasingTestBuiltins.h"
+#include <runtime/VM.h>
+
+namespace WebCore {
+
+class JSDOMGlobalObject;
+
+class JSBuiltinInternalFunctions {
+public:
+ explicit JSBuiltinInternalFunctions(JSC::VM&);
+
+ void visit(JSC::SlotVisitor&);
+ void initialize(JSDOMGlobalObject&);
+
+#if ENABLE(FETCH_API)
+ AnotherGuardedInternalBuiltinBuiltinFunctions& anotherGuardedInternalBuiltin() { return m_anotherGuardedInternalBuiltin; }
+#endif // ENABLE(FETCH_API)
+#if ENABLE(STREAMS_API)
+ GuardedInternalBuiltinBuiltinFunctions& guardedInternalBuiltin() { return m_guardedInternalBuiltin; }
+#endif // ENABLE(STREAMS_API)
+#if ENABLE(STREAMS_API)
+ XMLCasingTestBuiltinFunctions& xmlCasingTest() { return m_xmlCasingTest; }
+#endif // ENABLE(STREAMS_API)
+
+private:
+#if ENABLE(FETCH_API) || ENABLE(STREAMS_API)
+ JSC::VM& m_vm;
+#endif // ENABLE(FETCH_API) || ENABLE(STREAMS_API)
+#if ENABLE(FETCH_API)
+ AnotherGuardedInternalBuiltinBuiltinFunctions m_anotherGuardedInternalBuiltin;
+#endif // ENABLE(FETCH_API)
+#if ENABLE(STREAMS_API)
+ GuardedInternalBuiltinBuiltinFunctions m_guardedInternalBuiltin;
+#endif // ENABLE(STREAMS_API)
+#if ENABLE(STREAMS_API)
+ XMLCasingTestBuiltinFunctions m_xmlCasingTest;
+#endif // ENABLE(STREAMS_API)
+};
+
+} // namespace WebCore
+### End File: WebCoreJSBuiltinInternals.h
+
+### Begin File: WebCoreJSBuiltinInternals.cpp
+/*
+ * Copyright (c) 2015 Canon Inc. All rights reserved.
+ * Copyright (c) 2016 Apple Inc. All rights reserved.
+ *
+ * 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. 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 APPLE INC. OR 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.
+ *
+ */
+
+// DO NOT EDIT THIS FILE. It is automatically generated from _javascript_ files for
+// builtins by the script: Source/_javascript_Core/Scripts/generate-js-builtins.py
+
+#include "config.h"
+#include "WebCoreJSBuiltinInternals.h"
+
+#include "JSDOMGlobalObject.h"
+#include "WebCoreJSClientData.h"
+#include <heap/SlotVisitorInlines.h>
+#include <runtime/JSCJSValueInlines.h>
+#include <runtime/StructureInlines.h>
+
+namespace WebCore {
+
+JSBuiltinInternalFunctions::JSBuiltinInternalFunctions(JSC::VM& vm)
+#if ENABLE(FETCH_API) || ENABLE(STREAMS_API)
+ : m_vm(vm)
+#endif // ENABLE(FETCH_API) || ENABLE(STREAMS_API)
+#if ENABLE(FETCH_API)
+ , m_anotherGuardedInternalBuiltin(m_vm)
+#endif // ENABLE(FETCH_API)
+#if ENABLE(STREAMS_API)
+ , m_guardedInternalBuiltin(m_vm)
+#endif // ENABLE(STREAMS_API)
+#if ENABLE(STREAMS_API)
+ , m_xmlCasingTest(m_vm)
+#endif // ENABLE(STREAMS_API)
+{
+ UNUSED_PARAM(vm);
+}
+
+void JSBuiltinInternalFunctions::visit(JSC::SlotVisitor& visitor)
+{
+#if ENABLE(FETCH_API)
+ m_anotherGuardedInternalBuiltin.visit(visitor);
+#endif // ENABLE(FETCH_API)
+#if ENABLE(STREAMS_API)
+ m_guardedInternalBuiltin.visit(visitor);
+#endif // ENABLE(STREAMS_API)
+#if ENABLE(STREAMS_API)
+ m_xmlCasingTest.visit(visitor);
+#endif // ENABLE(STREAMS_API)
+ UNUSED_PARAM(visitor);
+}
+
+void JSBuiltinInternalFunctions::initialize(JSDOMGlobalObject& globalObject)
+{
+ UNUSED_PARAM(globalObject);
+#if ENABLE(FETCH_API)
+ m_anotherGuardedInternalBuiltin.init(globalObject);
+#endif // ENABLE(FETCH_API)
+#if ENABLE(STREAMS_API)
+ m_guardedInternalBuiltin.init(globalObject);
+#endif // ENABLE(STREAMS_API)
+#if ENABLE(STREAMS_API)
+ m_xmlCasingTest.init(globalObject);
+#endif // ENABLE(STREAMS_API)
+
+#if ENABLE(FETCH_API) || ENABLE(STREAMS_API)
+ JSVMClientData& clientData = *static_cast<JSVMClientData*>(m_vm.clientData);
+ JSDOMGlobalObject::GlobalPropertyInfo staticGlobals[] = {
+#if ENABLE(FETCH_API)
+#define DECLARE_GLOBAL_STATIC(name) \
+ JSDOMGlobalObject::GlobalPropertyInfo( \
+ clientData.builtinFunctions().anotherGuardedInternalBuiltinBuiltins().name##PrivateName(), anotherGuardedInternalBuiltin().m_##name##Function.get() , JSC::DontDelete | JSC::ReadOnly),
+ WEBCORE_FOREACH_ANOTHERGUARDEDINTERNALBUILTIN_BUILTIN_FUNCTION_NAME(DECLARE_GLOBAL_STATIC)
+#undef DECLARE_GLOBAL_STATIC
+#endif // ENABLE(FETCH_API)
+#if ENABLE(STREAMS_API)
+#define DECLARE_GLOBAL_STATIC(name) \
+ JSDOMGlobalObject::GlobalPropertyInfo( \
+ clientData.builtinFunctions().guardedInternalBuiltinBuiltins().name##PrivateName(), guardedInternalBuiltin().m_##name##Function.get() , JSC::DontDelete | JSC::ReadOnly),
+ WEBCORE_FOREACH_GUARDEDINTERNALBUILTIN_BUILTIN_FUNCTION_NAME(DECLARE_GLOBAL_STATIC)
+#undef DECLARE_GLOBAL_STATIC
+#endif // ENABLE(STREAMS_API)
+#if ENABLE(STREAMS_API)
+#define DECLARE_GLOBAL_STATIC(name) \
+ JSDOMGlobalObject::GlobalPropertyInfo( \
+ clientData.builtinFunctions().xmlCasingTestBuiltins().name##PrivateName(), xmlCasingTest().m_##name##Function.get() , JSC::DontDelete | JSC::ReadOnly),
+ WEBCORE_FOREACH_XMLCASINGTEST_BUILTIN_FUNCTION_NAME(DECLARE_GLOBAL_STATIC)
+#undef DECLARE_GLOBAL_STATIC
+#endif // ENABLE(STREAMS_API)
+ };
+ globalObject.addStaticGlobals(staticGlobals, WTF_ARRAY_LENGTH(staticGlobals));
+ UNUSED_PARAM(clientData);
+#endif // ENABLE(FETCH_API) || ENABLE(STREAMS_API)
+}
+
+} // namespace WebCore
+### End File: WebCoreJSBuiltinInternals.cpp
Modified: trunk/Source/WebCore/CMakeLists.txt (203553 => 203554)
--- trunk/Source/WebCore/CMakeLists.txt 2016-07-22 05:33:01 UTC (rev 203553)
+++ trunk/Source/WebCore/CMakeLists.txt 2016-07-22 08:32:12 UTC (rev 203554)
@@ -3749,22 +3749,31 @@
foreach (_builtinSource ${WebCore_BUILTINS_SOURCES})
get_filename_component(_objectName ${_builtinSource} NAME_WE)
- list(APPEND WebCore_GENERATED_BUILTINS ${DERIVED_SOURCES_WEBCORE_DIR}/${_objectName}Builtins.h)
- list(APPEND WebCore_GENERATED_BUILTINS ${DERIVED_SOURCES_WEBCORE_DIR}/${_objectName}Builtins.cpp)
+ add_custom_command(
+ OUTPUT ${DERIVED_SOURCES_WEBCORE_DIR}/${_objectName}Builtins.cpp
+ ${DERIVED_SOURCES_WEBCORE_DIR}/${_objectName}Builtins.h
+ MAIN_DEPENDENCY ${_builtinSource}
+ DEPENDS ${BUILTINS_GENERATOR_SCRIPTS}
+ COMMAND ${PYTHON_EXECUTABLE} ${_javascript_Core_SCRIPTS_DIR}/generate-js-builtins.py --framework WebCore --output-directory ${DERIVED_SOURCES_WEBCORE_DIR} ${_builtinSource}
+ VERBATIM)
+ list(APPEND WebCore_DERIVED_SOURCES ${DERIVED_SOURCES_WEBCORE_DIR}/${_objectName}Builtins.cpp)
+ list(APPEND WebCore_DERIVED_SOURCES ${DERIVED_SOURCES_WEBCORE_DIR}/${_objectName}Builtins.h)
endforeach ()
-list(APPEND WebCore_GENERATED_BUILTINS ${DERIVED_SOURCES_WEBCORE_DIR}/WebCoreJSBuiltins.h)
-list(APPEND WebCore_GENERATED_BUILTINS ${DERIVED_SOURCES_WEBCORE_DIR}/WebCoreJSBuiltinInternals.h)
-list(APPEND WebCore_GENERATED_BUILTINS ${DERIVED_SOURCES_WEBCORE_DIR}/WebCoreJSBuiltinInternals.cpp)
add_custom_command(
- OUTPUT ${WebCore_GENERATED_BUILTINS}
+ OUTPUT ${DERIVED_SOURCES_WEBCORE_DIR}/WebCoreJSBuiltins.cpp
+ ${DERIVED_SOURCES_WEBCORE_DIR}/WebCoreJSBuiltinInternals.cpp
+ ${DERIVED_SOURCES_WEBCORE_DIR}/WebCoreJSBuiltins.h
+ ${DERIVED_SOURCES_WEBCORE_DIR}/WebCoreJSBuiltinInternals.h
MAIN_DEPENDENCY ${WebCore_BUILTINS_SOURCES}
DEPENDS ${BUILTINS_GENERATOR_SCRIPTS}
- COMMAND ${PYTHON_EXECUTABLE} ${_javascript_Core_SCRIPTS_DIR}/generate-js-builtins.py --wrappers --framework WebCore --output-directory ${DERIVED_SOURCES_WEBCORE_DIR} ${WebCore_BUILTINS_SOURCES}
+ COMMAND ${PYTHON_EXECUTABLE} ${_javascript_Core_SCRIPTS_DIR}/generate-js-builtins.py --wrappers-only --framework WebCore --output-directory ${DERIVED_SOURCES_WEBCORE_DIR} ${WebCore_BUILTINS_SOURCES}
VERBATIM)
+list(APPEND WebCore_DERIVED_SOURCES ${DERIVED_SOURCES_WEBCORE_DIR}/WebCoreJSBuiltins.cpp)
+list(APPEND WebCore_DERIVED_SOURCES ${DERIVED_SOURCES_WEBCORE_DIR}/WebCoreJSBuiltinInternals.cpp)
+list(APPEND WebCore_DERIVED_SOURCES ${DERIVED_SOURCES_WEBCORE_DIR}/WebCoreJSBuiltins.h)
+list(APPEND WebCore_DERIVED_SOURCES ${DERIVED_SOURCES_WEBCORE_DIR}/WebCoreJSBuiltinInternals.h)
-list(APPEND WebCore_DERIVED_SOURCES ${WebCore_GENERATED_BUILTINS})
-
ADD_SOURCE_WEBCORE_DERIVED_DEPENDENCIES(${WEBCORE_DIR}/html/HTMLTreeBuilder.cpp MathMLNames.cpp)
Modified: trunk/Source/WebCore/ChangeLog (203553 => 203554)
--- trunk/Source/WebCore/ChangeLog 2016-07-22 05:33:01 UTC (rev 203553)
+++ trunk/Source/WebCore/ChangeLog 2016-07-22 08:32:12 UTC (rev 203554)
@@ -1,3 +1,20 @@
+2016-07-22 Youenn Fablet <you...@apple.com>
+
+ run-builtins-generator-tests should be able to test WebCore builtins wrapper with more than one file
+ https://bugs.webkit.org/show_bug.cgi?id=159921
+
+ Reviewed by Brian Burg.
+
+ Covered by existing and added built-ins tests.
+
+ Updating built system according ---wrappers-only new meaning.
+ builtin generator is now called for each individual built-in file plus once for WebCore wrapper files.
+ WebCore wrapper files allow handling things like conditionally guarded features.
+ They also remove the need to use built-ins macros outside generated code.
+
+ * CMakeLists.txt:
+ * DerivedSources.make:
+
2016-07-21 Frederic Wang <fw...@igalia.com>
Move parsing of accentunder and accent attributes from renderer to element classes
Modified: trunk/Source/WebCore/DerivedSources.make (203553 => 203554)
--- trunk/Source/WebCore/DerivedSources.make 2016-07-22 05:33:01 UTC (rev 203553)
+++ trunk/Source/WebCore/DerivedSources.make 2016-07-22 08:32:12 UTC (rev 203554)
@@ -1319,18 +1319,26 @@
$(_javascript_Core_SCRIPTS_DIR)/lazywriter.py \
#
+WebCore_BUILTINS_WRAPPERS = \
+ WebCoreJSBuiltins.h \
+ WebCoreJSBuiltins.cpp \
+ WebCoreJSBuiltinInternals.h \
+ WebCoreJSBuiltinInternals.cpp \
+
# Adding/removing scripts should trigger regeneration, but changing which builtins are
# generated should not affect other builtins when not passing '--combined' to the generator.
-# WebCore_BUILTINS_SOURCE_LIST = $(shell echo $(WebCore_BUILTINS_SOURCES) | perl -e 'print " " . join(" -I", split(" ", <>));')
.PHONY: force
WebCore_BUILTINS_DEPENDENCIES_LIST : $(_javascript_Core_SCRIPTS_DIR)/UpdateContents.py force
$(PYTHON) $(_javascript_Core_SCRIPTS_DIR)/UpdateContents.py '$(BUILTINS_GENERATOR_SCRIPTS)' $@
- $(PYTHON) $(_javascript_Core_SCRIPTS_DIR)/generate-js-builtins.py --wrappers --output-directory . --framework WebCore $(WebCore_BUILTINS_SOURCES)
+$(firstword $(WebCore_BUILTINS_WRAPPERS)): WebCore_BUILTINS_DEPENDENCIES_LIST
+ $(PYTHON) $(_javascript_Core_SCRIPTS_DIR)/generate-js-builtins.py --wrappers-only --output-directory . --framework WebCore $(WebCore_BUILTINS_SOURCES)
+%Builtins.h: %.js $(BUILTINS_GENERATOR_SCRIPTS) WebCore_BUILTINS_DEPENDENCIES_LIST
+ $(PYTHON) $(_javascript_Core_SCRIPTS_DIR)/generate-js-builtins.py --output-directory . --framework WebCore $<
-all : WebCore_BUILTINS_DEPENDENCIES_LIST
+all : $(notdir $(WebCore_BUILTINS_SOURCES:%.js=%Builtins.h)) $(firstword $(WebCore_BUILTINS_WRAPPERS))
# ------------------------
Modified: trunk/Tools/ChangeLog (203553 => 203554)
--- trunk/Tools/ChangeLog 2016-07-22 05:33:01 UTC (rev 203553)
+++ trunk/Tools/ChangeLog 2016-07-22 08:32:12 UTC (rev 203554)
@@ -1,3 +1,20 @@
+2016-07-22 Youenn Fablet <you...@apple.com>
+
+ run-builtins-generator-tests should be able to test WebCore builtins wrapper with more than one file
+ https://bugs.webkit.org/show_bug.cgi?id=159921
+
+ Reviewed by Brian Burg.
+
+ Updated builtin generator test runner to generate WebCore wrapper files based on all WebCore valid separate files.
+
+ * Scripts/webkitpy/codegen/main.py:
+ (BuiltinsGeneratorTests.generate_from_js_builtins): Passing a list of builtin files to the script.
+ (BuiltinsGeneratorTests):
+ (BuiltinsGeneratorTests.single_builtin_test): Added to handle the case of single builtin generation.
+ (BuiltinsGeneratorTests.wrappers_builtin_test): Added to handle the case of WebCore wrappers builtin generation.
+ (BuiltinsGeneratorTests.run_test): Helper routine to run a test in reset mode or normal check mode.
+ (BuiltinsGeneratorTests.run_tests): Updated to add WebCore wrappers builtin generation test.
+
2016-07-21 Dan Bernstein <m...@apple.com>
[Mac] webkitdirs.pm contains unused code to support outdated OS X and Xcode versions
Modified: trunk/Tools/Scripts/webkitpy/codegen/main.py (203553 => 203554)
--- trunk/Tools/Scripts/webkitpy/codegen/main.py 2016-07-22 05:33:01 UTC (rev 203553)
+++ trunk/Tools/Scripts/webkitpy/codegen/main.py 2016-07-22 08:32:12 UTC (rev 203554)
@@ -37,7 +37,7 @@
self.reset_results = reset_results
self.executive = executive
- def generate_from_js_builtins(self, builtins_file, output_directory, framework_name="", combined_outputs=False, generate_wrapper=False):
+ def generate_from_js_builtins(self, builtins_files, output_directory, framework_name="", combined_outputs=False, generate_wrappers=False):
cmd = ['python',
'_javascript_Core/Scripts/generate-js-builtins.py',
'--output-directory', output_directory,
@@ -48,16 +48,15 @@
if combined_outputs:
cmd.append('--combined')
- if generate_wrapper:
- cmd.append('--wrappers')
+ if generate_wrappers:
+ cmd.append('--wrappers-only')
- cmd.append(builtins_file)
-
+ cmd.extend(builtins_files)
exit_code = 0
try:
stderr_output = self.executive.run_command(cmd)
if stderr_output:
- self.write_error_file(builtins_file, output_directory, stderr_output)
+ self.write_error_file(framework_name + "JSBuiltins.h-error" if generate_wrappers else builtins_files[0], output_directory, stderr_output)
except ScriptError, e:
print e.output
exit_code = e.exit_code
@@ -93,37 +92,61 @@
print 'PASS: %s' % output_file
return changes_found
- def run_tests(self, input_directory, reference_directory):
+ def single_builtin_test(self, test_name, test_files, work_directory):
+ (framework_name, test_case, output_mode) = test_name.split('-')
+ if not framework_name or not output_mode or not test_case:
+ print "Invalid test case name: should be Framework-TestCaseName-OutputMode.js"
+ return False
+
+ combined_outputs = output_mode == "Combined"
+ return self.generate_from_js_builtins(test_files, work_directory, framework_name=framework_name, combined_outputs=combined_outputs)
+
+ def wrappers_builtin_test(self, test_name, test_files, work_directory):
+ return self.generate_from_js_builtins(test_files, work_directory, framework_name="WebCore", generate_wrappers=True)
+
+ def run_test(self, reference_directory, test_name, test_files, generate_builtin_callback):
+ passed = True
+ # Generate output into the work directory (either the given one or a temp one if reset_results is not performed)
work_directory = reference_directory
+ if not self.reset_results:
+ work_directory = tempfile.mkdtemp("builtin-generator-tests")
+ if generate_builtin_callback(test_name, test_files, work_directory):
+ passed = False
+
+ if self.reset_results:
+ print "Reset results for test: %s" % (test_name)
+ return True
+
+ # Detect changes
+ if self.detect_changes(work_directory, reference_directory):
+ passed = False
+ shutil.rmtree(work_directory)
+ return passed
+
+ def run_tests(self, input_directory, reference_directory):
passed = True
+ separately_generated_files = []
for input_file in os.listdir(input_directory):
(test_name, extension) = os.path.splitext(input_file)
if extension != '.js':
continue
- # Generate output into the work directory (either the given one or a
- # temp one if not reset_results is performed)
- if not self.reset_results:
- work_directory = tempfile.mkdtemp()
- (framework_name, test_case, output_mode) = test_name.split('-')
- if not framework_name or not output_mode or not test_case:
- print "Invalid test case name: should be Framework-TestCaseName-OutputMode.js"
- continue
-
- combined_outputs = output_mode == "Combined"
- generate_wrapper = framework_name == "WebCore"
- if self.generate_from_js_builtins(os.path.join(input_directory, input_file), work_directory, framework_name=framework_name, combined_outputs=combined_outputs, generate_wrapper=generate_wrapper):
+ test_file = os.path.join(input_directory, input_file)
+ if not self.run_test(reference_directory, test_name, [test_file], self.single_builtin_test):
passed = False
+ # FIXME: Add Error parameter in filename and filter out these files here.
+ if 'Separate' in test_name and 'WebCore' in test_name and not 'Duplicate' in test_name:
+ separately_generated_files.append(test_file)
+
if self.reset_results:
print "Reset results for test: %s" % (input_file)
continue
- # Detect changes
- if self.detect_changes(work_directory, reference_directory):
+ if separately_generated_files:
+ if not self.run_test(reference_directory, "WebCoreJSBuiltins.h", separately_generated_files, self.wrappers_builtin_test):
passed = False
- shutil.rmtree(work_directory)
return passed
