<!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>[205512] 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/205512">205512</a></dd>
<dt>Author</dt> <dd>commit-queue@webkit.org</dd>
<dt>Date</dt> <dd>2016-09-06 15:06:32 -0700 (Tue, 06 Sep 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>[CMake] Decouple generating bindings of WebCore and WebCoreTestSupport
https://bugs.webkit.org/show_bug.cgi?id=161474
Generating bindings of WebCore and WebCoreTestSupport shares a
single supplementalDependencyFile. But, nothing supplements any
IDL of WebCoreTestSupport. This introduces unnecessary
dependencies.
Patch by Fujii Hironori <Hironori.Fujii@sony.com> on 2016-09-06
Reviewed by Alex Christensen.
.:
* Source/cmake/WebKitMacros.cmake:
(GENERATE_BINDINGS): Clear uninitialized variables before
use. This causes a problem in the second time of calling
GENERATE_BINDINGS.
Source/WebCore:
* CMakeLists.txt: Do not input any IDL of WebCoreTestSupport to
preprocess-idls.pl. Do not use supplementalDependencyFile to
generate bindings of WebCoreTestSupport. Add SettingsMacros.h as
a source file of WebCoreDerivedSources to ensure make_settings.pl
is finished before compiling WebCoreDerivedSources.</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="#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 (205511 => 205512)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/ChangeLog 2016-09-06 21:54:11 UTC (rev 205511)
+++ trunk/ChangeLog 2016-09-06 22:06:32 UTC (rev 205512)
</span><span class="lines">@@ -1,3 +1,20 @@
</span><ins>+2016-09-06 Fujii Hironori <Hironori.Fujii@sony.com>
+
+ [CMake] Decouple generating bindings of WebCore and WebCoreTestSupport
+ https://bugs.webkit.org/show_bug.cgi?id=161474
+
+ Generating bindings of WebCore and WebCoreTestSupport shares a
+ single supplementalDependencyFile. But, nothing supplements any
+ IDL of WebCoreTestSupport. This introduces unnecessary
+ dependencies.
+
+ Reviewed by Alex Christensen.
+
+ * Source/cmake/WebKitMacros.cmake:
+ (GENERATE_BINDINGS): Clear uninitialized variables before
+ use. This causes a problem in the second time of calling
+ GENERATE_BINDINGS.
+
</ins><span class="cx"> 2016-09-04 Commit Queue <commit-queue@webkit.org>
</span><span class="cx">
</span><span class="cx"> Unreviewed, rolling out r205415.
</span></span></pre></div>
<a id="trunkSourceWebCoreCMakeListstxt"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/CMakeLists.txt (205511 => 205512)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/CMakeLists.txt 2016-09-06 21:54:11 UTC (rev 205511)
+++ trunk/Source/WebCore/CMakeLists.txt 2016-09-06 22:06:32 UTC (rev 205512)
</span><span class="lines">@@ -3616,10 +3616,6 @@
</span><span class="cx"> list(APPEND IDL_INCLUDES --include=${WEBCORE_DIR}/${_include})
</span><span class="cx"> endforeach ()
</span><span class="cx">
</span><del>-foreach (_include ${WebCoreTestSupport_IDL_INCLUDES})
- list(APPEND IDL_INCLUDES --include=${WEBCORE_DIR}/${_include})
-endforeach ()
-
</del><span class="cx"> set(FEATURE_DEFINES_JAVASCRIPT "LANGUAGE_JAVASCRIPT=1 ${FEATURE_DEFINES_WITH_SPACE_SEPARATOR}")
</span><span class="cx">
</span><span class="cx"> # Create JavaScript C++ code given an IDL input
</span><span class="lines">@@ -3627,11 +3623,6 @@
</span><span class="cx"> set(IDL_FILES_LIST "${IDL_FILES_LIST}${WEBCORE_DIR}/${_idl}\n")
</span><span class="cx"> endforeach ()
</span><span class="cx">
</span><del>-foreach (_idl ${WebCoreTestSupport_IDL_FILES})
- set(IDL_FILES_LIST "${IDL_FILES_LIST}${WEBCORE_DIR}/${_idl}\n")
-endforeach ()
-
-set(IDL_FILES_LIST "${IDL_FILES_LIST}${DERIVED_SOURCES_WEBCORE_DIR}/InternalSettingsGenerated.idl\n")
</del><span class="cx"> list(APPEND IDL_INCLUDES --include=${DERIVED_SOURCES_WEBCORE_DIR})
</span><span class="cx"> list(APPEND WebCoreTestSupport_IDL_FILES ${DERIVED_SOURCES_WEBCORE_DIR}/InternalSettingsGenerated.idl)
</span><span class="cx">
</span><span class="lines">@@ -3639,7 +3630,7 @@
</span><span class="cx">
</span><span class="cx"> add_custom_command(
</span><span class="cx"> OUTPUT ${SUPPLEMENTAL_DEPENDENCY_FILE} ${WINDOW_CONSTRUCTORS_FILE} ${WORKERGLOBALSCOPE_CONSTRUCTORS_FILE} ${DEDICATEDWORKERGLOBALSCOPE_CONSTRUCTORS_FILE}
</span><del>- DEPENDS ${WEBCORE_DIR}/bindings/scripts/preprocess-idls.pl ${SCRIPTS_PREPROCESS_IDLS} ${WebCore_IDL_FILES} ${WebCoreTestSupport_IDL_FILES} ${WEBCORE_DIR}/CMakeLists.txt
</del><ins>+ DEPENDS ${WEBCORE_DIR}/bindings/scripts/preprocess-idls.pl ${SCRIPTS_PREPROCESS_IDLS} ${WebCore_IDL_FILES} ${WEBCORE_DIR}/CMakeLists.txt
</ins><span class="cx"> COMMAND ${PERL_EXECUTABLE} -I${WEBCORE_DIR}/bindings/scripts ${WEBCORE_DIR}/bindings/scripts/preprocess-idls.pl --defines "${FEATURE_DEFINES_JAVASCRIPT}" --idlFilesList ${IDL_FILES_TMP} --supplementalDependencyFile ${SUPPLEMENTAL_DEPENDENCY_FILE} --windowConstructorsFile ${WINDOW_CONSTRUCTORS_FILE} --workerGlobalScopeConstructorsFile ${WORKERGLOBALSCOPE_CONSTRUCTORS_FILE}
</span><span class="cx"> --dedicatedWorkerGlobalScopeConstructorsFile ${DEDICATEDWORKERGLOBALSCOPE_CONSTRUCTORS_FILE}
</span><span class="cx"> VERBATIM)
</span><span class="lines">@@ -3660,6 +3651,10 @@
</span><span class="cx"> ${SUPPLEMENTAL_DEPENDENCY_FILE}
</span><span class="cx"> ${ADDITIONAL_BINDINGS_DEPENDENCIES})
</span><span class="cx">
</span><ins>+foreach (_include ${WebCoreTestSupport_IDL_INCLUDES})
+ list(APPEND IDL_INCLUDES --include=${WEBCORE_DIR}/${_include})
+endforeach ()
+
</ins><span class="cx"> GENERATE_BINDINGS(WebCoreTestSupport_SOURCES
</span><span class="cx"> "${WebCoreTestSupport_IDL_FILES}"
</span><span class="cx"> "${WEBCORE_DIR}"
</span><span class="lines">@@ -3666,9 +3661,7 @@
</span><span class="cx"> "${IDL_INCLUDES}"
</span><span class="cx"> "${FEATURE_DEFINES_JAVASCRIPT}"
</span><span class="cx"> ${DERIVED_SOURCES_WEBCORE_DIR} JS JS cpp
</span><del>- ${IDL_ATTRIBUTES_FILE}
- ${SUPPLEMENTAL_DEPENDENCY_FILE}
- ${ADDITIONAL_BINDINGS_DEPENDENCIES})
</del><ins>+ ${IDL_ATTRIBUTES_FILE})
</ins><span class="cx">
</span><span class="cx"> # WebCore JS Builtins
</span><span class="cx">
</span><span class="lines">@@ -3760,6 +3753,7 @@
</span><span class="cx">
</span><span class="cx">
</span><span class="cx"> GENERATE_SETTINGS_MACROS(${WEBCORE_DIR}/page/Settings.in SettingsMacros.h)
</span><ins>+list(APPEND WebCore_DERIVED_SOURCES ${DERIVED_SOURCES_WEBCORE_DIR}/SettingsMacros.h)
</ins><span class="cx"> list(APPEND WebCoreTestSupport_SOURCES ${DERIVED_SOURCES_WEBCORE_DIR}/InternalSettingsGenerated.cpp)
</span><span class="cx">
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (205511 => 205512)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2016-09-06 21:54:11 UTC (rev 205511)
+++ trunk/Source/WebCore/ChangeLog 2016-09-06 22:06:32 UTC (rev 205512)
</span><span class="lines">@@ -1,3 +1,21 @@
</span><ins>+2016-09-06 Fujii Hironori <Hironori.Fujii@sony.com>
+
+ [CMake] Decouple generating bindings of WebCore and WebCoreTestSupport
+ https://bugs.webkit.org/show_bug.cgi?id=161474
+
+ Generating bindings of WebCore and WebCoreTestSupport shares a
+ single supplementalDependencyFile. But, nothing supplements any
+ IDL of WebCoreTestSupport. This introduces unnecessary
+ dependencies.
+
+ Reviewed by Alex Christensen.
+
+ * CMakeLists.txt: Do not input any IDL of WebCoreTestSupport to
+ preprocess-idls.pl. Do not use supplementalDependencyFile to
+ generate bindings of WebCoreTestSupport. Add SettingsMacros.h as
+ a source file of WebCoreDerivedSources to ensure make_settings.pl
+ is finished before compiling WebCoreDerivedSources.
+
</ins><span class="cx"> 2016-09-06 Zalan Bujtas <zalan@apple.com>
</span><span class="cx">
</span><span class="cx"> ASSERTION FAILED: !paintInfo.overlapTestRequests->contains(this) in WebCore::RenderWidget::paintContents
</span></span></pre></div>
<a id="trunkSourcecmakeWebKitMacroscmake"></a>
<div class="modfile"><h4>Modified: trunk/Source/cmake/WebKitMacros.cmake (205511 => 205512)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/cmake/WebKitMacros.cmake 2016-09-06 21:54:11 UTC (rev 205511)
+++ trunk/Source/cmake/WebKitMacros.cmake 2016-09-06 22:06:32 UTC (rev 205512)
</span><span class="lines">@@ -52,6 +52,9 @@
</span><span class="cx"> # _generator is a value of --generator argument.
</span><span class="cx"> # _supplemental_dependency_file is a value of --supplementalDependencyFile. (optional)
</span><span class="cx"> macro(GENERATE_BINDINGS _output_source _input_files _base_dir _idl_includes _features _destination _prefix _generator _extension _idl_attributes_file)
</span><ins>+ set(_supplemental_dependency)
+ set(_supplemental_dependency_file)
+ set(_additional_dependencies)
</ins><span class="cx"> set(BINDING_GENERATOR ${WEBCORE_DIR}/bindings/scripts/generate-bindings.pl)
</span><span class="cx"> set(_args ${ARGN})
</span><span class="cx"> list(LENGTH _args _argCount)
</span></span></pre>
</div>
</div>
</body>
</html>