Title: [195533] trunk/Source/WebCore
- Revision
- 195533
- Author
- [email protected]
- Date
- 2016-01-25 06:06:53 -0800 (Mon, 25 Jan 2016)
Log Message
WebCoreJSBuiltins do not use to do conditional include
https://bugs.webkit.org/show_bug.cgi?id=153306
Reviewed by Alex Christensen.
Removing compilation guards as builtin generator adds them in the files themselves.
Fixing MediaDevices.js to generate MEDIA_STREAM compilation guard.
No change in behavior.
* Modules/mediastream/MediaDevices.js: Changing @optional to @conditional.
* bindings/js/WebCoreJSBuiltins.cpp:
* bindings/js/WebCoreJSBuiltins.h:
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (195532 => 195533)
--- trunk/Source/WebCore/ChangeLog 2016-01-25 11:57:41 UTC (rev 195532)
+++ trunk/Source/WebCore/ChangeLog 2016-01-25 14:06:53 UTC (rev 195533)
@@ -1,3 +1,19 @@
+2016-01-25 Youenn Fablet <[email protected]>
+
+ WebCoreJSBuiltins do not use to do conditional include
+ https://bugs.webkit.org/show_bug.cgi?id=153306
+
+ Reviewed by Alex Christensen.
+
+ Removing compilation guards as builtin generator adds them in the files themselves.
+ Fixing MediaDevices.js to generate MEDIA_STREAM compilation guard.
+
+ No change in behavior.
+
+ * Modules/mediastream/MediaDevices.js: Changing @optional to @conditional.
+ * bindings/js/WebCoreJSBuiltins.cpp:
+ * bindings/js/WebCoreJSBuiltins.h:
+
2016-01-25 Commit Queue <[email protected]>
Unreviewed, rolling out r195531.
Modified: trunk/Source/WebCore/Modules/mediastream/MediaDevices.js (195532 => 195533)
--- trunk/Source/WebCore/Modules/mediastream/MediaDevices.js 2016-01-25 11:57:41 UTC (rev 195532)
+++ trunk/Source/WebCore/Modules/mediastream/MediaDevices.js 2016-01-25 14:06:53 UTC (rev 195533)
@@ -26,7 +26,7 @@
* OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
-// @optional=MEDIA_STREAM
+// @conditional=ENABLE(MEDIA_STREAM)
function getUserMedia(options)
{
Modified: trunk/Source/WebCore/bindings/js/WebCoreJSBuiltins.cpp (195532 => 195533)
--- trunk/Source/WebCore/bindings/js/WebCoreJSBuiltins.cpp 2016-01-25 11:57:41 UTC (rev 195532)
+++ trunk/Source/WebCore/bindings/js/WebCoreJSBuiltins.cpp 2016-01-25 14:06:53 UTC (rev 195533)
@@ -26,20 +26,13 @@
#include "config.h"
-#if ENABLE(FETCH_API)
+#include "ByteLengthQueuingStrategyBuiltins.cpp"
+#include "CountQueuingStrategyBuiltins.cpp"
#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"
@@ -47,4 +40,3 @@
#include "StreamInternalsBuiltins.cpp"
#include "WritableStreamBuiltins.cpp"
#include "WritableStreamInternalsBuiltins.cpp"
-#endif
Modified: trunk/Source/WebCore/bindings/js/WebCoreJSBuiltins.h (195532 => 195533)
--- trunk/Source/WebCore/bindings/js/WebCoreJSBuiltins.h 2016-01-25 11:57:41 UTC (rev 195532)
+++ trunk/Source/WebCore/bindings/js/WebCoreJSBuiltins.h 2016-01-25 14:06:53 UTC (rev 195533)
@@ -27,20 +27,13 @@
#ifndef WebCoreJSBuiltins_h
#define WebCoreJSBuiltins_h
-#if ENABLE(FETCH_API)
+#include "ByteLengthQueuingStrategyBuiltins.h"
+#include "CountQueuingStrategyBuiltins.h"
#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"
@@ -48,8 +41,6 @@
#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
