Diff
Modified: trunk/Source/_javascript_Core/CMakeLists.txt (191841 => 191842)
--- trunk/Source/_javascript_Core/CMakeLists.txt 2015-10-31 15:37:03 UTC (rev 191841)
+++ trunk/Source/_javascript_Core/CMakeLists.txt 2015-10-31 16:52:39 UTC (rev 191842)
@@ -1194,7 +1194,6 @@
${_javascript_Core_SCRIPTS_DIR}/builtins_generate_combined_implementation.py
${_javascript_Core_SCRIPTS_DIR}/builtins_generate_separate_header.py
${_javascript_Core_SCRIPTS_DIR}/builtins_generate_separate_implementation.py
- ${_javascript_Core_SCRIPTS_DIR}/builtins_generate_separate_wrapper.py
${_javascript_Core_SCRIPTS_DIR}/generate-js-builtins.py
${_javascript_Core_SCRIPTS_DIR}/lazywriter.py
)
Modified: trunk/Source/_javascript_Core/ChangeLog (191841 => 191842)
--- trunk/Source/_javascript_Core/ChangeLog 2015-10-31 15:37:03 UTC (rev 191841)
+++ trunk/Source/_javascript_Core/ChangeLog 2015-10-31 16:52:39 UTC (rev 191842)
@@ -1,3 +1,29 @@
+2015-10-31 Brian Burg <[email protected]>
+
+ Builtins generator should put WebCore-only wrappers in the per-builtin header
+ https://bugs.webkit.org/show_bug.cgi?id=150539
+
+ Reviewed by Youenn Fablet.
+
+ If generating for WebCore, put the XXXWrapper and related boilerplate
+ in the per-builtin header instead of making a separate XXXWrapper.h.
+
+ Rebaseline the tests.
+
+ * CMakeLists.txt:
+ * DerivedSources.make:
+ * Scripts/builtins/builtins.py:
+ * Scripts/builtins/builtins_generate_separate_header.py:
+ (BuiltinsSeparateHeaderGenerator.generate_output):
+ (generate_header_includes):
+ * Scripts/builtins/builtins_generate_separate_wrapper.py: Deleted.
+ * Scripts/builtins/builtins_templates.py: Be consistent with variables.
+ * Scripts/generate-js-builtins.py:
+ * Scripts/tests/builtins/expected/WebCore-GuardedBuiltin-Separate.js-result:
+ * Scripts/tests/builtins/expected/WebCore-GuardedInternalBuiltin-Separate.js-result:
+ * Scripts/tests/builtins/expected/WebCore-UnguardedBuiltin-Separate.js-result:
+ * Scripts/tests/builtins/expected/WebCore-xmlCasingTest-Separate.js-result:
+
2015-10-31 Saam barati <[email protected]>
JSC should have a forceGCSlowPaths option
Modified: trunk/Source/_javascript_Core/DerivedSources.make (191841 => 191842)
--- trunk/Source/_javascript_Core/DerivedSources.make 2015-10-31 15:37:03 UTC (rev 191841)
+++ trunk/Source/_javascript_Core/DerivedSources.make 2015-10-31 16:52:39 UTC (rev 191842)
@@ -77,7 +77,6 @@
$(_javascript_Core_SCRIPTS_DIR)/builtins/builtins_generate_combined_implementation.py \
$(_javascript_Core_SCRIPTS_DIR)/builtins/builtins_generate_separate_header.py \
$(_javascript_Core_SCRIPTS_DIR)/builtins/builtins_generate_separate_implementation.py \
- $(_javascript_Core_SCRIPTS_DIR)/builtins/builtins_generate_separate_wrapper.py \
$(_javascript_Core_SCRIPTS_DIR)/generate-js-builtins.py \
$(_javascript_Core_SCRIPTS_DIR)/lazywriter.py \
#
Modified: trunk/Source/_javascript_Core/_javascript_Core.xcodeproj/project.pbxproj (191841 => 191842)
--- trunk/Source/_javascript_Core/_javascript_Core.xcodeproj/project.pbxproj 2015-10-31 15:37:03 UTC (rev 191841)
+++ trunk/Source/_javascript_Core/_javascript_Core.xcodeproj/project.pbxproj 2015-10-31 16:52:39 UTC (rev 191842)
@@ -1372,7 +1372,6 @@
99DA00A81BD5993100F4575C /* builtins_generate_combined_implementation.py in Headers */ = {isa = PBXBuildFile; fileRef = 99DA009F1BD5992700F4575C /* builtins_generate_combined_implementation.py */; settings = {ATTRIBUTES = (Private, ); }; };
99DA00A91BD5993100F4575C /* builtins_generate_separate_header.py in Headers */ = {isa = PBXBuildFile; fileRef = 99DA00A01BD5992700F4575C /* builtins_generate_separate_header.py */; settings = {ATTRIBUTES = (Private, ); }; };
99DA00AA1BD5993100F4575C /* builtins_generate_separate_implementation.py in Headers */ = {isa = PBXBuildFile; fileRef = 99DA00A11BD5992700F4575C /* builtins_generate_separate_implementation.py */; settings = {ATTRIBUTES = (Private, ); }; };
- 99DA00AB1BD5993100F4575C /* builtins_generate_separate_wrapper.py in Headers */ = {isa = PBXBuildFile; fileRef = 99DA00A21BD5992700F4575C /* builtins_generate_separate_wrapper.py */; settings = {ATTRIBUTES = (Private, ); }; };
99DA00AF1BD5994E00F4575C /* generate-js-builtins.py in Headers */ = {isa = PBXBuildFile; fileRef = 99DA00AC1BD5993E00F4575C /* generate-js-builtins.py */; settings = {ATTRIBUTES = (Private, ); }; };
99DA00B01BD5994E00F4575C /* lazywriter.py in Headers */ = {isa = PBXBuildFile; fileRef = 99DA00AD1BD5993E00F4575C /* lazywriter.py */; settings = {ATTRIBUTES = (Private, ); }; };
99DA00B11BD5994E00F4575C /* UpdateContents.py in Headers */ = {isa = PBXBuildFile; fileRef = 99DA00AE1BD5993E00F4575C /* UpdateContents.py */; settings = {ATTRIBUTES = (Private, ); }; };
@@ -3432,7 +3431,6 @@
99DA009F1BD5992700F4575C /* builtins_generate_combined_implementation.py */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.script.python; path = builtins_generate_combined_implementation.py; sourceTree = "<group>"; };
99DA00A01BD5992700F4575C /* builtins_generate_separate_header.py */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.script.python; path = builtins_generate_separate_header.py; sourceTree = "<group>"; };
99DA00A11BD5992700F4575C /* builtins_generate_separate_implementation.py */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.script.python; path = builtins_generate_separate_implementation.py; sourceTree = "<group>"; };
- 99DA00A21BD5992700F4575C /* builtins_generate_separate_wrapper.py */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.script.python; path = builtins_generate_separate_wrapper.py; sourceTree = "<group>"; };
99DA00AC1BD5993E00F4575C /* generate-js-builtins.py */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.script.python; path = "generate-js-builtins.py"; sourceTree = "<group>"; };
99DA00AD1BD5993E00F4575C /* lazywriter.py */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.script.python; path = lazywriter.py; sourceTree = "<group>"; };
99DA00AE1BD5993E00F4575C /* UpdateContents.py */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.script.python; path = UpdateContents.py; sourceTree = "<group>"; };
@@ -6232,7 +6230,6 @@
99DA009F1BD5992700F4575C /* builtins_generate_combined_implementation.py */,
99DA00A01BD5992700F4575C /* builtins_generate_separate_header.py */,
99DA00A11BD5992700F4575C /* builtins_generate_separate_implementation.py */,
- 99DA00A21BD5992700F4575C /* builtins_generate_separate_wrapper.py */,
99DA009A1BD5992700F4575C /* builtins_generator.py */,
99DA009B1BD5992700F4575C /* builtins_model.py */,
99DA009C1BD5992700F4575C /* builtins_templates.py */,
@@ -6542,7 +6539,6 @@
99DA00A81BD5993100F4575C /* builtins_generate_combined_implementation.py in Headers */,
99DA00A91BD5993100F4575C /* builtins_generate_separate_header.py in Headers */,
99DA00AA1BD5993100F4575C /* builtins_generate_separate_implementation.py in Headers */,
- 99DA00AB1BD5993100F4575C /* builtins_generate_separate_wrapper.py in Headers */,
99DA00A31BD5993100F4575C /* builtins_generator.py in Headers */,
99DA00A41BD5993100F4575C /* builtins_model.py in Headers */,
99DA00A51BD5993100F4575C /* builtins_templates.py in Headers */,
Modified: trunk/Source/_javascript_Core/Scripts/builtins/builtins.py (191841 => 191842)
--- trunk/Source/_javascript_Core/Scripts/builtins/builtins.py 2015-10-31 15:37:03 UTC (rev 191841)
+++ trunk/Source/_javascript_Core/Scripts/builtins/builtins.py 2015-10-31 16:52:39 UTC (rev 191842)
@@ -9,4 +9,3 @@
from builtins_generate_combined_implementation import *
from builtins_generate_separate_header import *
from builtins_generate_separate_implementation import *
-from builtins_generate_separate_wrapper import *
Modified: trunk/Source/_javascript_Core/Scripts/builtins/builtins_generate_separate_header.py (191841 => 191842)
--- trunk/Source/_javascript_Core/Scripts/builtins/builtins_generate_separate_header.py 2015-10-31 15:37:03 UTC (rev 191841)
+++ trunk/Source/_javascript_Core/Scripts/builtins/builtins_generate_separate_header.py 2015-10-31 16:52:39 UTC (rev 191842)
@@ -31,6 +31,7 @@
from string import Template
from builtins_generator import BuiltinsGenerator
+from builtins_model import Frameworks
from builtins_templates import BuiltinsGeneratorTemplates as Templates
log = logging.getLogger('global')
@@ -52,7 +53,8 @@
'namespace': self.model().framework.setting('namespace'),
'headerGuard': self.output_filename().replace('.', '_'),
'macroPrefix': self.macro_prefix(),
- 'objectName': self.object.object_name.upper(),
+ 'objectName': self.object.object_name,
+ 'objectMacro': self.object.object_name.upper(),
}
conditional_guard = self.object.annotations.get('conditional')
@@ -70,6 +72,8 @@
sections.append(self.generate_section_for_code_table_macro())
sections.append(self.generate_section_for_code_name_macro())
sections.append(Template(Templates.SeparateHeaderStaticMacros).substitute(args))
+ if self.model().framework is Frameworks.WebCore:
+ sections.append(Template(Templates.SeparateHeaderWrapperBoilerplate).substitute(args))
sections.append(Template(Templates.NamespaceBottom).substitute(args))
if conditional_guard is not None:
sections.append("#endif // %s" % conditional_guard)
@@ -85,8 +89,20 @@
def generate_secondary_header_includes(self):
header_includes = [
(["WebCore"],
+ ("_javascript_Core", "bytecode/UnlinkedFunctionExecutable.h"),
+ ),
+
+ (["WebCore"],
("_javascript_Core", "builtins/BuiltinUtils.h"),
),
+
+ (["WebCore"],
+ ("_javascript_Core", "runtime/Identifier.h"),
+ ),
+
+ (["WebCore"],
+ ("_javascript_Core", "runtime/JSFunction.h"),
+ ),
]
return '\n'.join(self.generate_includes_from_entries(header_includes))
Deleted: trunk/Source/_javascript_Core/Scripts/builtins/builtins_generate_separate_wrapper.py (191841 => 191842)
--- trunk/Source/_javascript_Core/Scripts/builtins/builtins_generate_separate_wrapper.py 2015-10-31 15:37:03 UTC (rev 191841)
+++ trunk/Source/_javascript_Core/Scripts/builtins/builtins_generate_separate_wrapper.py 2015-10-31 16:52:39 UTC (rev 191842)
@@ -1,100 +0,0 @@
-#!/usr/bin/env python
-#
-# Copyright (c) 2014, 2015 Apple Inc. All rights reserved.
-# Copyright (c) 2014 University of Washington. 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.
-
-
-import logging
-import re
-import string
-from string import Template
-
-from builtins_generator import BuiltinsGenerator
-from builtins_templates import BuiltinsGeneratorTemplates as Templates
-
-log = logging.getLogger('global')
-
-
-class BuiltinsSeparateWrapperGenerator(BuiltinsGenerator):
- def __init__(self, model, object):
- BuiltinsGenerator.__init__(self, model)
- self.object = object
-
- def output_filename(self):
- return "%sBuiltinsWrapper.h" % BuiltinsGenerator.mangledNameForObject(self.object)
-
- def macro_prefix(self):
- return self.model().framework.setting('macro_prefix')
-
- def generate_output(self):
- args = {
- 'namespace': self.model().framework.setting('namespace'),
- 'headerGuard': self.output_filename().replace('.', '_'),
- 'macroPrefix': self.macro_prefix(),
- 'objectName': self.object.object_name,
- 'objectMacro': self.object.object_name.upper(),
- }
-
- conditional_guard = self.object.annotations.get('conditional')
-
- sections = []
- sections.append(self.generate_license())
- sections.append(Template(Templates.DoNotEditWarning).substitute(args))
- sections.append(Template(Templates.HeaderIncludeGuardTop).substitute(args))
- if conditional_guard is not None:
- sections.append("#if %s" % conditional_guard)
- sections.append(self.generate_secondary_header_includes())
- sections.append(Template(Templates.NamespaceTop).substitute(args))
- sections.append(Template(Templates.SeparateWrapperHeaderBoilerplate).substitute(args))
- sections.append(Template(Templates.NamespaceBottom).substitute(args))
- if conditional_guard is not None:
- sections.append("#endif // %s" % conditional_guard)
- sections.append(Template(Templates.HeaderIncludeGuardBottom).substitute(args))
-
- return "\n\n".join(sections)
-
- def generate_secondary_header_includes(self):
- header_includes = [
- (["WebCore"],
- ("WebCore", "%sBuiltins.h" % self.object.object_name),
- ),
-
- (["WebCore"],
- ("_javascript_Core", "bytecode/UnlinkedFunctionExecutable.h"),
- ),
-
- (["WebCore"],
- ("_javascript_Core", "builtins/BuiltinUtils.h"),
- ),
-
- (["WebCore"],
- ("_javascript_Core", "runtime/Identifier.h"),
- ),
-
- (["WebCore"],
- ("_javascript_Core", "runtime/JSFunction.h"),
- ),
- ]
-
- return '\n'.join(self.generate_includes_from_entries(header_includes))
Modified: trunk/Source/_javascript_Core/Scripts/builtins/builtins_templates.py (191841 => 191842)
--- trunk/Source/_javascript_Core/Scripts/builtins/builtins_templates.py 2015-10-31 15:37:03 UTC (rev 191841)
+++ trunk/Source/_javascript_Core/Scripts/builtins/builtins_templates.py 2015-10-31 16:52:39 UTC (rev 191842)
@@ -83,10 +83,10 @@
"""#define DECLARE_BUILTIN_GENERATOR(codeName, functionName, argumentCount) \\
JSC::FunctionExecutable* codeName##Generator(JSC::VM&);
-${macroPrefix}_FOREACH_${objectName}_BUILTIN_CODE(DECLARE_BUILTIN_GENERATOR)
+${macroPrefix}_FOREACH_${objectMacro}_BUILTIN_CODE(DECLARE_BUILTIN_GENERATOR)
#undef DECLARE_BUILTIN_GENERATOR
-#define ${macroPrefix}_BUILTIN_${objectName}_EXISTS(object, func) defined ${macroPrefix}_BUILTIN_ ## object ## _ ## func""")
+#define ${macroPrefix}_BUILTIN_${objectMacro}_EXISTS(object, func) defined ${macroPrefix}_BUILTIN_ ## object ## _ ## func""")
CombinedJSCImplementationStaticMacros = (
"""
@@ -134,7 +134,7 @@
#undef DEFINE_BUILTIN_GENERATOR
""")
- SeparateWrapperHeaderBoilerplate = (
+ SeparateHeaderWrapperBoilerplate = (
"""class ${objectName}BuiltinsWrapper : private JSC::WeakHandleOwner {
public:
explicit ${objectName}BuiltinsWrapper(JSC::VM* vm)
Modified: trunk/Source/_javascript_Core/Scripts/generate-js-builtins.py (191841 => 191842)
--- trunk/Source/_javascript_Core/Scripts/generate-js-builtins.py 2015-10-31 15:37:03 UTC (rev 191841)
+++ trunk/Source/_javascript_Core/Scripts/generate-js-builtins.py 2015-10-31 16:52:39 UTC (rev 191842)
@@ -74,9 +74,6 @@
generators.append(BuiltinsSeparateHeaderGenerator(model, object))
generators.append(BuiltinsSeparateImplementationGenerator(model, object))
- if model.framework is Frameworks.WebCore:
- generators.append(BuiltinsSeparateWrapperGenerator(model, object))
-
log.debug("")
log.debug("Generating bindings for builtins.")
Modified: trunk/Source/_javascript_Core/Scripts/tests/builtins/expected/WebCore-ArbitraryConditionalGuard-Separate.js-result (191841 => 191842)
--- trunk/Source/_javascript_Core/Scripts/tests/builtins/expected/WebCore-ArbitraryConditionalGuard-Separate.js-result 2015-10-31 15:37:03 UTC (rev 191841)
+++ trunk/Source/_javascript_Core/Scripts/tests/builtins/expected/WebCore-ArbitraryConditionalGuard-Separate.js-result 2015-10-31 16:52:39 UTC (rev 191842)
@@ -34,6 +34,9 @@
#if ENABLE(STREAMS_API) || USE(CF)
#include <builtins/BuiltinUtils.h>
+#include <bytecode/UnlinkedFunctionExecutable.h>
+#include <runtime/Identifier.h>
+#include <runtime/JSFunction.h>
namespace JSC {
class FunctionExecutable;
@@ -65,129 +68,6 @@
#define WEBCORE_BUILTIN_ARBITRARYCONDITIONALGUARD_EXISTS(object, func) defined WEBCORE_BUILTIN_ ## object ## _ ## func
-} // namespace WebCore
-
-#endif // ENABLE(STREAMS_API) || USE(CF)
-
-#endif // ArbitraryConditionalGuardBuiltins_h
-
-### End File: ArbitraryConditionalGuardBuiltins.h
-
-### Begin File: ArbitraryConditionalGuardBuiltins.cpp
-/*
- * Copyright (c) 2015 Canon 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 "ArbitraryConditionalGuardBuiltins.h"
-
-#if ENABLE(STREAMS_API) || USE(CF)
-
-#include "WebCoreJSClientData.h"
-#include <runtime/Executable.h>
-#include <runtime/JSCJSValueInlines.h>
-#include <runtime/JSCellInlines.h>
-#include <runtime/StructureInlines.h>
-#include <runtime/VM.h>
-
-namespace WebCore {
-
-const JSC::ConstructAbility s_arbitraryConditionalGuardIsReadableStreamLockedCodeConstructAbility = JSC::ConstructAbility::CannotConstruct;
-const int s_arbitraryConditionalGuardIsReadableStreamLockedCodeLength = 71;
-const char* s_arbitraryConditionalGuardIsReadableStreamLockedCode =
- "(function (stream)\n" \
- "{\n" \
- " \"use strict\";\n" \
- "\n" \
- " return !!stream.@reader;\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().arbitraryConditionalGuardBuiltins().codeName##Executable()->link(vm, clientData->builtinFunctions().arbitraryConditionalGuardBuiltins().codeName##Source()); \
-}
-WEBCORE_FOREACH_ARBITRARYCONDITIONALGUARD_BUILTIN_CODE(DEFINE_BUILTIN_GENERATOR)
-#undef DEFINE_BUILTIN_GENERATOR
-
-
-} // namespace WebCore
-
-#endif // ENABLE(STREAMS_API) || USE(CF)
-
-### End File: ArbitraryConditionalGuardBuiltins.cpp
-
-### Begin File: ArbitraryConditionalGuardBuiltinsWrapper.h
-/*
- * Copyright (c) 2015 Canon 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
-
-#ifndef ArbitraryConditionalGuardBuiltinsWrapper_h
-#define ArbitraryConditionalGuardBuiltinsWrapper_h
-
-#if ENABLE(STREAMS_API) || USE(CF)
-
-#include "ArbitraryConditionalGuardBuiltins.h"
-#include <builtins/BuiltinUtils.h>
-#include <bytecode/UnlinkedFunctionExecutable.h>
-#include <runtime/Identifier.h>
-#include <runtime/JSFunction.h>
-
-namespace WebCore {
-
class ArbitraryConditionalGuardBuiltinsWrapper : private JSC::WeakHandleOwner {
public:
explicit ArbitraryConditionalGuardBuiltinsWrapper(JSC::VM* vm)
@@ -275,6 +155,78 @@
#endif // ENABLE(STREAMS_API) || USE(CF)
-#endif // ArbitraryConditionalGuardBuiltinsWrapper_h
+#endif // ArbitraryConditionalGuardBuiltins_h
-### End File: ArbitraryConditionalGuardBuiltinsWrapper.h
+### End File: ArbitraryConditionalGuardBuiltins.h
+
+### Begin File: ArbitraryConditionalGuardBuiltins.cpp
+/*
+ * Copyright (c) 2015 Canon 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 "ArbitraryConditionalGuardBuiltins.h"
+
+#if ENABLE(STREAMS_API) || USE(CF)
+
+#include "WebCoreJSClientData.h"
+#include <runtime/Executable.h>
+#include <runtime/JSCJSValueInlines.h>
+#include <runtime/JSCellInlines.h>
+#include <runtime/StructureInlines.h>
+#include <runtime/VM.h>
+
+namespace WebCore {
+
+const JSC::ConstructAbility s_arbitraryConditionalGuardIsReadableStreamLockedCodeConstructAbility = JSC::ConstructAbility::CannotConstruct;
+const int s_arbitraryConditionalGuardIsReadableStreamLockedCodeLength = 71;
+const char* s_arbitraryConditionalGuardIsReadableStreamLockedCode =
+ "(function (stream)\n" \
+ "{\n" \
+ " \"use strict\";\n" \
+ "\n" \
+ " return !!stream.@reader;\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().arbitraryConditionalGuardBuiltins().codeName##Executable()->link(vm, clientData->builtinFunctions().arbitraryConditionalGuardBuiltins().codeName##Source()); \
+}
+WEBCORE_FOREACH_ARBITRARYCONDITIONALGUARD_BUILTIN_CODE(DEFINE_BUILTIN_GENERATOR)
+#undef DEFINE_BUILTIN_GENERATOR
+
+
+} // namespace WebCore
+
+#endif // ENABLE(STREAMS_API) || USE(CF)
+
+### End File: ArbitraryConditionalGuardBuiltins.cpp
Modified: trunk/Source/_javascript_Core/Scripts/tests/builtins/expected/WebCore-GuardedBuiltin-Separate.js-result (191841 => 191842)
--- trunk/Source/_javascript_Core/Scripts/tests/builtins/expected/WebCore-GuardedBuiltin-Separate.js-result 2015-10-31 15:37:03 UTC (rev 191841)
+++ trunk/Source/_javascript_Core/Scripts/tests/builtins/expected/WebCore-GuardedBuiltin-Separate.js-result 2015-10-31 16:52:39 UTC (rev 191842)
@@ -34,6 +34,9 @@
#if ENABLE(STREAMS_API)
#include <builtins/BuiltinUtils.h>
+#include <bytecode/UnlinkedFunctionExecutable.h>
+#include <runtime/Identifier.h>
+#include <runtime/JSFunction.h>
namespace JSC {
class FunctionExecutable;
@@ -65,129 +68,6 @@
#define WEBCORE_BUILTIN_GUARDEDBUILTIN_EXISTS(object, func) defined WEBCORE_BUILTIN_ ## object ## _ ## func
-} // namespace WebCore
-
-#endif // ENABLE(STREAMS_API)
-
-#endif // GuardedBuiltinBuiltins_h
-
-### End File: GuardedBuiltinBuiltins.h
-
-### Begin File: GuardedBuiltinBuiltins.cpp
-/*
- * Copyright (c) 2015 Canon 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 "GuardedBuiltinBuiltins.h"
-
-#if ENABLE(STREAMS_API)
-
-#include "WebCoreJSClientData.h"
-#include <runtime/Executable.h>
-#include <runtime/JSCJSValueInlines.h>
-#include <runtime/JSCellInlines.h>
-#include <runtime/StructureInlines.h>
-#include <runtime/VM.h>
-
-namespace WebCore {
-
-const JSC::ConstructAbility s_guardedBuiltinIsReadableStreamLockedCodeConstructAbility = JSC::ConstructAbility::CannotConstruct;
-const int s_guardedBuiltinIsReadableStreamLockedCodeLength = 71;
-const char* s_guardedBuiltinIsReadableStreamLockedCode =
- "(function (stream)\n" \
- "{\n" \
- " \"use strict\";\n" \
- "\n" \
- " return !!stream.@reader;\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().guardedBuiltinBuiltins().codeName##Executable()->link(vm, clientData->builtinFunctions().guardedBuiltinBuiltins().codeName##Source()); \
-}
-WEBCORE_FOREACH_GUARDEDBUILTIN_BUILTIN_CODE(DEFINE_BUILTIN_GENERATOR)
-#undef DEFINE_BUILTIN_GENERATOR
-
-
-} // namespace WebCore
-
-#endif // ENABLE(STREAMS_API)
-
-### End File: GuardedBuiltinBuiltins.cpp
-
-### Begin File: GuardedBuiltinBuiltinsWrapper.h
-/*
- * Copyright (c) 2015 Canon 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
-
-#ifndef GuardedBuiltinBuiltinsWrapper_h
-#define GuardedBuiltinBuiltinsWrapper_h
-
-#if ENABLE(STREAMS_API)
-
-#include "GuardedBuiltinBuiltins.h"
-#include <builtins/BuiltinUtils.h>
-#include <bytecode/UnlinkedFunctionExecutable.h>
-#include <runtime/Identifier.h>
-#include <runtime/JSFunction.h>
-
-namespace WebCore {
-
class GuardedBuiltinBuiltinsWrapper : private JSC::WeakHandleOwner {
public:
explicit GuardedBuiltinBuiltinsWrapper(JSC::VM* vm)
@@ -275,6 +155,78 @@
#endif // ENABLE(STREAMS_API)
-#endif // GuardedBuiltinBuiltinsWrapper_h
+#endif // GuardedBuiltinBuiltins_h
-### End File: GuardedBuiltinBuiltinsWrapper.h
+### End File: GuardedBuiltinBuiltins.h
+
+### Begin File: GuardedBuiltinBuiltins.cpp
+/*
+ * Copyright (c) 2015 Canon 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 "GuardedBuiltinBuiltins.h"
+
+#if ENABLE(STREAMS_API)
+
+#include "WebCoreJSClientData.h"
+#include <runtime/Executable.h>
+#include <runtime/JSCJSValueInlines.h>
+#include <runtime/JSCellInlines.h>
+#include <runtime/StructureInlines.h>
+#include <runtime/VM.h>
+
+namespace WebCore {
+
+const JSC::ConstructAbility s_guardedBuiltinIsReadableStreamLockedCodeConstructAbility = JSC::ConstructAbility::CannotConstruct;
+const int s_guardedBuiltinIsReadableStreamLockedCodeLength = 71;
+const char* s_guardedBuiltinIsReadableStreamLockedCode =
+ "(function (stream)\n" \
+ "{\n" \
+ " \"use strict\";\n" \
+ "\n" \
+ " return !!stream.@reader;\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().guardedBuiltinBuiltins().codeName##Executable()->link(vm, clientData->builtinFunctions().guardedBuiltinBuiltins().codeName##Source()); \
+}
+WEBCORE_FOREACH_GUARDEDBUILTIN_BUILTIN_CODE(DEFINE_BUILTIN_GENERATOR)
+#undef DEFINE_BUILTIN_GENERATOR
+
+
+} // namespace WebCore
+
+#endif // ENABLE(STREAMS_API)
+
+### End File: GuardedBuiltinBuiltins.cpp
Modified: trunk/Source/_javascript_Core/Scripts/tests/builtins/expected/WebCore-GuardedInternalBuiltin-Separate.js-result (191841 => 191842)
--- trunk/Source/_javascript_Core/Scripts/tests/builtins/expected/WebCore-GuardedInternalBuiltin-Separate.js-result 2015-10-31 15:37:03 UTC (rev 191841)
+++ trunk/Source/_javascript_Core/Scripts/tests/builtins/expected/WebCore-GuardedInternalBuiltin-Separate.js-result 2015-10-31 16:52:39 UTC (rev 191842)
@@ -34,6 +34,9 @@
#if ENABLE(STREAMS_API)
#include <builtins/BuiltinUtils.h>
+#include <bytecode/UnlinkedFunctionExecutable.h>
+#include <runtime/Identifier.h>
+#include <runtime/JSFunction.h>
namespace JSC {
class FunctionExecutable;
@@ -65,129 +68,6 @@
#define WEBCORE_BUILTIN_GUARDEDINTERNALBUILTIN_EXISTS(object, func) defined WEBCORE_BUILTIN_ ## object ## _ ## func
-} // namespace WebCore
-
-#endif // ENABLE(STREAMS_API)
-
-#endif // GuardedInternalBuiltinBuiltins_h
-
-### End File: GuardedInternalBuiltinBuiltins.h
-
-### Begin File: GuardedInternalBuiltinBuiltins.cpp
-/*
- * Copyright (c) 2015 Canon 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 "GuardedInternalBuiltinBuiltins.h"
-
-#if ENABLE(STREAMS_API)
-
-#include "WebCoreJSClientData.h"
-#include <runtime/Executable.h>
-#include <runtime/JSCJSValueInlines.h>
-#include <runtime/JSCellInlines.h>
-#include <runtime/StructureInlines.h>
-#include <runtime/VM.h>
-
-namespace WebCore {
-
-const JSC::ConstructAbility s_guardedInternalBuiltinIsReadableStreamLockedCodeConstructAbility = JSC::ConstructAbility::CannotConstruct;
-const int s_guardedInternalBuiltinIsReadableStreamLockedCodeLength = 71;
-const char* s_guardedInternalBuiltinIsReadableStreamLockedCode =
- "(function (stream)\n" \
- "{\n" \
- " \"use strict\";\n" \
- "\n" \
- " return !!stream.@reader;\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().guardedInternalBuiltinBuiltins().codeName##Executable()->link(vm, clientData->builtinFunctions().guardedInternalBuiltinBuiltins().codeName##Source()); \
-}
-WEBCORE_FOREACH_GUARDEDINTERNALBUILTIN_BUILTIN_CODE(DEFINE_BUILTIN_GENERATOR)
-#undef DEFINE_BUILTIN_GENERATOR
-
-
-} // namespace WebCore
-
-#endif // ENABLE(STREAMS_API)
-
-### End File: GuardedInternalBuiltinBuiltins.cpp
-
-### Begin File: GuardedInternalBuiltinBuiltinsWrapper.h
-/*
- * Copyright (c) 2015 Canon 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
-
-#ifndef GuardedInternalBuiltinBuiltinsWrapper_h
-#define GuardedInternalBuiltinBuiltinsWrapper_h
-
-#if ENABLE(STREAMS_API)
-
-#include "GuardedInternalBuiltinBuiltins.h"
-#include <builtins/BuiltinUtils.h>
-#include <bytecode/UnlinkedFunctionExecutable.h>
-#include <runtime/Identifier.h>
-#include <runtime/JSFunction.h>
-
-namespace WebCore {
-
class GuardedInternalBuiltinBuiltinsWrapper : private JSC::WeakHandleOwner {
public:
explicit GuardedInternalBuiltinBuiltinsWrapper(JSC::VM* vm)
@@ -275,6 +155,78 @@
#endif // ENABLE(STREAMS_API)
-#endif // GuardedInternalBuiltinBuiltinsWrapper_h
+#endif // GuardedInternalBuiltinBuiltins_h
-### End File: GuardedInternalBuiltinBuiltinsWrapper.h
+### End File: GuardedInternalBuiltinBuiltins.h
+
+### Begin File: GuardedInternalBuiltinBuiltins.cpp
+/*
+ * Copyright (c) 2015 Canon 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 "GuardedInternalBuiltinBuiltins.h"
+
+#if ENABLE(STREAMS_API)
+
+#include "WebCoreJSClientData.h"
+#include <runtime/Executable.h>
+#include <runtime/JSCJSValueInlines.h>
+#include <runtime/JSCellInlines.h>
+#include <runtime/StructureInlines.h>
+#include <runtime/VM.h>
+
+namespace WebCore {
+
+const JSC::ConstructAbility s_guardedInternalBuiltinIsReadableStreamLockedCodeConstructAbility = JSC::ConstructAbility::CannotConstruct;
+const int s_guardedInternalBuiltinIsReadableStreamLockedCodeLength = 71;
+const char* s_guardedInternalBuiltinIsReadableStreamLockedCode =
+ "(function (stream)\n" \
+ "{\n" \
+ " \"use strict\";\n" \
+ "\n" \
+ " return !!stream.@reader;\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().guardedInternalBuiltinBuiltins().codeName##Executable()->link(vm, clientData->builtinFunctions().guardedInternalBuiltinBuiltins().codeName##Source()); \
+}
+WEBCORE_FOREACH_GUARDEDINTERNALBUILTIN_BUILTIN_CODE(DEFINE_BUILTIN_GENERATOR)
+#undef DEFINE_BUILTIN_GENERATOR
+
+
+} // namespace WebCore
+
+#endif // ENABLE(STREAMS_API)
+
+### End File: GuardedInternalBuiltinBuiltins.cpp
Modified: trunk/Source/_javascript_Core/Scripts/tests/builtins/expected/WebCore-UnguardedBuiltin-Separate.js-result (191841 => 191842)
--- trunk/Source/_javascript_Core/Scripts/tests/builtins/expected/WebCore-UnguardedBuiltin-Separate.js-result 2015-10-31 15:37:03 UTC (rev 191841)
+++ trunk/Source/_javascript_Core/Scripts/tests/builtins/expected/WebCore-UnguardedBuiltin-Separate.js-result 2015-10-31 16:52:39 UTC (rev 191842)
@@ -32,6 +32,9 @@
#define UnguardedBuiltinBuiltins_h
#include <builtins/BuiltinUtils.h>
+#include <bytecode/UnlinkedFunctionExecutable.h>
+#include <runtime/Identifier.h>
+#include <runtime/JSFunction.h>
namespace JSC {
class FunctionExecutable;
@@ -63,120 +66,6 @@
#define WEBCORE_BUILTIN_UNGUARDEDBUILTIN_EXISTS(object, func) defined WEBCORE_BUILTIN_ ## object ## _ ## func
-} // namespace WebCore
-
-#endif // UnguardedBuiltinBuiltins_h
-
-### End File: UnguardedBuiltinBuiltins.h
-
-### Begin File: UnguardedBuiltinBuiltins.cpp
-/*
- * Copyright (c) 2015 Canon 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 "UnguardedBuiltinBuiltins.h"
-
-#include "WebCoreJSClientData.h"
-#include <runtime/Executable.h>
-#include <runtime/JSCJSValueInlines.h>
-#include <runtime/JSCellInlines.h>
-#include <runtime/StructureInlines.h>
-#include <runtime/VM.h>
-
-namespace WebCore {
-
-const JSC::ConstructAbility s_unguardedBuiltinIsReadableStreamLockedCodeConstructAbility = JSC::ConstructAbility::CannotConstruct;
-const int s_unguardedBuiltinIsReadableStreamLockedCodeLength = 71;
-const char* s_unguardedBuiltinIsReadableStreamLockedCode =
- "(function (stream)\n" \
- "{\n" \
- " \"use strict\";\n" \
- "\n" \
- " return !!stream.@reader;\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().unguardedBuiltinBuiltins().codeName##Executable()->link(vm, clientData->builtinFunctions().unguardedBuiltinBuiltins().codeName##Source()); \
-}
-WEBCORE_FOREACH_UNGUARDEDBUILTIN_BUILTIN_CODE(DEFINE_BUILTIN_GENERATOR)
-#undef DEFINE_BUILTIN_GENERATOR
-
-
-} // namespace WebCore
-### End File: UnguardedBuiltinBuiltins.cpp
-
-### Begin File: UnguardedBuiltinBuiltinsWrapper.h
-/*
- * Copyright (c) 2015 Canon 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
-
-#ifndef UnguardedBuiltinBuiltinsWrapper_h
-#define UnguardedBuiltinBuiltinsWrapper_h
-
-#include "UnguardedBuiltinBuiltins.h"
-#include <builtins/BuiltinUtils.h>
-#include <bytecode/UnlinkedFunctionExecutable.h>
-#include <runtime/Identifier.h>
-#include <runtime/JSFunction.h>
-
-namespace WebCore {
-
class UnguardedBuiltinBuiltinsWrapper : private JSC::WeakHandleOwner {
public:
explicit UnguardedBuiltinBuiltinsWrapper(JSC::VM* vm)
@@ -262,6 +151,73 @@
} // namespace WebCore
-#endif // UnguardedBuiltinBuiltinsWrapper_h
+#endif // UnguardedBuiltinBuiltins_h
-### End File: UnguardedBuiltinBuiltinsWrapper.h
+### End File: UnguardedBuiltinBuiltins.h
+
+### Begin File: UnguardedBuiltinBuiltins.cpp
+/*
+ * Copyright (c) 2015 Canon 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 "UnguardedBuiltinBuiltins.h"
+
+#include "WebCoreJSClientData.h"
+#include <runtime/Executable.h>
+#include <runtime/JSCJSValueInlines.h>
+#include <runtime/JSCellInlines.h>
+#include <runtime/StructureInlines.h>
+#include <runtime/VM.h>
+
+namespace WebCore {
+
+const JSC::ConstructAbility s_unguardedBuiltinIsReadableStreamLockedCodeConstructAbility = JSC::ConstructAbility::CannotConstruct;
+const int s_unguardedBuiltinIsReadableStreamLockedCodeLength = 71;
+const char* s_unguardedBuiltinIsReadableStreamLockedCode =
+ "(function (stream)\n" \
+ "{\n" \
+ " \"use strict\";\n" \
+ "\n" \
+ " return !!stream.@reader;\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().unguardedBuiltinBuiltins().codeName##Executable()->link(vm, clientData->builtinFunctions().unguardedBuiltinBuiltins().codeName##Source()); \
+}
+WEBCORE_FOREACH_UNGUARDEDBUILTIN_BUILTIN_CODE(DEFINE_BUILTIN_GENERATOR)
+#undef DEFINE_BUILTIN_GENERATOR
+
+
+} // namespace WebCore
+### End File: UnguardedBuiltinBuiltins.cpp
Modified: trunk/Source/_javascript_Core/Scripts/tests/builtins/expected/WebCore-xmlCasingTest-Separate.js-result (191841 => 191842)
--- trunk/Source/_javascript_Core/Scripts/tests/builtins/expected/WebCore-xmlCasingTest-Separate.js-result 2015-10-31 15:37:03 UTC (rev 191841)
+++ trunk/Source/_javascript_Core/Scripts/tests/builtins/expected/WebCore-xmlCasingTest-Separate.js-result 2015-10-31 16:52:39 UTC (rev 191842)
@@ -34,6 +34,9 @@
#if ENABLE(STREAMS_API)
#include <builtins/BuiltinUtils.h>
+#include <bytecode/UnlinkedFunctionExecutable.h>
+#include <runtime/Identifier.h>
+#include <runtime/JSFunction.h>
namespace JSC {
class FunctionExecutable;
@@ -79,6 +82,89 @@
#define WEBCORE_BUILTIN_XMLCASINGTEST_EXISTS(object, func) defined WEBCORE_BUILTIN_ ## object ## _ ## func
+class xmlCasingTestBuiltinsWrapper : private JSC::WeakHandleOwner {
+public:
+ explicit xmlCasingTestBuiltinsWrapper(JSC::VM* vm)
+ : m_vm(*vm)
+ WEBCORE_FOREACH_XMLCASINGTEST_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_XMLCASINGTEST_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_XMLCASINGTEST_BUILTIN_CODE(EXPOSE_BUILTIN_EXECUTABLES)
+#undef EXPOSE_BUILTIN_EXECUTABLES
+
+ WEBCORE_FOREACH_XMLCASINGTEST_BUILTIN_FUNCTION_NAME(DECLARE_BUILTIN_IDENTIFIER_ACCESSOR)
+
+ void exportNames();
+
+private:
+ JSC::VM& m_vm;
+
+ WEBCORE_FOREACH_XMLCASINGTEST_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_XMLCASINGTEST_BUILTIN_CODE(DECLARE_BUILTIN_SOURCE_MEMBERS)
+#undef DECLARE_BUILTIN_SOURCE_MEMBERS
+
+};
+
+#define DEFINE_BUILTIN_EXECUTABLES(name, functionName, length) \
+inline JSC::UnlinkedFunctionExecutable* xmlCasingTestBuiltinsWrapper::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_XMLCASINGTEST_BUILTIN_CODE(DEFINE_BUILTIN_EXECUTABLES)
+#undef DEFINE_BUILTIN_EXECUTABLES
+
+inline void xmlCasingTestBuiltinsWrapper::exportNames()
+{
+#define EXPORT_FUNCTION_NAME(name) m_vm.propertyNames->appendExternalName(name##PublicName(), name##PrivateName());
+ WEBCORE_FOREACH_XMLCASINGTEST_BUILTIN_FUNCTION_NAME(EXPORT_FUNCTION_NAME)
+#undef EXPORT_FUNCTION_NAME
+}
+
+class xmlCasingTestBuiltinFunctions {
+public:
+ explicit xmlCasingTestBuiltinFunctions(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_XMLCASINGTEST_BUILTIN_FUNCTION_NAME(DECLARE_BUILTIN_SOURCE_MEMBERS)
+#undef DECLARE_BUILTIN_SOURCE_MEMBERS
+};
+
+inline void xmlCasingTestBuiltinFunctions::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_XMLCASINGTEST_BUILTIN_CODE(EXPORT_FUNCTION)
+#undef EXPORT_FUNCTION
+}
+
+inline void xmlCasingTestBuiltinFunctions::visit(JSC::SlotVisitor& visitor)
+{
+#define VISIT_FUNCTION(name) visitor.append(&m_##name##Function);
+ WEBCORE_FOREACH_XMLCASINGTEST_BUILTIN_FUNCTION_NAME(VISIT_FUNCTION)
+#undef VISIT_FUNCTION
+}
+
+
} // namespace WebCore
#endif // ENABLE(STREAMS_API)
@@ -195,137 +281,3 @@
#endif // ENABLE(STREAMS_API)
### End File: xmlCasingTestBuiltins.cpp
-
-### Begin File: xmlCasingTestBuiltinsWrapper.h
-/*
- * Copyright (c) 2015 Canon 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
-
-#ifndef xmlCasingTestBuiltinsWrapper_h
-#define xmlCasingTestBuiltinsWrapper_h
-
-#if ENABLE(STREAMS_API)
-
-#include "xmlCasingTestBuiltins.h"
-#include <builtins/BuiltinUtils.h>
-#include <bytecode/UnlinkedFunctionExecutable.h>
-#include <runtime/Identifier.h>
-#include <runtime/JSFunction.h>
-
-namespace WebCore {
-
-class xmlCasingTestBuiltinsWrapper : private JSC::WeakHandleOwner {
-public:
- explicit xmlCasingTestBuiltinsWrapper(JSC::VM* vm)
- : m_vm(*vm)
- WEBCORE_FOREACH_XMLCASINGTEST_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_XMLCASINGTEST_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_XMLCASINGTEST_BUILTIN_CODE(EXPOSE_BUILTIN_EXECUTABLES)
-#undef EXPOSE_BUILTIN_EXECUTABLES
-
- WEBCORE_FOREACH_XMLCASINGTEST_BUILTIN_FUNCTION_NAME(DECLARE_BUILTIN_IDENTIFIER_ACCESSOR)
-
- void exportNames();
-
-private:
- JSC::VM& m_vm;
-
- WEBCORE_FOREACH_XMLCASINGTEST_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_XMLCASINGTEST_BUILTIN_CODE(DECLARE_BUILTIN_SOURCE_MEMBERS)
-#undef DECLARE_BUILTIN_SOURCE_MEMBERS
-
-};
-
-#define DEFINE_BUILTIN_EXECUTABLES(name, functionName, length) \
-inline JSC::UnlinkedFunctionExecutable* xmlCasingTestBuiltinsWrapper::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_XMLCASINGTEST_BUILTIN_CODE(DEFINE_BUILTIN_EXECUTABLES)
-#undef DEFINE_BUILTIN_EXECUTABLES
-
-inline void xmlCasingTestBuiltinsWrapper::exportNames()
-{
-#define EXPORT_FUNCTION_NAME(name) m_vm.propertyNames->appendExternalName(name##PublicName(), name##PrivateName());
- WEBCORE_FOREACH_XMLCASINGTEST_BUILTIN_FUNCTION_NAME(EXPORT_FUNCTION_NAME)
-#undef EXPORT_FUNCTION_NAME
-}
-
-class xmlCasingTestBuiltinFunctions {
-public:
- explicit xmlCasingTestBuiltinFunctions(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_XMLCASINGTEST_BUILTIN_FUNCTION_NAME(DECLARE_BUILTIN_SOURCE_MEMBERS)
-#undef DECLARE_BUILTIN_SOURCE_MEMBERS
-};
-
-inline void xmlCasingTestBuiltinFunctions::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_XMLCASINGTEST_BUILTIN_CODE(EXPORT_FUNCTION)
-#undef EXPORT_FUNCTION
-}
-
-inline void xmlCasingTestBuiltinFunctions::visit(JSC::SlotVisitor& visitor)
-{
-#define VISIT_FUNCTION(name) visitor.append(&m_##name##Function);
- WEBCORE_FOREACH_XMLCASINGTEST_BUILTIN_FUNCTION_NAME(VISIT_FUNCTION)
-#undef VISIT_FUNCTION
-}
-
-
-} // namespace WebCore
-
-#endif // ENABLE(STREAMS_API)
-
-#endif // xmlCasingTestBuiltinsWrapper_h
-
-### End File: xmlCasingTestBuiltinsWrapper.h
Modified: trunk/Source/WebCore/CMakeLists.txt (191841 => 191842)
--- trunk/Source/WebCore/CMakeLists.txt 2015-10-31 15:37:03 UTC (rev 191841)
+++ trunk/Source/WebCore/CMakeLists.txt 2015-10-31 16:52:39 UTC (rev 191842)
@@ -3607,7 +3607,6 @@
${_javascript_Core_SCRIPTS_DIR}/builtins_generate_combined_implementation.py
${_javascript_Core_SCRIPTS_DIR}/builtins_generate_separate_header.py
${_javascript_Core_SCRIPTS_DIR}/builtins_generate_separate_implementation.py
- ${_javascript_Core_SCRIPTS_DIR}/builtins_generate_separate_wrapper.py
${_javascript_Core_SCRIPTS_DIR}/generate-js-builtins.py
${_javascript_Core_SCRIPTS_DIR}/lazywriter.py
)
@@ -3617,14 +3616,12 @@
add_custom_command(
OUTPUT ${DERIVED_SOURCES_WEBCORE_DIR}/${_objectName}Builtins.cpp
${DERIVED_SOURCES_WEBCORE_DIR}/${_objectName}Builtins.h
- ${DERIVED_SOURCES_WEBCORE_DIR}/${_objectName}BuiltinsWrapper.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_SOURCES
${DERIVED_SOURCES_WEBCORE_DIR}/${_objectName}Builtins.h
- ${DERIVED_SOURCES_WEBCORE_DIR}/${_objectName}BuiltinsWrapper.h
)
ADD_SOURCE_WEBCORE_DERIVED_DEPENDENCIES(${WEBCORE_DIR}/bindings/js/WebCoreJSBuiltins.cpp ${_objectName}Builtins.cpp)
endforeach ()
Modified: trunk/Source/WebCore/ChangeLog (191841 => 191842)
--- trunk/Source/WebCore/ChangeLog 2015-10-31 15:37:03 UTC (rev 191841)
+++ trunk/Source/WebCore/ChangeLog 2015-10-31 16:52:39 UTC (rev 191842)
@@ -1,3 +1,18 @@
+2015-10-31 Brian Burg <[email protected]>
+
+ Builtins generator should put WebCore-only wrappers in the per-builtin header
+ https://bugs.webkit.org/show_bug.cgi?id=150539
+
+ Reviewed by Youenn Fablet.
+
+ Fix includes of removed XXXWrapper.h headers.
+
+ * CMakeLists.txt:
+ * DerivedSources.make:
+ * WebCore.xcodeproj/project.pbxproj:
+ * bindings/js/WebCoreJSBuiltinInternals.h:
+ * bindings/js/WebCoreJSBuiltins.h:
+
2015-10-31 Yusuke Suzuki <[email protected]>
Add the support for Symbol attributes on IDL
Modified: trunk/Source/WebCore/DerivedSources.make (191841 => 191842)
--- trunk/Source/WebCore/DerivedSources.make 2015-10-31 15:37:03 UTC (rev 191841)
+++ trunk/Source/WebCore/DerivedSources.make 2015-10-31 16:52:39 UTC (rev 191842)
@@ -1277,7 +1277,6 @@
$(_javascript_Core_SCRIPTS_DIR)/builtins_generate_combined_implementation.py \
$(_javascript_Core_SCRIPTS_DIR)/builtins_generate_separate_header.py \
$(_javascript_Core_SCRIPTS_DIR)/builtins_generate_separate_implementation.py \
- $(_javascript_Core_SCRIPTS_DIR)/builtins_generate_separate_wrapper.py \
$(_javascript_Core_SCRIPTS_DIR)/generate-js-builtins.py \
$(_javascript_Core_SCRIPTS_DIR)/lazywriter.py \
#
Modified: trunk/Source/WebCore/WebCore.xcodeproj/project.pbxproj (191841 => 191842)
--- trunk/Source/WebCore/WebCore.xcodeproj/project.pbxproj 2015-10-31 15:37:03 UTC (rev 191841)
+++ trunk/Source/WebCore/WebCore.xcodeproj/project.pbxproj 2015-10-31 16:52:39 UTC (rev 191842)
@@ -1515,9 +1515,6 @@
416E6FE81BBD12DF000A6053 /* WritableStreamInternalsBuiltins.h in Headers */ = {isa = PBXBuildFile; fileRef = 9B03D8061BB3110D00B764E9 /* WritableStreamInternalsBuiltins.h */; settings = {ATTRIBUTES = (Private, ); }; };
416E6FE91BBD12E5000A6043 /* ReadableStreamBuiltins.h in Headers */ = {isa = PBXBuildFile; fileRef = 9B03D8061BB3110D00B764D8 /* ReadableStreamBuiltins.h */; settings = {ATTRIBUTES = (Private, ); }; };
416E6FE91BBD12E5000A6053 /* WritableStreamBuiltins.h in Headers */ = {isa = PBXBuildFile; fileRef = 9B03D8061BB3110D00B764E8 /* WritableStreamBuiltins.h */; settings = {ATTRIBUTES = (Private, ); }; };
- 416E6FEA1BBD1684000A6034 /* StreamInternalsBuiltinsWrapper.h in Headers */ = {isa = PBXBuildFile; fileRef = 9B03D8071BB3110D00B764CA /* StreamInternalsBuiltinsWrapper.h */; settings = {ATTRIBUTES = (Private, ); }; };
- 416E6FEA1BBD1684000A6044 /* ReadableStreamInternalsBuiltinsWrapper.h in Headers */ = {isa = PBXBuildFile; fileRef = 9B03D8071BB3110D00B764DA /* ReadableStreamInternalsBuiltinsWrapper.h */; settings = {ATTRIBUTES = (Private, ); }; };
- 416E6FEA1BBD1684000A6054 /* WritableStreamInternalsBuiltinsWrapper.h in Headers */ = {isa = PBXBuildFile; fileRef = 9B03D8071BB3110D00B764EA /* WritableStreamInternalsBuiltinsWrapper.h */; settings = {ATTRIBUTES = (Private, ); }; };
417253AA1354BBBC00360F2A /* MediaControlElements.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 417253A81354BBBC00360F2A /* MediaControlElements.cpp */; };
417253AB1354BBBC00360F2A /* MediaControlElements.h in Headers */ = {isa = PBXBuildFile; fileRef = 417253A91354BBBC00360F2A /* MediaControlElements.h */; };
417DA6D913734E6E007C57FB /* Internals.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 417DA4CF13734326007C57FB /* Internals.cpp */; };
@@ -11388,22 +11385,18 @@
9908B0F11BCACF9100ED0F75 /* WritableStreamInternals.js */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode._javascript_; path = WritableStreamInternals.js; sourceTree = "<group>"; };
9908B0F21BCACF9100ED0F65 /* ReadableStreamReader.js */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode._javascript_; path = ReadableStreamReader.js; sourceTree = "<group>"; };
9908B0F31BCACFFE00ED0F65 /* ByteLengthQueuingStrategyBuiltins.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = ByteLengthQueuingStrategyBuiltins.cpp; sourceTree = "<group>"; };
- 9908B0F41BCACFFE00ED0F65 /* ByteLengthQueuingStrategyBuiltinsWrapper.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ByteLengthQueuingStrategyBuiltinsWrapper.h; sourceTree = "<group>"; };
9908B0F51BCAD07D00ED0F65 /* ByteLengthQueuingStrategyBuiltins.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ByteLengthQueuingStrategyBuiltins.h; sourceTree = "<group>"; };
9908B0F61BCAD07D00ED0F65 /* CountQueuingStrategyBuiltins.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = CountQueuingStrategyBuiltins.cpp; sourceTree = "<group>"; };
9908B0F71BCAD07D00ED0F65 /* CountQueuingStrategyBuiltins.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CountQueuingStrategyBuiltins.h; sourceTree = "<group>"; };
- 9908B0F81BCAD07D00ED0F65 /* CountQueuingStrategyBuiltinsWrapper.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CountQueuingStrategyBuiltinsWrapper.h; sourceTree = "<group>"; };
9908B0F91BCAD07D00ED0F65 /* ReadableStreamBuiltins.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = ReadableStreamBuiltins.cpp; sourceTree = "<group>"; };
9908B0F91BCAD07D00ED0F75 /* WritableStreamBuiltins.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = WritableStreamBuiltins.cpp; sourceTree = "<group>"; };
9908B0FA1BCAD07D00ED0F65 /* ReadableStreamControllerBuiltins.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = ReadableStreamControllerBuiltins.cpp; sourceTree = "<group>"; };
9908B0FB1BCAD07D00ED0F65 /* ReadableStreamControllerBuiltins.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ReadableStreamControllerBuiltins.h; sourceTree = "<group>"; };
- 9908B0FC1BCAD07D00ED0F65 /* ReadableStreamControllerBuiltinsWrapper.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ReadableStreamControllerBuiltinsWrapper.h; sourceTree = "<group>"; };
9908B0FD1BCAD07D00ED0F55 /* StreamInternalsBuiltins.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = StreamInternalsBuiltins.cpp; sourceTree = "<group>"; };
9908B0FD1BCAD07D00ED0F65 /* ReadableStreamInternalsBuiltins.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = ReadableStreamInternalsBuiltins.cpp; sourceTree = "<group>"; };
9908B0FD1BCAD07D00ED0F75 /* WritableStreamInternalsBuiltins.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = WritableStreamInternalsBuiltins.cpp; sourceTree = "<group>"; };
9908B0FE1BCAD07D00ED0F65 /* ReadableStreamReaderBuiltins.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = ReadableStreamReaderBuiltins.cpp; sourceTree = "<group>"; };
9908B0FF1BCAD07D00ED0F65 /* ReadableStreamReaderBuiltins.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ReadableStreamReaderBuiltins.h; sourceTree = "<group>"; };
- 9908B1001BCAD07D00ED0F65 /* ReadableStreamReaderBuiltinsWrapper.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ReadableStreamReaderBuiltinsWrapper.h; sourceTree = "<group>"; };
9920398018B95BC600B39AF9 /* UserInputBridge.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = UserInputBridge.cpp; sourceTree = "<group>"; };
9920398118B95BC600B39AF9 /* UserInputBridge.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = UserInputBridge.h; sourceTree = "<group>"; };
9994E5D81BD843A300F2D835 /* MediaDevices.js */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode._javascript_; path = MediaDevices.js; sourceTree = "<group>"; };
@@ -11446,11 +11439,6 @@
9B03D8061BB3110D00B764D9 /* ReadableStreamInternalsBuiltins.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ReadableStreamInternalsBuiltins.h; sourceTree = "<group>"; };
9B03D8061BB3110D00B764E8 /* WritableStreamBuiltins.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WritableStreamBuiltins.h; sourceTree = "<group>"; };
9B03D8061BB3110D00B764E9 /* WritableStreamInternalsBuiltins.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WritableStreamInternalsBuiltins.h; sourceTree = "<group>"; };
- 9B03D8071BB3110D00B764CA /* StreamInternalsBuiltinsWrapper.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = StreamInternalsBuiltinsWrapper.h; sourceTree = "<group>"; };
- 9B03D8071BB3110D00B764D8 /* ReadableStreamBuiltinsWrapper.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ReadableStreamBuiltinsWrapper.h; sourceTree = "<group>"; };
- 9B03D8071BB3110D00B764DA /* ReadableStreamInternalsBuiltinsWrapper.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ReadableStreamInternalsBuiltinsWrapper.h; sourceTree = "<group>"; };
- 9B03D8071BB3110D00B764E8 /* WritableStreamBuiltinsWrapper.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WritableStreamBuiltinsWrapper.h; sourceTree = "<group>"; };
- 9B03D8071BB3110D00B764EA /* WritableStreamInternalsBuiltinsWrapper.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WritableStreamInternalsBuiltinsWrapper.h; sourceTree = "<group>"; };
9B19B67E1B964E5200348745 /* ShadowRoot.idl */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = ShadowRoot.idl; sourceTree = "<group>"; };
9B1AB0791648C69D0051F3F2 /* HTMLFormControlsCollection.idl */ = {isa = PBXFileReference; lastKnownFileType = text; path = HTMLFormControlsCollection.idl; sourceTree = "<group>"; };
9B1AB07B1648C7C40051F3F2 /* JSHTMLFormControlsCollectionCustom.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = JSHTMLFormControlsCollectionCustom.cpp; sourceTree = "<group>"; };
@@ -17196,12 +17184,10 @@
children = (
9908B0F31BCACFFE00ED0F65 /* ByteLengthQueuingStrategyBuiltins.cpp */,
9908B0F51BCAD07D00ED0F65 /* ByteLengthQueuingStrategyBuiltins.h */,
- 9908B0F41BCACFFE00ED0F65 /* ByteLengthQueuingStrategyBuiltinsWrapper.h */,
656581AC09D14EE6000E61D7 /* CharsetData.cpp */,
E406F3FB1198307D009D59D6 /* ColorData.cpp */,
9908B0F61BCAD07D00ED0F65 /* CountQueuingStrategyBuiltins.cpp */,
9908B0F71BCAD07D00ED0F65 /* CountQueuingStrategyBuiltins.h */,
- 9908B0F81BCAD07D00ED0F65 /* CountQueuingStrategyBuiltinsWrapper.h */,
6565814409D13043000E61D7 /* CSSGrammar.cpp */,
650F53DB09D15DDA00C9B0C8 /* CSSGrammar.h */,
E41EA038119836DB00710BC5 /* CSSPropertyNames.cpp */,
@@ -17254,16 +17240,12 @@
71E2183917359FB8006E6E4D /* PlugInsResourcesData.cpp */,
9908B0F91BCAD07D00ED0F65 /* ReadableStreamBuiltins.cpp */,
9B03D8061BB3110D00B764D8 /* ReadableStreamBuiltins.h */,
- 9B03D8071BB3110D00B764D8 /* ReadableStreamBuiltinsWrapper.h */,
9908B0FA1BCAD07D00ED0F65 /* ReadableStreamControllerBuiltins.cpp */,
9908B0FB1BCAD07D00ED0F65 /* ReadableStreamControllerBuiltins.h */,
- 9908B0FC1BCAD07D00ED0F65 /* ReadableStreamControllerBuiltinsWrapper.h */,
9908B0FD1BCAD07D00ED0F65 /* ReadableStreamInternalsBuiltins.cpp */,
9B03D8061BB3110D00B764D9 /* ReadableStreamInternalsBuiltins.h */,
- 9B03D8071BB3110D00B764DA /* ReadableStreamInternalsBuiltinsWrapper.h */,
9908B0FE1BCAD07D00ED0F65 /* ReadableStreamReaderBuiltins.cpp */,
9908B0FF1BCAD07D00ED0F65 /* ReadableStreamReaderBuiltins.h */,
- 9908B1001BCAD07D00ED0F65 /* ReadableStreamReaderBuiltinsWrapper.h */,
43B85ED218CBEC5200E31AF4 /* SelectorPseudoClassAndCompatibilityElementMap.cpp */,
43B85ED318CBEC5200E31AF4 /* SelectorPseudoClassAndCompatibilityElementMap.gperf */,
26AA0F9D18D2A18B00419381 /* SelectorPseudoElementTypeMap.cpp */,
@@ -17271,7 +17253,6 @@
53EF766A16530A61004CBE49 /* SettingsMacros.h */,
9908B0FD1BCAD07D00ED0F55 /* StreamInternalsBuiltins.cpp */,
9B03D8061BB3110D00B764C9 /* StreamInternalsBuiltins.h */,
- 9B03D8071BB3110D00B764CA /* StreamInternalsBuiltinsWrapper.h */,
8386A96E19F61E4F00E1EC4A /* StyleBuilder.cpp */,
83C05A581A686212007E5DEA /* StylePropertyShorthandFunctions.cpp */,
83C05A591A686212007E5DEA /* StylePropertyShorthandFunctions.h */,
@@ -17290,10 +17271,8 @@
99CC0B6918BEA1FF006CEBCC /* WebReplayInputs.h */,
9908B0F91BCAD07D00ED0F75 /* WritableStreamBuiltins.cpp */,
9B03D8061BB3110D00B764E8 /* WritableStreamBuiltins.h */,
- 9B03D8071BB3110D00B764E8 /* WritableStreamBuiltinsWrapper.h */,
9908B0FD1BCAD07D00ED0F75 /* WritableStreamInternalsBuiltins.cpp */,
9B03D8061BB3110D00B764E9 /* WritableStreamInternalsBuiltins.h */,
- 9B03D8071BB3110D00B764EA /* WritableStreamInternalsBuiltinsWrapper.h */,
656581EA09D1508D000E61D7 /* XLinkNames.cpp */,
656581EB09D1508D000E61D7 /* XLinkNames.h */,
A833C80A0A2CF25600D57664 /* XMLNames.cpp */,
@@ -26913,7 +26892,6 @@
A84D827C11D333ED00972990 /* RawDataDocumentParser.h in Headers */,
416E6FE91BBD12E5000A6043 /* ReadableStreamBuiltins.h in Headers */,
416E6FE81BBD12DF000A6043 /* ReadableStreamInternalsBuiltins.h in Headers */,
- 416E6FEA1BBD1684000A6044 /* ReadableStreamInternalsBuiltinsWrapper.h in Headers */,
FD31603C12B0267600C1A359 /* RealtimeAnalyser.h in Headers */,
4A4F65711AA997F100E38CDD /* RealtimeMediaSource.h in Headers */,
4A4F65721AA997F100E38CDD /* RealtimeMediaSourceCapabilities.h in Headers */,
@@ -27346,7 +27324,6 @@
C50D0E830FF4272900AC2644 /* StorageNamespace.h in Headers */,
1A37636C1A2E68BB009A7EE2 /* StorageNamespaceProvider.h in Headers */,
416E6FE81BBD12DF000A6033 /* StreamInternalsBuiltins.h in Headers */,
- 416E6FEA1BBD1684000A6034 /* StreamInternalsBuiltinsWrapper.h in Headers */,
81AC6C36131C57D30009A7E0 /* StringCallback.h in Headers */,
B23540F30D00782E002382FA /* StringTruncator.h in Headers */,
9B6C41531344949000085B62 /* StringWithDirection.h in Headers */,
@@ -28028,7 +28005,6 @@
93309E24099E64920056E581 /* WrapContentsInDummySpanCommand.h in Headers */,
416E6FE91BBD12E5000A6053 /* WritableStreamBuiltins.h in Headers */,
416E6FE81BBD12DF000A6053 /* WritableStreamInternalsBuiltins.h in Headers */,
- 416E6FEA1BBD1684000A6054 /* WritableStreamInternalsBuiltinsWrapper.h in Headers */,
9BAF3B2412C1A39800014BF1 /* WritingDirection.h in Headers */,
14476AA815DC4BB100305DB2 /* WritingMode.h in Headers */,
6565820209D1508D000E61D7 /* XLinkNames.h in Headers */,
Modified: trunk/Source/WebCore/bindings/js/WebCoreJSBuiltinInternals.h (191841 => 191842)
--- trunk/Source/WebCore/bindings/js/WebCoreJSBuiltinInternals.h 2015-10-31 15:37:03 UTC (rev 191841)
+++ trunk/Source/WebCore/bindings/js/WebCoreJSBuiltinInternals.h 2015-10-31 16:52:39 UTC (rev 191842)
@@ -28,9 +28,9 @@
#define WebCoreJSBuiltinInternals_h
#if ENABLE(STREAMS_API)
-#include "ReadableStreamInternalsBuiltinsWrapper.h"
-#include "StreamInternalsBuiltinsWrapper.h"
-#include "WritableStreamInternalsBuiltinsWrapper.h"
+#include "ReadableStreamInternalsBuiltins.h"
+#include "StreamInternalsBuiltins.h"
+#include "WritableStreamInternalsBuiltins.h"
#endif
namespace WebCore {
Modified: trunk/Source/WebCore/bindings/js/WebCoreJSBuiltins.h (191841 => 191842)
--- trunk/Source/WebCore/bindings/js/WebCoreJSBuiltins.h 2015-10-31 15:37:03 UTC (rev 191841)
+++ trunk/Source/WebCore/bindings/js/WebCoreJSBuiltins.h 2015-10-31 16:52:39 UTC (rev 191842)
@@ -28,19 +28,19 @@
#define WebCoreJSBuiltins_h
#if ENABLE(MEDIA_STREAM)
-#include "MediaDevicesBuiltinsWrapper.h"
+#include "MediaDevicesBuiltins.h"
#endif
#if ENABLE(STREAMS_API)
-#include "ByteLengthQueuingStrategyBuiltinsWrapper.h"
-#include "CountQueuingStrategyBuiltinsWrapper.h"
-#include "ReadableStreamBuiltinsWrapper.h"
-#include "ReadableStreamControllerBuiltinsWrapper.h"
-#include "ReadableStreamInternalsBuiltinsWrapper.h"
-#include "ReadableStreamReaderBuiltinsWrapper.h"
-#include "StreamInternalsBuiltinsWrapper.h"
-#include "WritableStreamBuiltinsWrapper.h"
-#include "WritableStreamInternalsBuiltinsWrapper.h"
+#include "ByteLengthQueuingStrategyBuiltins.h"
+#include "CountQueuingStrategyBuiltins.h"
+#include "ReadableStreamBuiltins.h"
+#include "ReadableStreamControllerBuiltins.h"
+#include "ReadableStreamInternalsBuiltins.h"
+#include "ReadableStreamReaderBuiltins.h"
+#include "StreamInternalsBuiltins.h"
+#include "WritableStreamBuiltins.h"
+#include "WritableStreamInternalsBuiltins.h"
#endif
#include <runtime/VM.h>
