@@ -1,3 +1,24 @@
+2020-07-03  Fujii Hironori  <Hironori.Fujii@sony.com>
+
+        Builtin internal wrapper implementation files wrap static global initialization code with incorrect guards
+        https://bugs.webkit.org/show_bug.cgi?id=213792
+
+        Reviewed by Youenn Fablet.
+
+        Streams API hadn't worked since r263700 for AppleWin and WinCairo
+        ports. r263700 removed the unused ENABLE_STREAMS_API.
+
+        Before r263700, the static global initialization code was wrapped
+        by "ENABLE(WEB_RTC) || ENABLE(STREAMS_API)". After r263700, it was
+        wrapped by "ENABLE(WEB_RTC)". AppleWin and WinCairo doesn't turn
+        on ENABLE_WEB_RTC. So, builtins for Streams API weren't properly
+        initialized for them.
+
+        * Scripts/tests/builtins/expected/WebCoreJSBuiltins.h-result: Rebaselined.
+        * Scripts/wkbuiltins/builtins_generate_internals_wrapper_implementation.py:
+        (BuiltinsInternalsWrapperImplementationGenerator.generate_initialize_method):
+        Removed calling wrap_with_guard for the value of _generate_initialize_static_globals().
+
 2020-07-02  Alex Christensen  <achristensen@webkit.org>
 
         Update Mac CMake build
 
@@ -313,7 +313,6 @@ void JSBuiltinInternalFunctions::initialize(JSDOMGlobalObject& globalObject)
     m_xmlCasingTest.init(globalObject);
 #endif // ENABLE(TEST_XML_CASTING_TEST_SEPARATE)
 
-#if ENABLE(TEST_GUARDED_INTERNAL_BUILTIN_SEPARATED_A) || ENABLE(TEST_GUARDED_INTERNAL_BUILTIN_SEPARATED_B) || ENABLE(FETCH_API) || ENABLE(TEST_XML_CASTING_TEST_SEPARATE)
     JSVMClientData& clientData = *static_cast<JSVMClientData*>(m_vm.clientData);
     JSDOMGlobalObject::GlobalPropertyInfo staticGlobals[] = {
 #if ENABLE(FETCH_API)
@@ -340,7 +339,6 @@ void JSBuiltinInternalFunctions::initialize(JSDOMGlobalObject& globalObject)
     };
     globalObject.addStaticGlobals(staticGlobals, WTF_ARRAY_LENGTH(staticGlobals));
     UNUSED_PARAM(clientData);
-#endif // ENABLE(TEST_GUARDED_INTERNAL_BUILTIN_SEPARATED_A) || ENABLE(TEST_GUARDED_INTERNAL_BUILTIN_SEPARATED_B) || ENABLE(FETCH_API) || ENABLE(TEST_XML_CASTING_TEST_SEPARATE)
 }
 
 } // namespace WebCore
 
@@ -149,8 +149,7 @@ def generate_initialize_method(self):
             lines.append(BuiltinsGenerator.wrap_with_guard(object.annotations.get('conditional'), init))
         lines.append("")
 
-        guards = set([object.annotations.get('conditional') for object in self.internals if 'conditional' in object.annotations])
-        lines.append(BuiltinsGenerator.wrap_with_guard(" || ".join(guards), self._generate_initialize_static_globals()))
+        lines.append(self._generate_initialize_static_globals())
 
         lines.append("}")
         return '\n'.join(lines)