Title: [195535] trunk/Source/WebCore
- Revision
- 195535
- Author
- [email protected]
- Date
- 2016-01-25 08:18:42 -0800 (Mon, 25 Jan 2016)
Log Message
Unreviewed, rolling out r195533.
https://bugs.webkit.org/show_bug.cgi?id=153423
It is again breaking builds of several ports (Requested by
youenn on #webkit).
Reverted changeset:
"WebCoreJSBuiltins do not use to do conditional include"
https://bugs.webkit.org/show_bug.cgi?id=153306
http://trac.webkit.org/changeset/195533
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (195534 => 195535)
--- trunk/Source/WebCore/ChangeLog 2016-01-25 16:17:40 UTC (rev 195534)
+++ trunk/Source/WebCore/ChangeLog 2016-01-25 16:18:42 UTC (rev 195535)
@@ -1,3 +1,17 @@
+2016-01-25 Commit Queue <[email protected]>
+
+ Unreviewed, rolling out r195533.
+ https://bugs.webkit.org/show_bug.cgi?id=153423
+
+ It is again breaking builds of several ports (Requested by
+ youenn on #webkit).
+
+ Reverted changeset:
+
+ "WebCoreJSBuiltins do not use to do conditional include"
+ https://bugs.webkit.org/show_bug.cgi?id=153306
+ http://trac.webkit.org/changeset/195533
+
2016-01-25 Youenn Fablet <[email protected]>
WebCoreJSBuiltins do not use to do conditional include
Modified: trunk/Source/WebCore/Modules/mediastream/MediaDevices.js (195534 => 195535)
--- trunk/Source/WebCore/Modules/mediastream/MediaDevices.js 2016-01-25 16:17:40 UTC (rev 195534)
+++ trunk/Source/WebCore/Modules/mediastream/MediaDevices.js 2016-01-25 16:18:42 UTC (rev 195535)
@@ -26,7 +26,7 @@
* OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
-// @conditional=ENABLE(MEDIA_STREAM)
+// @optional=MEDIA_STREAM
function getUserMedia(options)
{
Modified: trunk/Source/WebCore/bindings/js/WebCoreJSBuiltins.cpp (195534 => 195535)
--- trunk/Source/WebCore/bindings/js/WebCoreJSBuiltins.cpp 2016-01-25 16:17:40 UTC (rev 195534)
+++ trunk/Source/WebCore/bindings/js/WebCoreJSBuiltins.cpp 2016-01-25 16:18:42 UTC (rev 195535)
@@ -26,13 +26,20 @@
#include "config.h"
-#include "ByteLengthQueuingStrategyBuiltins.cpp"
-#include "CountQueuingStrategyBuiltins.cpp"
+#if ENABLE(FETCH_API)
#include "FetchHeadersBuiltins.cpp"
+#endif
+
+#if ENABLE(MEDIA_STREAM)
#include "MediaDevicesBuiltins.cpp"
#include "NavigatorUserMediaBuiltins.cpp"
#include "RTCPeerConnectionBuiltins.cpp"
#include "RTCPeerConnectionInternalsBuiltins.cpp"
+#endif
+
+#if ENABLE(STREAMS_API)
+#include "ByteLengthQueuingStrategyBuiltins.cpp"
+#include "CountQueuingStrategyBuiltins.cpp"
#include "ReadableStreamBuiltins.cpp"
#include "ReadableStreamControllerBuiltins.cpp"
#include "ReadableStreamInternalsBuiltins.cpp"
@@ -40,3 +47,4 @@
#include "StreamInternalsBuiltins.cpp"
#include "WritableStreamBuiltins.cpp"
#include "WritableStreamInternalsBuiltins.cpp"
+#endif
Modified: trunk/Source/WebCore/bindings/js/WebCoreJSBuiltins.h (195534 => 195535)
--- trunk/Source/WebCore/bindings/js/WebCoreJSBuiltins.h 2016-01-25 16:17:40 UTC (rev 195534)
+++ trunk/Source/WebCore/bindings/js/WebCoreJSBuiltins.h 2016-01-25 16:18:42 UTC (rev 195535)
@@ -27,13 +27,20 @@
#ifndef WebCoreJSBuiltins_h
#define WebCoreJSBuiltins_h
-#include "ByteLengthQueuingStrategyBuiltins.h"
-#include "CountQueuingStrategyBuiltins.h"
+#if ENABLE(FETCH_API)
#include "FetchHeadersBuiltins.h"
+#endif
+
+#if ENABLE(MEDIA_STREAM)
#include "MediaDevicesBuiltins.h"
#include "NavigatorUserMediaBuiltins.h"
#include "RTCPeerConnectionBuiltins.h"
#include "RTCPeerConnectionInternalsBuiltins.h"
+#endif
+
+#if ENABLE(STREAMS_API)
+#include "ByteLengthQueuingStrategyBuiltins.h"
+#include "CountQueuingStrategyBuiltins.h"
#include "ReadableStreamBuiltins.h"
#include "ReadableStreamControllerBuiltins.h"
#include "ReadableStreamInternalsBuiltins.h"
@@ -41,6 +48,8 @@
#include "StreamInternalsBuiltins.h"
#include "WritableStreamBuiltins.h"
#include "WritableStreamInternalsBuiltins.h"
+#endif
+
#include <runtime/VM.h>
namespace WebCore {
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
