<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[195584] trunk/Source/WebCore</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://trac.webkit.org/projects/webkit/changeset/195584">195584</a></dd>
<dt>Author</dt> <dd>youenn.fablet@crf.canon.fr</dd>
<dt>Date</dt> <dd>2016-01-25 23:32:28 -0800 (Mon, 25 Jan 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>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.
* Modules/mediastream/NavigatorUserMedia.js: Making it @conditional.
* bindings/js/WebCoreJSBuiltins.cpp:
* bindings/js/WebCoreJSBuiltins.h:</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoreModulesmediastreamMediaDevicesjs">trunk/Source/WebCore/Modules/mediastream/MediaDevices.js</a></li>
<li><a href="#trunkSourceWebCoreModulesmediastreamNavigatorUserMediajs">trunk/Source/WebCore/Modules/mediastream/NavigatorUserMedia.js</a></li>
<li><a href="#trunkSourceWebCorebindingsjsWebCoreJSBuiltinscpp">trunk/Source/WebCore/bindings/js/WebCoreJSBuiltins.cpp</a></li>
<li><a href="#trunkSourceWebCorebindingsjsWebCoreJSBuiltinsh">trunk/Source/WebCore/bindings/js/WebCoreJSBuiltins.h</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (195583 => 195584)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2016-01-26 07:28:11 UTC (rev 195583)
+++ trunk/Source/WebCore/ChangeLog 2016-01-26 07:32:28 UTC (rev 195584)
</span><span class="lines">@@ -1,3 +1,20 @@
</span><ins>+2016-01-25 Youenn Fablet <youenn.fablet@crf.canon.fr>
+
+ 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.
+ * Modules/mediastream/NavigatorUserMedia.js: Making it @conditional.
+ * bindings/js/WebCoreJSBuiltins.cpp:
+ * bindings/js/WebCoreJSBuiltins.h:
+
</ins><span class="cx"> 2016-01-25 Alex Christensen <achristensen@webkit.org>
</span><span class="cx">
</span><span class="cx"> Fix internal Windows build
</span></span></pre></div>
<a id="trunkSourceWebCoreModulesmediastreamMediaDevicesjs"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/mediastream/MediaDevices.js (195583 => 195584)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/mediastream/MediaDevices.js 2016-01-26 07:28:11 UTC (rev 195583)
+++ trunk/Source/WebCore/Modules/mediastream/MediaDevices.js 2016-01-26 07:32:28 UTC (rev 195584)
</span><span class="lines">@@ -26,7 +26,7 @@
</span><span class="cx"> * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
</span><span class="cx"> */
</span><span class="cx">
</span><del>-// @optional=MEDIA_STREAM
</del><ins>+// @conditional=ENABLE(MEDIA_STREAM)
</ins><span class="cx">
</span><span class="cx"> function getUserMedia(options)
</span><span class="cx"> {
</span></span></pre></div>
<a id="trunkSourceWebCoreModulesmediastreamNavigatorUserMediajs"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/mediastream/NavigatorUserMedia.js (195583 => 195584)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/mediastream/NavigatorUserMedia.js 2016-01-26 07:28:11 UTC (rev 195583)
+++ trunk/Source/WebCore/Modules/mediastream/NavigatorUserMedia.js 2016-01-26 07:32:28 UTC (rev 195584)
</span><span class="lines">@@ -23,6 +23,8 @@
</span><span class="cx"> * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
</span><span class="cx"> */
</span><span class="cx">
</span><ins>+// @conditional=ENABLE(MEDIA_STREAM)
+
</ins><span class="cx"> function webkitGetUserMedia(options, successCallback, errorCallback)
</span><span class="cx"> {
</span><span class="cx"> "use strict";
</span></span></pre></div>
<a id="trunkSourceWebCorebindingsjsWebCoreJSBuiltinscpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/bindings/js/WebCoreJSBuiltins.cpp (195583 => 195584)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/bindings/js/WebCoreJSBuiltins.cpp 2016-01-26 07:28:11 UTC (rev 195583)
+++ trunk/Source/WebCore/bindings/js/WebCoreJSBuiltins.cpp 2016-01-26 07:32:28 UTC (rev 195584)
</span><span class="lines">@@ -26,20 +26,13 @@
</span><span class="cx">
</span><span class="cx"> #include "config.h"
</span><span class="cx">
</span><del>-#if ENABLE(FETCH_API)
</del><ins>+#include "ByteLengthQueuingStrategyBuiltins.cpp"
+#include "CountQueuingStrategyBuiltins.cpp"
</ins><span class="cx"> #include "FetchHeadersBuiltins.cpp"
</span><del>-#endif
-
-#if ENABLE(MEDIA_STREAM)
</del><span class="cx"> #include "MediaDevicesBuiltins.cpp"
</span><span class="cx"> #include "NavigatorUserMediaBuiltins.cpp"
</span><span class="cx"> #include "RTCPeerConnectionBuiltins.cpp"
</span><span class="cx"> #include "RTCPeerConnectionInternalsBuiltins.cpp"
</span><del>-#endif
-
-#if ENABLE(STREAMS_API)
-#include "ByteLengthQueuingStrategyBuiltins.cpp"
-#include "CountQueuingStrategyBuiltins.cpp"
</del><span class="cx"> #include "ReadableStreamBuiltins.cpp"
</span><span class="cx"> #include "ReadableStreamControllerBuiltins.cpp"
</span><span class="cx"> #include "ReadableStreamInternalsBuiltins.cpp"
</span><span class="lines">@@ -47,4 +40,3 @@
</span><span class="cx"> #include "StreamInternalsBuiltins.cpp"
</span><span class="cx"> #include "WritableStreamBuiltins.cpp"
</span><span class="cx"> #include "WritableStreamInternalsBuiltins.cpp"
</span><del>-#endif
</del></span></pre></div>
<a id="trunkSourceWebCorebindingsjsWebCoreJSBuiltinsh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/bindings/js/WebCoreJSBuiltins.h (195583 => 195584)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/bindings/js/WebCoreJSBuiltins.h 2016-01-26 07:28:11 UTC (rev 195583)
+++ trunk/Source/WebCore/bindings/js/WebCoreJSBuiltins.h 2016-01-26 07:32:28 UTC (rev 195584)
</span><span class="lines">@@ -27,20 +27,13 @@
</span><span class="cx"> #ifndef WebCoreJSBuiltins_h
</span><span class="cx"> #define WebCoreJSBuiltins_h
</span><span class="cx">
</span><del>-#if ENABLE(FETCH_API)
</del><ins>+#include "ByteLengthQueuingStrategyBuiltins.h"
+#include "CountQueuingStrategyBuiltins.h"
</ins><span class="cx"> #include "FetchHeadersBuiltins.h"
</span><del>-#endif
-
-#if ENABLE(MEDIA_STREAM)
</del><span class="cx"> #include "MediaDevicesBuiltins.h"
</span><span class="cx"> #include "NavigatorUserMediaBuiltins.h"
</span><span class="cx"> #include "RTCPeerConnectionBuiltins.h"
</span><span class="cx"> #include "RTCPeerConnectionInternalsBuiltins.h"
</span><del>-#endif
-
-#if ENABLE(STREAMS_API)
-#include "ByteLengthQueuingStrategyBuiltins.h"
-#include "CountQueuingStrategyBuiltins.h"
</del><span class="cx"> #include "ReadableStreamBuiltins.h"
</span><span class="cx"> #include "ReadableStreamControllerBuiltins.h"
</span><span class="cx"> #include "ReadableStreamInternalsBuiltins.h"
</span><span class="lines">@@ -48,8 +41,6 @@
</span><span class="cx"> #include "StreamInternalsBuiltins.h"
</span><span class="cx"> #include "WritableStreamBuiltins.h"
</span><span class="cx"> #include "WritableStreamInternalsBuiltins.h"
</span><del>-#endif
-
</del><span class="cx"> #include <runtime/VM.h>
</span><span class="cx">
</span><span class="cx"> namespace WebCore {
</span></span></pre>
</div>
</div>
</body>
</html>