Title: [213680] trunk/Source/_javascript_Core
- Revision
- 213680
- Author
- [email protected]
- Date
- 2017-03-09 15:14:20 -0800 (Thu, 09 Mar 2017)
Log Message
Minimal build is broken
https://bugs.webkit.org/show_bug.cgi?id=169416
Patch by Youenn Fablet <[email protected]> on 2017-03-09
Reviewed by Chris Dumez.
Since we now have some JS built-ins that are not tied to a compilation flag, we can remove compilation guards around m_vm.
We could probably remove m_vm by ensuring m_jsDOMBindingInternals appear first but this might break very easily.
* Scripts/builtins/builtins_generate_internals_wrapper_header.py:
(generate_members):
* Scripts/builtins/builtins_generate_internals_wrapper_implementation.py:
(BuiltinsInternalsWrapperImplementationGenerator.generate_constructor):
* Scripts/tests/builtins/expected/WebCoreJSBuiltins.h-result:
Modified Paths
Diff
Modified: trunk/Source/_javascript_Core/ChangeLog (213679 => 213680)
--- trunk/Source/_javascript_Core/ChangeLog 2017-03-09 22:49:45 UTC (rev 213679)
+++ trunk/Source/_javascript_Core/ChangeLog 2017-03-09 23:14:20 UTC (rev 213680)
@@ -1,3 +1,19 @@
+2017-03-09 Youenn Fablet <[email protected]>
+
+ Minimal build is broken
+ https://bugs.webkit.org/show_bug.cgi?id=169416
+
+ Reviewed by Chris Dumez.
+
+ Since we now have some JS built-ins that are not tied to a compilation flag, we can remove compilation guards around m_vm.
+ We could probably remove m_vm by ensuring m_jsDOMBindingInternals appear first but this might break very easily.
+
+ * Scripts/builtins/builtins_generate_internals_wrapper_header.py:
+ (generate_members):
+ * Scripts/builtins/builtins_generate_internals_wrapper_implementation.py:
+ (BuiltinsInternalsWrapperImplementationGenerator.generate_constructor):
+ * Scripts/tests/builtins/expected/WebCoreJSBuiltins.h-result:
+
2017-03-09 Daniel Bates <[email protected]>
Guard Credential Management implementation behind a runtime enabled feature flag
Modified: trunk/Source/_javascript_Core/Scripts/builtins/builtins_generate_internals_wrapper_header.py (213679 => 213680)
--- trunk/Source/_javascript_Core/Scripts/builtins/builtins_generate_internals_wrapper_header.py 2017-03-09 22:49:45 UTC (rev 213679)
+++ trunk/Source/_javascript_Core/Scripts/builtins/builtins_generate_internals_wrapper_header.py 2017-03-09 23:14:20 UTC (rev 213680)
@@ -106,8 +106,7 @@
return '\n'.join(lines)
def generate_members(self):
- guards = set([object.annotations.get('conditional') for object in self.internals if 'conditional' in object.annotations])
- lines = [BuiltinsGenerator.wrap_with_guard(" || ".join(guards), " JSC::VM& m_vm;")]
+ lines = [" JSC::VM& m_vm;"]
for object in self.internals:
member = " %s %s;" % (self.member_type(object), self.member_name(object))
lines.append(BuiltinsGenerator.wrap_with_guard(object.annotations.get('conditional'), member))
Modified: trunk/Source/_javascript_Core/Scripts/builtins/builtins_generate_internals_wrapper_implementation.py (213679 => 213680)
--- trunk/Source/_javascript_Core/Scripts/builtins/builtins_generate_internals_wrapper_implementation.py 2017-03-09 22:49:45 UTC (rev 213679)
+++ trunk/Source/_javascript_Core/Scripts/builtins/builtins_generate_internals_wrapper_implementation.py 2017-03-09 23:14:20 UTC (rev 213680)
@@ -101,7 +101,7 @@
def generate_constructor(self):
guards = set([object.annotations.get('conditional') for object in self.internals if 'conditional' in object.annotations])
lines = ["JSBuiltinInternalFunctions::JSBuiltinInternalFunctions(JSC::VM& vm)",
- BuiltinsGenerator.wrap_with_guard(" || ".join(guards), " : m_vm(vm)")]
+ " : m_vm(vm)"]
for object in self.internals:
initializer = " , %s(m_vm)" % self.member_name(object)
lines.append(BuiltinsGenerator.wrap_with_guard(object.annotations.get('conditional'), initializer))
Modified: trunk/Source/_javascript_Core/Scripts/tests/builtins/expected/WebCoreJSBuiltins.h-result (213679 => 213680)
--- trunk/Source/_javascript_Core/Scripts/tests/builtins/expected/WebCoreJSBuiltins.h-result 2017-03-09 22:49:45 UTC (rev 213679)
+++ trunk/Source/_javascript_Core/Scripts/tests/builtins/expected/WebCoreJSBuiltins.h-result 2017-03-09 23:14:20 UTC (rev 213680)
@@ -213,9 +213,7 @@
#endif // ENABLE(STREAMS_API)
private:
-#if ENABLE(FETCH_API) || ENABLE(READABLE_STREAM_API) || ENABLE(WRITABLE_STREAM_API) || ENABLE(STREAMS_API)
JSC::VM& m_vm;
-#endif // ENABLE(FETCH_API) || ENABLE(READABLE_STREAM_API) || ENABLE(WRITABLE_STREAM_API) || ENABLE(STREAMS_API)
#if ENABLE(FETCH_API)
AnotherGuardedInternalBuiltinBuiltinFunctions m_anotherGuardedInternalBuiltin;
#endif // ENABLE(FETCH_API)
@@ -274,9 +272,7 @@
namespace WebCore {
JSBuiltinInternalFunctions::JSBuiltinInternalFunctions(JSC::VM& vm)
-#if ENABLE(FETCH_API) || ENABLE(READABLE_STREAM_API) || ENABLE(WRITABLE_STREAM_API) || ENABLE(STREAMS_API)
: m_vm(vm)
-#endif // ENABLE(FETCH_API) || ENABLE(READABLE_STREAM_API) || ENABLE(WRITABLE_STREAM_API) || ENABLE(STREAMS_API)
#if ENABLE(FETCH_API)
, m_anotherGuardedInternalBuiltin(m_vm)
#endif // ENABLE(FETCH_API)
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
