<!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>[198669] trunk</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/198669">198669</a></dd>
<dt>Author</dt> <dd>bfulgham@apple.com</dd>
<dt>Date</dt> <dd>2016-03-25 09:14:20 -0700 (Fri, 25 Mar 2016)</dd>
</dl>

<h3>Log Message</h3>
<pre>[Win] Improve CMake build performance 
https://bugs.webkit.org/show_bug.cgi?id=155871
&lt;rdar://problem/24747822&gt;

Reviewed by Alex Christensen.

.:

Add a flag to the PROCESS_ALLINONE_FILE macro so that it does not remove
the files contained in the passed all-in-one file, since this breaks
dependency checking and generation of the derived sources from the IDL.
Instead, include the header files in the project so that all files get
generated.        
        
* Source/cmake/WebKitMacros: Updated for 'DerivedSources.cpp' use case.

Source/WebCore:

Treat DerivedSources.cpp as an 'All-in-one' file. Pass a flag to the
PROCESS_ALLINONE_FILE macro so that it does not remove the contents of
the file, since this breaks dependency checking and generation of the
sources from the IDL files. Instead, include the header files in the
project so that all files get generated.        
        
* CMakeLists.txt: Updated for 'DerivedSources.cpp'
* DerivedSources.cpp: Add some generated files that were missing.</pre>

<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkChangeLog">trunk/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoreCMakeListstxt">trunk/Source/WebCore/CMakeLists.txt</a></li>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoreDerivedSourcescpp">trunk/Source/WebCore/DerivedSources.cpp</a></li>
<li><a href="#trunkSourcecmakeWebKitMacroscmake">trunk/Source/cmake/WebKitMacros.cmake</a></li>
</ul>

