Modified: trunk/Source/WebCore/ChangeLog (196529 => 196530)
--- trunk/Source/WebCore/ChangeLog 2016-02-13 00:30:59 UTC (rev 196529)
+++ trunk/Source/WebCore/ChangeLog 2016-02-13 00:32:50 UTC (rev 196530)
@@ -1,3 +1,10 @@
+2016-02-12 Saam barati <[email protected]>
+
+ Attempting build fix from https://bugs.webkit.org/show_bug.cgi?id=154144.
+
+ * bindings/js/JSDOMGlobalObject.cpp:
+ (WebCore::JSDOMGlobalObject::addBuiltinGlobals):
+
2016-02-12 Daniel Bates <[email protected]>
CSP: 'blob:' URLs should not match 'self' in CSP source _expression_ lists.
Modified: trunk/Source/WebCore/bindings/js/JSDOMGlobalObject.cpp (196529 => 196530)
--- trunk/Source/WebCore/bindings/js/JSDOMGlobalObject.cpp 2016-02-13 00:30:59 UTC (rev 196529)
+++ trunk/Source/WebCore/bindings/js/JSDOMGlobalObject.cpp 2016-02-13 00:32:50 UTC (rev 196530)
@@ -82,12 +82,18 @@
JSDOMGlobalObject::GlobalPropertyInfo(clientData.builtinNames().streamReadablePrivateName(), jsNumber(4), DontDelete | ReadOnly),
JSDOMGlobalObject::GlobalPropertyInfo(clientData.builtinNames().streamWaitingPrivateName(), jsNumber(5), DontDelete | ReadOnly),
JSDOMGlobalObject::GlobalPropertyInfo(clientData.builtinNames().streamWritablePrivateName(), jsNumber(6), DontDelete | ReadOnly),
+#if ENABLE(MEDIA_STREAM)
JSDOMGlobalObject::GlobalPropertyInfo(clientData.builtinNames().MediaStreamTrackPrivateName(), JSMediaStreamTrack::getConstructor(vm, this), DontDelete | ReadOnly),
+#endif
+#if ENABLE(STREAMS_API)
JSDOMGlobalObject::GlobalPropertyInfo(clientData.builtinNames().ReadableStreamPrivateName(), JSReadableStream::getConstructor(vm, this), DontDelete | ReadOnly),
+#endif
JSDOMGlobalObject::GlobalPropertyInfo(clientData.builtinNames().ReadableStreamControllerPrivateName(), privateReadableStreamControllerConstructor, DontDelete | ReadOnly),
JSDOMGlobalObject::GlobalPropertyInfo(clientData.builtinNames().ReadableStreamReaderPrivateName(), privateReadableStreamReaderConstructor, DontDelete | ReadOnly),
+#if ENABLE(MEDIA_STREAM)
JSDOMGlobalObject::GlobalPropertyInfo(clientData.builtinNames().RTCIceCandidatePrivateName(), JSRTCIceCandidate::getConstructor(vm, this), DontDelete | ReadOnly),
JSDOMGlobalObject::GlobalPropertyInfo(clientData.builtinNames().RTCSessionDescriptionPrivateName(), JSRTCSessionDescription::getConstructor(vm, this), DontDelete | ReadOnly),
+#endif
};
addStaticGlobals(staticGlobals, WTF_ARRAY_LENGTH(staticGlobals));
#endif