Title: [200987] branches/safari-602.1.32-branch/Source/WebCore
- Revision
- 200987
- Author
- [email protected]
- Date
- 2016-05-16 18:17:56 -0700 (Mon, 16 May 2016)
Log Message
Merge r200985. <rdar://problem/26312967>
Modified Paths
Diff
Modified: branches/safari-602.1.32-branch/Source/WebCore/ChangeLog (200986 => 200987)
--- branches/safari-602.1.32-branch/Source/WebCore/ChangeLog 2016-05-17 01:09:27 UTC (rev 200986)
+++ branches/safari-602.1.32-branch/Source/WebCore/ChangeLog 2016-05-17 01:17:56 UTC (rev 200987)
@@ -1,3 +1,20 @@
+2016-05-16 Dean Jackson <[email protected]>
+
+ Merge r200985.
+
+ 2016-05-16 Dean Jackson <[email protected]>
+
+ WebCoreJSBuiltinInternals won't compile if some build flags are off
+ https://bugs.webkit.org/show_bug.cgi?id=157777
+ <rdar://problem/26312967>
+
+ Reviewed by Simon Fraser.
+
+ Allow this file to compile when some build flags are disabled.
+
+ * bindings/js/WebCoreJSBuiltinInternals.cpp:
+ (WebCore::JSBuiltinInternalFunctions::JSBuiltinInternalFunctions):
+
2016-05-12 Babak Shafiei <[email protected]>
Roll out r200463.
Modified: branches/safari-602.1.32-branch/Source/WebCore/bindings/js/WebCoreJSBuiltinInternals.cpp (200986 => 200987)
--- branches/safari-602.1.32-branch/Source/WebCore/bindings/js/WebCoreJSBuiltinInternals.cpp 2016-05-17 01:09:27 UTC (rev 200986)
+++ branches/safari-602.1.32-branch/Source/WebCore/bindings/js/WebCoreJSBuiltinInternals.cpp 2016-05-17 01:17:56 UTC (rev 200987)
@@ -49,6 +49,12 @@
, m_writableStreamInternalsFunctions(vm)
#endif
{
+#if !ENABLE(STREAMS_API) && !ENABLE(WEB_RTC)
+ // FIXME: When none of the features that use this class are enabled, we
+ // don't ever use the vm member. However, the logic of initializing
+ // it when any of the features are enabled gets pretty messy.
+ (void)vm;
+#endif
}
void JSBuiltinInternalFunctions::visit(JSC::SlotVisitor& visitor)
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