</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/ChangeLog (198668 => 198669)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/ChangeLog        2016-03-25 16:05:22 UTC (rev 198668)
+++ trunk/ChangeLog        2016-03-25 16:14:20 UTC (rev 198669)
</span><span class="lines">@@ -1,3 +1,19 @@
</span><ins>+2016-03-25  Brent Fulgham  &lt;bfulgham@apple.com&gt;
+
+        [Win] Improve CMake build performance 
+        https://bugs.webkit.org/show_bug.cgi?id=155871
+        &lt;rdar://problem/24747822&gt;
+
+        Reviewed by Alex Christensen.
+
+        Add a flag to the PROCESS_ALLINONE_FILE macro so that it does not remove
+        the files contained in the passed all-in-one file, since this breaks
+        dependency checking and generation of the derived sources from the IDL.
+        Instead, include the header files in the project so that all files get
+        generated.        
+        
+        * Source/cmake/WebKitMacros: Updated for 'DerivedSources.cpp' use case.
+
</ins><span class="cx"> 2016-03-25  Konstantin Tokarev  &lt;annulen@yandex.ru&gt;
</span><span class="cx"> 
</span><span class="cx">         Turned on ENABLE_REQUEST_ANIMATION_FRAME by default for any port.
</span></span></pre></div>
<a id="trunkSourceWebCoreCMakeListstxt"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/CMakeLists.txt (198668 => 198669)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/CMakeLists.txt        2016-03-25 16:05:22 UTC (rev 198668)
+++ trunk/Source/WebCore/CMakeLists.txt        2016-03-25 16:14:20 UTC (rev 198669)
</span><span class="lines">@@ -2945,7 +2945,7 @@
</span><span class="cx">         svg/SVGAllInOne.cpp
</span><span class="cx">     )
</span><span class="cx">     foreach (allInOne ${allInOnes})
</span><del>-        PROCESS_ALLINONE_FILE(&quot;${WebCore_SOURCES}&quot; ${allInOne} newSources ${AllInOne})
</del><ins>+        PROCESS_ALLINONE_FILE(&quot;${WebCore_SOURCES}&quot; ${allInOne} newSources FALSE)
</ins><span class="cx">         set(WebCore_SOURCES
</span><span class="cx">             ${allInOne}
</span><span class="cx">             ${newSources}
</span><span class="lines">@@ -3800,6 +3800,13 @@
</span><span class="cx"> GENERATE_DOM_NAMES(XML ${WEBCORE_DIR}/xml/xmlattrs.in)
</span><span class="cx"> list(APPEND WebCore_SOURCES ${DERIVED_SOURCES_WEBCORE_DIR}/XMLNames.cpp)
</span><span class="cx"> 
</span><ins>+if (ENABLE_ALLINONE_BUILD)
+    message(STATUS &quot;All-in-One DerivedSources build is enabled.&quot;)
+    PROCESS_ALLINONE_FILE(&quot;${WebCore_SOURCES}&quot; DerivedSources.cpp newSources TRUE)
+    set(WebCore_SOURCES DerivedSources.cpp ${newSources})
+    list(APPEND WebCore_SOURCES DerivedSources.cpp)
+endif ()
+
</ins><span class="cx"> WEBKIT_WRAP_SOURCELIST(${WebCore_IDL_FILES} ${WebCore_SOURCES})
</span><span class="cx"> WEBKIT_WRAP_SOURCELIST(${WebCoreTestSupport_IDL_FILES} ${WebCoreTestSupport_SOURCES})
</span><span class="cx"> 
</span></span></pre></div>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (198668 => 198669)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog        2016-03-25 16:05:22 UTC (rev 198668)
+++ trunk/Source/WebCore/ChangeLog        2016-03-25 16:14:20 UTC (rev 198669)
</span><span class="lines">@@ -1,3 +1,20 @@
</span><ins>+2016-03-25  Brent Fulgham  &lt;bfulgham@apple.com&gt;
+
+        [Win] Improve CMake build performance 
+        https://bugs.webkit.org/show_bug.cgi?id=155871
+        &lt;rdar://problem/24747822&gt;
+
+        Reviewed by Alex Christensen.
+
+        Treat DerivedSources.cpp as an 'All-in-one' file. Pass a flag to the
+        PROCESS_ALLINONE_FILE macro so that it does not remove the contents of
+        the file, since this breaks dependency checking and generation of the
+        sources from the IDL files. Instead, include the header files in the
+        project so that all files get generated.        
+        
+        * CMakeLists.txt: Updated for 'DerivedSources.cpp'
+        * DerivedSources.cpp: Add some generated files that were missing.
+
</ins><span class="cx"> 2016-03-25  Youenn Fablet  &lt;youenn.fablet@crf.canon.fr&gt;
</span><span class="cx"> 
</span><span class="cx">         [Fetch API] Add basic loading of resources
</span></span></pre></div>
<a id="trunkSourceWebCoreDerivedSourcescpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/DerivedSources.cpp (198668 => 198669)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/DerivedSources.cpp        2016-03-25 16:05:22 UTC (rev 198668)
+++ trunk/Source/WebCore/DerivedSources.cpp        2016-03-25 16:14:20 UTC (rev 198669)
</span><span class="lines">@@ -1,5 +1,5 @@
</span><span class="cx"> /*
</span><del>- * Copyright (C) 2008 Apple Inc. All Rights Reserved.
</del><ins>+ * Copyright (C) 2008-2016 Apple Inc. All Rights Reserved.
</ins><span class="cx">  *
</span><span class="cx">  * Redistribution and use in source and binary forms, with or without
</span><span class="cx">  * modification, are permitted provided that the following conditions
</span><span class="lines">@@ -25,8 +25,14 @@
</span><span class="cx"> 
</span><span class="cx"> // This all-in-one cpp file cuts down on template bloat to allow us to build our Windows release build.
</span><span class="cx"> 
</span><ins>+// The following files do not work well with the new CMake system. Don't include in this file
+// #include &quot;HTMLEntityTable.cpp&quot;
+// #include &quot;JSSVGElementWrapperFactory.cpp&quot;
+// #include &quot;PlugInsResourcesData.cpp&quot;
+// #include &quot;UserAgentStyleSheetsData.cpp&quot;
+
+#include &quot;ExceptionCodeDescription.h&quot;
</ins><span class="cx"> #include &quot;HTMLElementFactory.cpp&quot;
</span><del>-#include &quot;HTMLEntityTable.cpp&quot;
</del><span class="cx"> #if ENABLE(WEBGL)
</span><span class="cx"> #include &quot;JSANGLEInstancedArrays.cpp&quot;
</span><span class="cx"> #endif
</span><span class="lines">@@ -36,15 +42,29 @@
</span><span class="cx"> #include &quot;JSBarProp.cpp&quot;
</span><span class="cx"> #include &quot;JSBeforeLoadEvent.cpp&quot;
</span><span class="cx"> #include &quot;JSBeforeUnloadEvent.cpp&quot;
</span><ins>+#if ENABLE(WEB_AUDIO)
+#include &quot;JSBiquadFilterNode.cpp&quot;
+#endif
</ins><span class="cx"> #include &quot;JSBlob.cpp&quot;
</span><span class="cx"> #include &quot;JSCanvasGradient.cpp&quot;
</span><span class="cx"> #include &quot;JSCanvasPattern.cpp&quot;
</span><ins>+#include &quot;JSCanvasProxy.cpp&quot;
</ins><span class="cx"> #include &quot;JSCanvasRenderingContext.cpp&quot;
</span><span class="cx"> #include &quot;JSCanvasRenderingContext2D.cpp&quot;
</span><span class="cx"> #if ENABLE(STREAMS_API)
</span><span class="cx"> #include &quot;JSByteLengthQueuingStrategy.cpp&quot;
</span><span class="cx"> #include &quot;JSCountQueuingStrategy.cpp&quot;
</span><span class="cx"> #endif
</span><ins>+#if ENABLE(WEB_AUDIO)
+#include &quot;JSChannelMergerNode.cpp&quot;
+#include &quot;JSChannelSplitterNode.cpp&quot;
+#include &quot;JSConvolverNode.cpp&quot;
+#endif
+#include &quot;JSChildNode.cpp&quot;
+#if ENABLE(SUBTLE_CRYPTO)
+#include &quot;JSCryptoKey.cpp&quot;
+#include &quot;JSCryptoKeyPair.cpp&quot;
+#endif
</ins><span class="cx"> #if ENABLE(WEBGL)
</span><span class="cx"> #include &quot;JSEXTBlendMinMax.cpp&quot;
</span><span class="cx"> #include &quot;JSEXTFragDepth.cpp&quot;
</span><span class="lines">@@ -115,6 +135,7 @@
</span><span class="cx"> #include &quot;JSCSSStyleRule.cpp&quot;
</span><span class="cx"> #include &quot;JSCSSStyleSheet.cpp&quot;
</span><span class="cx"> #include &quot;JSCSSSupportsRule.cpp&quot;
</span><ins>+#include &quot;JSCSSUnknownRule.cpp&quot;
</ins><span class="cx"> #include &quot;JSCSSValue.cpp&quot;
</span><span class="cx"> #include &quot;JSCSSValueList.cpp&quot;
</span><span class="cx"> #include &quot;JSCustomEvent.cpp&quot;
</span><span class="lines">@@ -124,7 +145,16 @@
</span><span class="cx"> #include &quot;JSDataTransferItem.cpp&quot;
</span><span class="cx"> #include &quot;JSDataTransferItemList.cpp&quot;
</span><span class="cx"> #include &quot;JSDedicatedWorkerGlobalScope.cpp&quot;
</span><ins>+#if ENABLE(WEB_AUDIO)
+#include &quot;JSDelayNode.cpp&quot;
+#endif
+#if ENABLE(DEVICE_ORIENTATION)
+#include &quot;JSDeviceMotionEvent.h&quot;
</ins><span class="cx"> #include &quot;JSDeviceOrientationEvent.cpp&quot;
</span><ins>+#endif
+#if ENABLE(PROXIMITY_EVENTS)
+#include &quot;JSDeviceProximityEvent.cpp&quot;
+#endif
</ins><span class="cx"> #include &quot;JSDocument.cpp&quot;
</span><span class="cx"> #include &quot;JSDocumentFragment.cpp&quot;
</span><span class="cx"> #include &quot;JSDocumentType.cpp&quot;
</span><span class="lines">@@ -145,8 +175,15 @@
</span><span class="cx"> #include &quot;JSDOMStringMap.cpp&quot;
</span><span class="cx"> #include &quot;JSDOMTokenList.cpp&quot;
</span><span class="cx"> #include &quot;JSDOMURL.cpp&quot;
</span><ins>+#include &quot;JSDOMURLMediaSource.cpp&quot;
+#include &quot;JSDOMURLMediaStream.cpp&quot;
</ins><span class="cx"> #include &quot;JSDOMWindow.cpp&quot;
</span><span class="cx"> #include &quot;JSDOMWindowCSS.cpp&quot;
</span><ins>+#include &quot;JSDOMWindowFetch.cpp&quot;
+#include &quot;JSDOMWindowIndexedDatabase.cpp&quot;
+#include &quot;JSDOMWindowNotifications.cpp&quot;
+#include &quot;JSDOMWindowSpeechSynthesis.cpp&quot;
+#include &quot;JSDOMWindowWebDatabase.cpp&quot;
</ins><span class="cx"> #include &quot;JSElement.cpp&quot;
</span><span class="cx"> #include &quot;JSErrorEvent.cpp&quot;
</span><span class="cx"> #include &quot;JSEvent.cpp&quot;
</span><span class="lines">@@ -164,8 +201,13 @@
</span><span class="cx"> #include &quot;JSFileReaderSync.cpp&quot;
</span><span class="cx"> #include &quot;JSFocusEvent.cpp&quot;
</span><span class="cx"> #include &quot;JSFontFace.cpp&quot;
</span><ins>+#include &quot;JSFontFaceSet.cpp&quot;
+#if ENABLE(WEB_AUDIO)
+#include &quot;JSGainNode.cpp&quot;
+#endif
</ins><span class="cx"> #include &quot;JSGeolocation.cpp&quot;
</span><span class="cx"> #include &quot;JSGeoposition.cpp&quot;
</span><ins>+#include &quot;JSGlobalEventHandlers.cpp&quot;
</ins><span class="cx"> #include &quot;JSHashChangeEvent.cpp&quot;
</span><span class="cx"> #include &quot;JSHistory.cpp&quot;
</span><span class="cx"> #include &quot;JSHTMLAllCollection.cpp&quot;
</span><span class="lines">@@ -202,6 +244,7 @@
</span><span class="cx"> #include &quot;JSHTMLHeadingElement.cpp&quot;
</span><span class="cx"> #include &quot;JSHTMLHRElement.cpp&quot;
</span><span class="cx"> #include &quot;JSHTMLHtmlElement.cpp&quot;
</span><ins>+#include &quot;JSHTMLHyperlinkElementUtils.cpp&quot;
</ins><span class="cx"> #include &quot;JSHTMLIFrameElement.cpp&quot;
</span><span class="cx"> #include &quot;JSHTMLImageElement.cpp&quot;
</span><span class="cx"> #include &quot;JSHTMLInputElement.cpp&quot;
</span><span class="lines">@@ -213,6 +256,8 @@
</span><span class="cx"> #include &quot;JSHTMLMapElement.cpp&quot;
</span><span class="cx"> #include &quot;JSHTMLMarqueeElement.cpp&quot;
</span><span class="cx"> #include &quot;JSHTMLMediaElement.cpp&quot;
</span><ins>+#include &quot;JSHTMLMediaElementMediaSession.cpp&quot;
+#include &quot;JSHTMLMediaElementMediaStream.cpp&quot;
</ins><span class="cx"> #include &quot;JSHTMLMenuElement.cpp&quot;
</span><span class="cx"> #include &quot;JSHTMLMetaElement.cpp&quot;
</span><span class="cx"> #include &quot;JSHTMLMeterElement.cpp&quot;
</span><span class="lines">@@ -225,6 +270,7 @@
</span><span class="cx"> #include &quot;JSHTMLOutputElement.cpp&quot;
</span><span class="cx"> #include &quot;JSHTMLParagraphElement.cpp&quot;
</span><span class="cx"> #include &quot;JSHTMLParamElement.cpp&quot;
</span><ins>+#include &quot;JSHTMLPictureElement.cpp&quot;
</ins><span class="cx"> #include &quot;JSHTMLPreElement.cpp&quot;
</span><span class="cx"> #include &quot;JSHTMLProgressElement.cpp&quot;
</span><span class="cx"> #include &quot;JSHTMLQuoteElement.cpp&quot;
</span><span class="lines">@@ -251,15 +297,20 @@
</span><span class="cx"> #include &quot;JSHTMLUnknownElement.cpp&quot;
</span><span class="cx"> #include &quot;JSHTMLUListElement.cpp&quot;
</span><span class="cx"> #include &quot;JSHTMLVideoElement.cpp&quot;
</span><ins>+#if ENABLE(INDEXED_DATABASE)
</ins><span class="cx"> #include &quot;JSIDBAny.cpp&quot;
</span><span class="cx"> #include &quot;JSIDBCursor.cpp&quot;
</span><ins>+#include &quot;JSIDBCursorWithValue.cpp&quot;
</ins><span class="cx"> #include &quot;JSIDBDatabase.cpp&quot;
</span><span class="cx"> #include &quot;JSIDBFactory.cpp&quot;
</span><span class="cx"> #include &quot;JSIDBIndex.cpp&quot;
</span><span class="cx"> #include &quot;JSIDBKeyRange.cpp&quot;
</span><span class="cx"> #include &quot;JSIDBObjectStore.cpp&quot;
</span><ins>+#include &quot;JSIDBOpenDBRequest.cpp&quot;
</ins><span class="cx"> #include &quot;JSIDBRequest.cpp&quot;
</span><span class="cx"> #include &quot;JSIDBTransaction.cpp&quot;
</span><ins>+#include &quot;JSIDBVersionChangeEvent.cpp&quot;
+#endif
</ins><span class="cx"> #include &quot;JSImageData.cpp&quot;
</span><span class="cx"> #include &quot;JSInspectorFrontendHost.cpp&quot;
</span><span class="cx"> #include &quot;JSKeyboardEvent.cpp&quot;
</span><span class="lines">@@ -268,6 +319,13 @@
</span><span class="cx"> #if ENABLE(MEDIA_CONTROLS_SCRIPT)
</span><span class="cx"> #include &quot;JSMediaControlsHost.cpp&quot;
</span><span class="cx"> #endif
</span><ins>+#if ENABLE(MEDIA_STREAM)
+#include &quot;JSMediaDeviceInfo.cpp&quot;
+#include &quot;JSMediaDeviceso.cpp&quot;
+#endif
+#if ENABLE(VIDEO) &amp;&amp; ENABLE(WEB_AUDIO)
+#include &quot;JSMediaElementAudioSourceNode.cpp&quot;
+#endif
</ins><span class="cx"> #include &quot;JSMediaError.cpp&quot;
</span><span class="cx"> #include &quot;JSMediaList.cpp&quot;
</span><span class="cx"> #if ENABLE(ENCRYPTED_MEDIA_V2)
</span><span class="lines">@@ -279,6 +337,19 @@
</span><span class="cx"> #endif
</span><span class="cx"> #include &quot;JSMediaQueryList.cpp&quot;
</span><span class="cx"> #include &quot;JSMediaQueryListListener.cpp&quot;
</span><ins>+#include &quot;JSMediaRemoteControls.cpp&quot;
+#include &quot;JSMediaSession.cpp&quot;
+#include &quot;JSMediaSource.cpp&quot;
+#include &quot;JSMediaStream.cpp&quot;
+#include &quot;JSMediaStreamAudioDestinationNode.cpp&quot;
+#include &quot;JSMediaStreamAudioSourceNode.cpp&quot;
+#include &quot;JSMediaStreamEvent.cpp&quot;
+#include &quot;JSMediaStreamTrack.cpp&quot;
+#include &quot;JSMediaStreamTrackSourcesCallback.cpp&quot;
+#include &quot;JSMediaTrackConstraint.cpp&quot;
+#include &quot;JSMediaTrackConstraintSet.cpp&quot;
+#include &quot;JSMediaTrackConstraints.cpp&quot;
+#include &quot;JSMediaTrackSupportedConstraints.cpp&quot;
</ins><span class="cx"> #include &quot;JSMessageChannel.cpp&quot;
</span><span class="cx"> #include &quot;JSMessageEvent.cpp&quot;
</span><span class="cx"> #include &quot;JSMessagePort.cpp&quot;
</span><span class="lines">@@ -288,17 +359,38 @@
</span><span class="cx"> #include &quot;JSMutationRecord.cpp&quot;
</span><span class="cx"> #include &quot;JSNamedNodeMap.cpp&quot;
</span><span class="cx"> #include &quot;JSNavigator.cpp&quot;
</span><ins>+#include &quot;JSNavigatorBattery.cpp&quot;
+#include &quot;JSNavigatorContentUtils.cpp&quot;
+#include &quot;JSNavigatorGeolocation.cpp&quot;
+#include &quot;JSNavigatorMediaDevices.cpp&quot;
+#include &quot;JSNavigatorUserMedia.cpp&quot;
+#include &quot;JSNavigatorUserMediaError.cpp&quot;
+#include &quot;JSNavigatorVibration.cpp&quot;
</ins><span class="cx"> #include &quot;JSNode.cpp&quot;
</span><span class="cx"> #include &quot;JSNodeFilter.cpp&quot;
</span><span class="cx"> #include &quot;JSNodeIterator.cpp&quot;
</span><span class="cx"> #include &quot;JSNodeList.cpp&quot;
</span><ins>+#include &quot;JSNonDocumentTypeChildNode.cpp&quot;
+#include &quot;JSNonElementParentNode.cpp&quot;
+#include &quot;JSNotification.cpp&quot;
</ins><span class="cx"> #include &quot;JSNotificationCenter.cpp&quot;
</span><del>-#include &quot;JSNotification.cpp&quot;
</del><ins>+#include &quot;JSNotificationPermissionCallback.cpp&quot;
</ins><span class="cx"> #include &quot;JSOverflowEvent.cpp&quot;
</span><ins>+#include &quot;JSOfflineAudioCompletionEvent.cpp&quot;
+#include &quot;JSOfflineAudioContext.cpp&quot;
+#include &quot;JSOscillatorNode.cpp&quot;
</ins><span class="cx"> #include &quot;JSPageTransitionEvent.cpp&quot;
</span><ins>+#include &quot;JSPannerNode.cpp&quot;
+#include &quot;JSParentNode.cpp&quot;
</ins><span class="cx"> #include &quot;JSPerformance.cpp&quot;
</span><ins>+#include &quot;JSPerformanceEntry.cpp&quot;
+#include &quot;JSPerformanceEntryList.cpp&quot;
+#include &quot;JSPerformanceMark.cpp&quot;
+#include &quot;JSPerformanceMeasure.cpp&quot;
</ins><span class="cx"> #include &quot;JSPerformanceNavigation.cpp&quot;
</span><ins>+#include &quot;JSPerformanceResourceTiming.cpp&quot;
</ins><span class="cx"> #include &quot;JSPerformanceTiming.cpp&quot;
</span><ins>+#include &quot;JSPeriodicWave.cpp&quot;
</ins><span class="cx"> #include &quot;JSPopStateEvent.cpp&quot;
</span><span class="cx"> #include &quot;JSPositionCallback.cpp&quot;
</span><span class="cx"> #include &quot;JSPositionError.cpp&quot;
</span><span class="lines">@@ -316,12 +408,36 @@
</span><span class="cx"> #include &quot;JSRect.cpp&quot;
</span><span class="cx"> #include &quot;JSRequestAnimationFrameCallback.cpp&quot;
</span><span class="cx"> #include &quot;JSRGBColor.cpp&quot;
</span><ins>+#include &quot;JSRTCConfiguration.cpp&quot;
+#include &quot;JSRTCDataChannel.cpp&quot;
+#include &quot;JSRTCDataChannelEvent.cpp&quot;
+#include &quot;JSRTCDTMFSender.cpp&quot;
+#include &quot;JSRTCDTMFToneChangeEvent.cpp&quot;
+#include &quot;JSRTCIceCandidate.cpp&quot;
+#include &quot;JSRTCIceCandidateEvent.cpp&quot;
+#include &quot;JSRTCIceServer.cpp&quot;
+#include &quot;JSRTCPeerConnection.cpp&quot;
+#include &quot;JSRTCRtpReceiver.cpp&quot;
+#include &quot;JSRTCRtpSender.cpp&quot;
+#include &quot;JSRTCSessionDescription.cpp&quot;
+#include &quot;JSRTCStatsReport.cpp&quot;
+#include &quot;JSRTCStatsResponse.cpp&quot;
+#include &quot;JSRTCTrackEvent.cpp&quot;
</ins><span class="cx"> #include &quot;JSScreen.cpp&quot;
</span><ins>+#include &quot;JSScriptProcessorNode.cpp&quot;
</ins><span class="cx"> #include &quot;JSScriptProfile.cpp&quot;
</span><span class="cx"> #include &quot;JSScriptProfileNode.cpp&quot;
</span><span class="cx"> #if ENABLE(CSP_NEXT)
</span><span class="cx"> #include &quot;JSSecurityPolicyViolationEvent.cpp&quot;
</span><span class="cx"> #endif
</span><ins>+#include &quot;JSSourceBuffer.cpp&quot;
+#include &quot;JSSourceBufferList.cpp&quot;
+#include &quot;JSSourceInfo.cpp&quot;
+#include &quot;JSSpeechSynthesis.cpp&quot;
+#include &quot;JSSpeechSynthesisEvent.cpp&quot;
+#include &quot;JSSpeechSynthesisUtterance.cpp&quot;
+#include &quot;JSSpeechSynthesisVoice.cpp&quot;
+#include &quot;JSSubtleCrypto.cpp&quot;
</ins><span class="cx"> #include &quot;JSSQLError.cpp&quot;
</span><span class="cx"> #include &quot;JSSQLException.cpp&quot;
</span><span class="cx"> #include &quot;JSSQLResultSet.cpp&quot;
</span><span class="lines">@@ -364,6 +480,7 @@
</span><span class="cx"> #include &quot;JSSVGElement.cpp&quot;
</span><span class="cx"> #include &quot;JSSVGEllipseElement.cpp&quot;
</span><span class="cx"> #include &quot;JSSVGException.cpp&quot;
</span><ins>+#include &quot;JSSVGExternalResourcesRequired.cpp&quot;
</ins><span class="cx"> #include &quot;JSSVGFEBlendElement.cpp&quot;
</span><span class="cx"> #include &quot;JSSVGFEColorMatrixElement.cpp&quot;
</span><span class="cx"> #include &quot;JSSVGFEComponentTransferElement.cpp&quot;
</span><span class="lines">@@ -390,6 +507,8 @@
</span><span class="cx"> #include &quot;JSSVGFETileElement.cpp&quot;
</span><span class="cx"> #include &quot;JSSVGFETurbulenceElement.cpp&quot;
</span><span class="cx"> #include &quot;JSSVGFilterElement.cpp&quot;
</span><ins>+#include &quot;JSSVGFilterPrimitiveStandardAttributes.cpp&quot;
+#include &quot;JSSVGFitToViewBox.cpp&quot;
</ins><span class="cx"> #include &quot;JSSVGFontElement.cpp&quot;
</span><span class="cx"> #include &quot;JSSVGFontFaceElement.cpp&quot;
</span><span class="cx"> #include &quot;JSSVGFontFaceFormatElement.cpp&quot;
</span><span class="lines">@@ -457,6 +576,7 @@
</span><span class="cx"> #include &quot;JSSVGStyleElement.cpp&quot;
</span><span class="cx"> #include &quot;JSSVGSwitchElement.cpp&quot;
</span><span class="cx"> #include &quot;JSSVGSymbolElement.cpp&quot;
</span><ins>+#include &quot;JSSVGTests.cpp&quot;
</ins><span class="cx"> #include &quot;JSSVGTextContentElement.cpp&quot;
</span><span class="cx"> #include &quot;JSSVGTextElement.cpp&quot;
</span><span class="cx"> #include &quot;JSSVGTextPathElement.cpp&quot;
</span><span class="lines">@@ -467,6 +587,7 @@
</span><span class="cx"> #include &quot;JSSVGTRefElement.cpp&quot;
</span><span class="cx"> #include &quot;JSSVGTSpanElement.cpp&quot;
</span><span class="cx"> #include &quot;JSSVGUnitTypes.cpp&quot;
</span><ins>+#include &quot;JSSVGURIReference.cpp&quot;
</ins><span class="cx"> #include &quot;JSSVGUseElement.cpp&quot;
</span><span class="cx"> #include &quot;JSSVGVKernElement.cpp&quot;
</span><span class="cx"> #include &quot;JSSVGViewElement.cpp&quot;
</span><span class="lines">@@ -475,12 +596,16 @@
</span><span class="cx"> #include &quot;JSSVGZoomEvent.cpp&quot;
</span><span class="cx"> #include &quot;JSShadowRoot.cpp&quot;
</span><span class="cx"> #include &quot;JSStorage.cpp&quot;
</span><ins>+#if ENABLE(QUOTA)
</ins><span class="cx"> #include &quot;JSStorageErrorCallback.cpp&quot;
</span><ins>+#endif
</ins><span class="cx"> #include &quot;JSStorageEvent.cpp&quot;
</span><ins>+#if ENABLE(QUOTA)
</ins><span class="cx"> #include &quot;JSStorageInfo.cpp&quot;
</span><span class="cx"> #include &quot;JSStorageQuota.cpp&quot;
</span><span class="cx"> #include &quot;JSStorageQuotaCallback.cpp&quot;
</span><span class="cx"> #include &quot;JSStorageUsageCallback.cpp&quot;
</span><ins>+#endif
</ins><span class="cx"> #include &quot;JSStringCallback.cpp&quot;
</span><span class="cx"> #include &quot;JSStyleMedia.cpp&quot;
</span><span class="cx"> #include &quot;JSStyleSheet.cpp&quot;
</span><span class="lines">@@ -513,25 +638,40 @@
</span><span class="cx"> #include &quot;JSTransitionEvent.cpp&quot;
</span><span class="cx"> #include &quot;JSTreeWalker.cpp&quot;
</span><span class="cx"> #include &quot;JSUIEvent.cpp&quot;
</span><ins>+#include &quot;JSUIRequestEvent.cpp&quot;
+#include &quot;JSURLUtils.cpp&quot;
+#include &quot;JSUserMessageHandler.cpp&quot;
+#include &quot;JSUserMessageHandlersNamespace.cpp&quot;
</ins><span class="cx"> #include &quot;JSValidityState.cpp&quot;
</span><ins>+#include &quot;JSVideoPlaybackQuality.cpp&quot;
</ins><span class="cx"> #include &quot;JSVoidCallback.cpp&quot;
</span><ins>+#include &quot;JSWaveShaperNode.cpp&quot;
</ins><span class="cx"> #include &quot;JSWebKitAnimationEvent.cpp&quot;
</span><span class="cx"> #include &quot;JSWebKitCSSFilterValue.cpp&quot;
</span><span class="cx"> #include &quot;JSWebKitCSSTransformValue.cpp&quot;
</span><span class="cx"> #include &quot;JSWebKitCSSMatrix.cpp&quot;
</span><span class="cx"> #include &quot;JSWebKitCSSRegionRule.cpp&quot;
</span><ins>+#include &quot;JSWebKitCSSViewportRule.cpp&quot;
</ins><span class="cx"> #include &quot;JSWebKitNamedFlow.cpp&quot;
</span><ins>+#include &quot;JSWebKitNamespace.cpp&quot;
+#include &quot;JSWebKitPlaybackTargetAvailabilityEvent.cpp&quot;
</ins><span class="cx"> #include &quot;JSWebKitPoint.cpp&quot;
</span><span class="cx"> #include &quot;JSWebKitTransitionEvent.cpp&quot;
</span><span class="cx"> #include &quot;JSWebSocket.cpp&quot;
</span><span class="cx"> #include &quot;JSWheelEvent.cpp&quot;
</span><ins>+#include &quot;JSWindowBase64.cpp&quot;
+#include &quot;JSWindowEventHandlers.cpp&quot;
+#include &quot;JSWindowTimers.cpp&quot;
</ins><span class="cx"> #include &quot;JSWorker.cpp&quot;
</span><span class="cx"> #include &quot;JSWorkerGlobalScope.cpp&quot;
</span><ins>+#include &quot;JSWorkerGlobalScopeFetch.cpp&quot;
+#include &quot;JSWorkerGlobalScopeIndexedDatabase.cpp&quot;
+#include &quot;JSWorkerGlobalScopeNotifications.cpp&quot;
</ins><span class="cx"> #include &quot;JSWorkerLocation.cpp&quot;
</span><span class="cx"> #include &quot;JSWorkerNavigator.cpp&quot;
</span><span class="cx"> #include &quot;JSXMLDocument.cpp&quot;
</span><span class="cx"> #include &quot;JSXMLHttpRequest.cpp&quot;
</span><del>-#include &quot;JSXMLHttpRequestException.cpp&quot;
</del><ins>+#include &quot;JSXMLHttpRequestEventTarget.cpp&quot;
</ins><span class="cx"> #include &quot;JSXMLHttpRequestProgressEvent.cpp&quot;
</span><span class="cx"> #include &quot;JSXMLHttpRequestUpload.cpp&quot;
</span><span class="cx"> #include &quot;JSXMLSerializer.cpp&quot;
</span><span class="lines">@@ -541,8 +681,6 @@
</span><span class="cx"> #include &quot;JSXPathNSResolver.cpp&quot;
</span><span class="cx"> #include &quot;JSXPathResult.cpp&quot;
</span><span class="cx"> #include &quot;JSXSLTProcessor.cpp&quot;
</span><del>-#include &quot;PlugInsResourcesData.cpp&quot;
-#include &quot;UserAgentStyleSheetsData.cpp&quot;
</del><span class="cx"> 
</span><span class="cx"> // On MSVC, including StaticConstructors.h causes all global objects not to be
</span><span class="cx"> // automatically initialized by the C runtime. This is useful in some specific
</span></span></pre></div>
<a id="trunkSourcecmakeWebKitMacroscmake"></a>
<div class="modfile"><h4>Modified: trunk/Source/cmake/WebKitMacros.cmake (198668 => 198669)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/cmake/WebKitMacros.cmake        2016-03-25 16:05:22 UTC (rev 198668)
+++ trunk/Source/cmake/WebKitMacros.cmake        2016-03-25 16:14:20 UTC (rev 198669)
</span><span class="lines">@@ -357,9 +357,10 @@
</span><span class="cx"> # _file_list is a list of source files
</span><span class="cx"> # _all_in_one_file is an all-in-one cpp file includes other cpp files
</span><span class="cx"> # _result_file_list is the output file list
</span><del>-macro(PROCESS_ALLINONE_FILE _file_list _all_in_one_file _result_file_list)
</del><ins>+macro(PROCESS_ALLINONE_FILE _file_list _all_in_one_file _result_file_list _no_compile)
</ins><span class="cx">     file(STRINGS ${_all_in_one_file} _all_in_one_file_content)
</span><span class="cx">     set(${_result_file_list} ${_file_list})
</span><ins>+    set(_allins &quot;&quot;)
</ins><span class="cx">     foreach (_line ${_all_in_one_file_content})
</span><span class="cx">         string(REGEX MATCH &quot;^#include [\&quot;&lt;](.*)[\&quot;&gt;]&quot; _found ${_line})
</span><span class="cx">         if (_found)
</span><span class="lines">@@ -368,7 +369,14 @@
</span><span class="cx">     endforeach ()
</span><span class="cx"> 
</span><span class="cx">     foreach (_allin ${_allins})
</span><del>-        string(REGEX REPLACE &quot;;[^;]*/${_allin};&quot; &quot;;&quot; _new_result &quot;${${_result_file_list}};&quot;)
</del><ins>+        if (${_no_compile})
+            # For DerivedSources.cpp, we still need the derived sources to be generated, but we do not want them to be compiled
+            # individually. We add the header to the result file list so that CMake knows to keep generating the files.
+            string(REGEX REPLACE &quot;(.*)\\.cpp&quot; &quot;\\1&quot; _allin_no_ext ${_allin})
+            string(REGEX REPLACE &quot;;([^;]*/)${_allin_no_ext}\\.cpp;&quot; &quot;;\\1${_allin_no_ext}.h;&quot; _new_result &quot;${${_result_file_list}};&quot;)
+        else ()
+            string(REGEX REPLACE &quot;;[^;]*/${_allin};&quot; &quot;;&quot; _new_result &quot;${${_result_file_list}};&quot;)
+        endif ()
</ins><span class="cx">         set(${_result_file_list} ${_new_result})
</span><span class="cx">     endforeach ()
</span><span class="cx"> 
</span></span></pre>
</div>
</div>

</body>
</html>