<!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>[182243] 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/182243">182243</a></dd>
<dt>Author</dt> <dd>achristensen@apple.com</dd>
<dt>Date</dt> <dd>2015-04-01 11:36:43 -0700 (Wed, 01 Apr 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>Progress towards CMake on Windows and Mac.
https://bugs.webkit.org/show_bug.cgi?id=143293
Reviewed by Filip Pizlo.
.:
* CMakeLists.txt:
Set DERIVED_SOURCES_WTF_DIR for Windows.
* Source/CMakeLists.txt:
Don't compile bmalloc on Windows.
* Source/cmake/OptionsCommon.cmake:
Use the absolute path of the C preprocessor.
* Source/cmake/OptionsWinCairo.cmake:
Added needed definitions.
* Source/cmake/OptionsWindows.cmake:
Set some default values and removed support for old Visual Studio versions before /MP.
* Source/cmake/WebKitFS.cmake:
Make WTF DerivedSources directory.
* Source/cmake/WebKitMacros.cmake:
Added ADD_PRECOMPILED_HEADER macro based on
http://stackoverflow.com/questions/148570/using-pre-compiled-headers-with-cmake
Source/bmalloc:
* bmalloc/BAssert.h:
Removed ellipses from macros to appease Visual Studio.
Source/JavaScriptCore:
* CMakeLists.txt:
Enabled using assembly on Windows.
Replaced unix commands with CMake commands.
* PlatformMac.cmake:
Tell open source builders where to find unicode headers.
Source/ThirdParty/ANGLE:
* include/GLES2/gl2.h:
Temporarily disabled WebGL on Windows CMake builds.
Source/WebCore:
* PlatformMac.cmake:
Tell open source builders where to find unicode headers.
* PlatformWin.cmake:
Include PlatformWinCairo.cmake.
* PlatformWinCairo.cmake:
Added from bug 115944 by Patrick Gansterer.
* bindings/js/JSDOMStringListCustom.cpp:
* bindings/js/JSDOMWrapper.cpp:
* bindings/js/JSMessageChannelCustom.cpp:
* bindings/js/JSPopStateEventCustom.cpp:
* bindings/js/JSReadableStreamCustom.cpp:
* bindings/js/ReadableStreamJSSource.cpp:
* bindings/js/ScriptController.cpp:
* css/CSSComputedStyleDeclaration.cpp:
* dom/Attr.cpp:
* dom/CollectionIndexCache.cpp:
* platform/graphics/ANGLEWebKitBridge.h:
Fixed include quirks.
Source/WebKit:
* PlatformMac.cmake:
Fixed some include directories.
Source/WTF:
* wtf/CMakeLists.txt:
Don't use bmalloc on Windows yet.
* wtf/FeatureDefines.h:
Temporarily disabled WebGL on Windows CMake builds.
* wtf/PlatformMac.cmake:
Tell open source builders where to find unicode headers.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkCMakeListstxt">trunk/CMakeLists.txt</a></li>
<li><a href="#trunkChangeLog">trunk/ChangeLog</a></li>
<li><a href="#trunkSourceCMakeListstxt">trunk/Source/CMakeLists.txt</a></li>
<li><a href="#trunkSourceJavaScriptCoreCMakeListstxt">trunk/Source/JavaScriptCore/CMakeLists.txt</a></li>
<li><a href="#trunkSourceJavaScriptCoreChangeLog">trunk/Source/JavaScriptCore/ChangeLog</a></li>
<li><a href="#trunkSourceJavaScriptCorePlatformMaccmake">trunk/Source/JavaScriptCore/PlatformMac.cmake</a></li>
<li><a href="#trunkSourceThirdPartyANGLEChangeLog">trunk/Source/ThirdParty/ANGLE/ChangeLog</a></li>
<li><a href="#trunkSourceThirdPartyANGLEincludeGLES2gl2h">trunk/Source/ThirdParty/ANGLE/include/GLES2/gl2.h</a></li>
<li><a href="#trunkSourceWTFChangeLog">trunk/Source/WTF/ChangeLog</a></li>
<li><a href="#trunkSourceWTFwtfCMakeListstxt">trunk/Source/WTF/wtf/CMakeLists.txt</a></li>
<li><a href="#trunkSourceWTFwtfFeatureDefinesh">trunk/Source/WTF/wtf/FeatureDefines.h</a></li>
<li><a href="#trunkSourceWTFwtfPlatformMaccmake">trunk/Source/WTF/wtf/PlatformMac.cmake</a></li>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCorePlatformMaccmake">trunk/Source/WebCore/PlatformMac.cmake</a></li>
<li><a href="#trunkSourceWebCorePlatformWincmake">trunk/Source/WebCore/PlatformWin.cmake</a></li>
<li><a href="#trunkSourceWebCorebindingsjsJSDOMStringListCustomcpp">trunk/Source/WebCore/bindings/js/JSDOMStringListCustom.cpp</a></li>
<li><a href="#trunkSourceWebCorebindingsjsJSDOMWrappercpp">trunk/Source/WebCore/bindings/js/JSDOMWrapper.cpp</a></li>
<li><a href="#trunkSourceWebCorebindingsjsJSMessageChannelCustomcpp">trunk/Source/WebCore/bindings/js/JSMessageChannelCustom.cpp</a></li>
<li><a href="#trunkSourceWebCorebindingsjsJSPopStateEventCustomcpp">trunk/Source/WebCore/bindings/js/JSPopStateEventCustom.cpp</a></li>
<li><a href="#trunkSourceWebCorebindingsjsJSReadableStreamCustomcpp">trunk/Source/WebCore/bindings/js/JSReadableStreamCustom.cpp</a></li>
<li><a href="#trunkSourceWebCorebindingsjsReadableStreamJSSourcecpp">trunk/Source/WebCore/bindings/js/ReadableStreamJSSource.cpp</a></li>
<li><a href="#trunkSourceWebCorebindingsjsScriptControllercpp">trunk/Source/WebCore/bindings/js/ScriptController.cpp</a></li>
<li><a href="#trunkSourceWebCorecssCSSComputedStyleDeclarationcpp">trunk/Source/WebCore/css/CSSComputedStyleDeclaration.cpp</a></li>
<li><a href="#trunkSourceWebCoredomAttrcpp">trunk/Source/WebCore/dom/Attr.cpp</a></li>
<li><a href="#trunkSourceWebCoredomCollectionIndexCachecpp">trunk/Source/WebCore/dom/CollectionIndexCache.cpp</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicsANGLEWebKitBridgeh">trunk/Source/WebCore/platform/graphics/ANGLEWebKitBridge.h</a></li>
<li><a href="#trunkSourceWebKitChangeLog">trunk/Source/WebKit/ChangeLog</a></li>
<li><a href="#trunkSourceWebKitPlatformMaccmake">trunk/Source/WebKit/PlatformMac.cmake</a></li>
<li><a href="#trunkSourcebmallocChangeLog">trunk/Source/bmalloc/ChangeLog</a></li>
<li><a href="#trunkSourcebmallocbmallocBAsserth">trunk/Source/bmalloc/bmalloc/BAssert.h</a></li>
<li><a href="#trunkSourcecmakeOptionsCommoncmake">trunk/Source/cmake/OptionsCommon.cmake</a></li>
<li><a href="#trunkSourcecmakeOptionsWinCairocmake">trunk/Source/cmake/OptionsWinCairo.cmake</a></li>
<li><a href="#trunkSourcecmakeOptionsWindowscmake">trunk/Source/cmake/OptionsWindows.cmake</a></li>
<li><a href="#trunkSourcecmakeWebKitFScmake">trunk/Source/cmake/WebKitFS.cmake</a></li>
<li><a href="#trunkSourcecmakeWebKitMacroscmake">trunk/Source/cmake/WebKitMacros.cmake</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#trunkSourceWebCorePlatformWinCairocmake">trunk/Source/WebCore/PlatformWinCairo.cmake</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkCMakeListstxt"></a>
<div class="modfile"><h4>Modified: trunk/CMakeLists.txt (182242 => 182243)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/CMakeLists.txt 2015-04-01 18:30:39 UTC (rev 182242)
+++ trunk/CMakeLists.txt 2015-04-01 18:36:43 UTC (rev 182243)
</span><span class="lines">@@ -20,6 +20,7 @@
</span><span class="cx"> set(DERIVED_SOURCES_WEBKIT_DIR "${CMAKE_BINARY_DIR}/DerivedSources/WebKit")
</span><span class="cx"> set(DERIVED_SOURCES_WEBKIT2_DIR "${CMAKE_BINARY_DIR}/DerivedSources/WebKit2")
</span><span class="cx"> set(DERIVED_SOURCES_WEBINSPECTORUI_DIR "${CMAKE_BINARY_DIR}/DerivedSources/WebInspectorUI")
</span><ins>+set(DERIVED_SOURCES_WTF_DIR "${CMAKE_BINARY_DIR}/DerivedSources/WTF")
</ins><span class="cx">
</span><span class="cx"> set(CMAKE_MODULE_PATH "${CMAKE_SOURCE_DIR}/Source/cmake")
</span><span class="cx">
</span></span></pre></div>
<a id="trunkChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/ChangeLog (182242 => 182243)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/ChangeLog 2015-04-01 18:30:39 UTC (rev 182242)
+++ trunk/ChangeLog 2015-04-01 18:36:43 UTC (rev 182243)
</span><span class="lines">@@ -1,3 +1,26 @@
</span><ins>+2015-04-01 Alex Christensen <achristensen@webkit.org>
+
+ Progress towards CMake on Windows and Mac.
+ https://bugs.webkit.org/show_bug.cgi?id=143293
+
+ Reviewed by Filip Pizlo.
+
+ * CMakeLists.txt:
+ Set DERIVED_SOURCES_WTF_DIR for Windows.
+ * Source/CMakeLists.txt:
+ Don't compile bmalloc on Windows.
+ * Source/cmake/OptionsCommon.cmake:
+ Use the absolute path of the C preprocessor.
+ * Source/cmake/OptionsWinCairo.cmake:
+ Added needed definitions.
+ * Source/cmake/OptionsWindows.cmake:
+ Set some default values and removed support for old Visual Studio versions before /MP.
+ * Source/cmake/WebKitFS.cmake:
+ Make WTF DerivedSources directory.
+ * Source/cmake/WebKitMacros.cmake:
+ Added ADD_PRECOMPILED_HEADER macro based on
+ http://stackoverflow.com/questions/148570/using-pre-compiled-headers-with-cmake
+
</ins><span class="cx"> 2015-04-01 Gwang Yoon Hwang <yoon@igalia.com>
</span><span class="cx">
</span><span class="cx"> Use colored diagnostics when building with cmake + ninja + clang
</span></span></pre></div>
<a id="trunkSourceCMakeListstxt"></a>
<div class="modfile"><h4>Modified: trunk/Source/CMakeLists.txt (182242 => 182243)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/CMakeLists.txt 2015-04-01 18:30:39 UTC (rev 182242)
+++ trunk/Source/CMakeLists.txt 2015-04-01 18:36:43 UTC (rev 182243)
</span><span class="lines">@@ -1,7 +1,10 @@
</span><span class="cx"> # -----------------------------------------------------------------------------
</span><span class="cx"> # Add module directories
</span><span class="cx"> # -----------------------------------------------------------------------------
</span><del>-add_subdirectory(bmalloc)
</del><ins>+# FIXME: Port bmalloc to Windows. https://bugs.webkit.org/show_bug.cgi?id=143310
+if (NOT WIN32)
+ add_subdirectory(bmalloc)
+endif ()
</ins><span class="cx">
</span><span class="cx"> add_subdirectory(WTF)
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreCMakeListstxt"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/CMakeLists.txt (182242 => 182243)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/CMakeLists.txt 2015-04-01 18:30:39 UTC (rev 182242)
+++ trunk/Source/JavaScriptCore/CMakeLists.txt 2015-04-01 18:36:43 UTC (rev 182243)
</span><span class="lines">@@ -738,6 +738,7 @@
</span><span class="cx"> # files are used to build JavaScriptCore itself, we can just add LLIntAssembly.h to JSC_HEADERS
</span><span class="cx"> # since it is used in the add_library() call at the end of this file.
</span><span class="cx"> if (MSVC)
</span><ins>+ enable_language(ASM_MASM)
</ins><span class="cx"> list(APPEND JavaScriptCore_SOURCES
</span><span class="cx"> ${DERIVED_SOURCES_JAVASCRIPTCORE_DIR}/LowLevelInterpreterWin.asm
</span><span class="cx"> )
</span><span class="lines">@@ -1078,6 +1079,8 @@
</span><span class="cx"> VERBATIM)
</span><span class="cx">
</span><span class="cx"> # Inspector Backend Dispatchers, Frontend Dispatchers, Type Builders
</span><ins>+file(MAKE_DIRECTORY ${DERIVED_SOURCES_WEBINSPECTORUI_DIR}/UserInterface/Protocol)
+file(MAKE_DIRECTORY ${DERIVED_SOURCES_JAVASCRIPTCORE_DIR}/inspector)
</ins><span class="cx"> add_custom_command(
</span><span class="cx"> OUTPUT ${DERIVED_SOURCES_JAVASCRIPTCORE_DIR}/inspector/InspectorBackendDispatchers.cpp
</span><span class="cx"> ${DERIVED_SOURCES_JAVASCRIPTCORE_DIR}/inspector/InspectorBackendDispatchers.h
</span><span class="lines">@@ -1085,12 +1088,11 @@
</span><span class="cx"> ${DERIVED_SOURCES_JAVASCRIPTCORE_DIR}/inspector/InspectorFrontendDispatchers.h
</span><span class="cx"> ${DERIVED_SOURCES_JAVASCRIPTCORE_DIR}/inspector/InspectorProtocolObjects.cpp
</span><span class="cx"> ${DERIVED_SOURCES_JAVASCRIPTCORE_DIR}/inspector/InspectorProtocolObjects.h
</span><del>- ${DERIVED_SOURCES_WEBINSPECTORUI_DIR}/UserInterface/Protocol/InspectorBackendCommands.js
</del><ins>+ ${DERIVED_SOURCES_WEBINSPECTORUI_DIR}/inspector/InspectorBackendCommands.js
</ins><span class="cx"> MAIN_DEPENDENCY ${DERIVED_SOURCES_JAVASCRIPTCORE_DIR}/CombinedDomains.json
</span><span class="cx"> DEPENDS ${JavaScriptCore_INSPECTOR_PROTOCOL_SCRIPTS}
</span><del>- COMMAND ${PYTHON_EXECUTABLE} ${JavaScriptCore_INSPECTOR_SCRIPTS_DIR}/generate-inspector-protocol-bindings.py --outputDir "${DERIVED_SOURCES_JAVASCRIPTCORE_DIR}" --framework JavaScriptCore ${DERIVED_SOURCES_JAVASCRIPTCORE_DIR}/CombinedDomains.json && mkdir -p ${DERIVED_SOURCES_JAVASCRIPTCORE_DIR}/inspector && cp ${DERIVED_SOURCES_JAVASCRIPTCORE_DIR}/InspectorBackendDispatchers.h ${DERIVED_SOURCES_JAVASCRIPTCORE_DIR}/InspectorBackendDispatchers.cpp ${DERIVED_SOURCES_JAVASCRIPTCORE_DIR}/InspectorFrontendDispatchers.h ${DERIVED_SOURCES_JAVASCRIPTCORE_DIR}/InspectorFrontendDispatchers.cpp ${DERIVED_SOURCES_JAVASCRIPTCORE_DIR}/InspectorProtocolObjects.h ${DERIVED_SOURCES_JAVASCRIPTCORE_DIR}/InspectorProtocolObjects.cpp ${DERIVED_SOURCES_JAVASCRIPTCORE_DIR}/inspector && mkdir -p ${DERIVED_SOURCES_WEBINSPECTORUI_DIR}/UserInterface/Protocol && cp ${DERIVED_SOURCES_JAVASCRIPTCORE_DIR}/InspectorBackendCommands.js ${DERIVED_SOURC
ES_WEBINSPECTORUI_DIR}/UserInterface/Protocol
</del><ins>+ COMMAND ${PYTHON_EXECUTABLE} ${JavaScriptCore_INSPECTOR_SCRIPTS_DIR}/generate-inspector-protocol-bindings.py --outputDir "${DERIVED_SOURCES_JAVASCRIPTCORE_DIR}/inspector" --framework JavaScriptCore ${DERIVED_SOURCES_JAVASCRIPTCORE_DIR}/CombinedDomains.json
</ins><span class="cx"> VERBATIM)
</span><del>-file(MAKE_DIRECTORY ${DERIVED_SOURCES_JAVASCRIPTCORE_DIR}/inspector)
</del><span class="cx">
</span><span class="cx"> # JSCBuiltins
</span><span class="cx"> file(GLOB JSCBuiltins_js_files "${CMAKE_CURRENT_SOURCE_DIR}/builtins/*.js")
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/ChangeLog (182242 => 182243)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/ChangeLog 2015-04-01 18:30:39 UTC (rev 182242)
+++ trunk/Source/JavaScriptCore/ChangeLog 2015-04-01 18:36:43 UTC (rev 182243)
</span><span class="lines">@@ -1,3 +1,16 @@
</span><ins>+2015-04-01 Alex Christensen <achristensen@webkit.org>
+
+ Progress towards CMake on Windows and Mac.
+ https://bugs.webkit.org/show_bug.cgi?id=143293
+
+ Reviewed by Filip Pizlo.
+
+ * CMakeLists.txt:
+ Enabled using assembly on Windows.
+ Replaced unix commands with CMake commands.
+ * PlatformMac.cmake:
+ Tell open source builders where to find unicode headers.
+
</ins><span class="cx"> 2015-04-01 Yusuke Suzuki <utatane.tea@gmail.com>
</span><span class="cx">
</span><span class="cx"> IteratorClose should be called when jumping over the target for-of loop
</span></span></pre></div>
<a id="trunkSourceJavaScriptCorePlatformMaccmake"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/PlatformMac.cmake (182242 => 182243)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/PlatformMac.cmake 2015-04-01 18:30:39 UTC (rev 182242)
+++ trunk/Source/JavaScriptCore/PlatformMac.cmake 2015-04-01 18:36:43 UTC (rev 182243)
</span><span class="lines">@@ -34,6 +34,7 @@
</span><span class="cx">
</span><span class="cx"> list(APPEND JavaScriptCore_INCLUDE_DIRECTORIES
</span><span class="cx"> ${JAVASCRIPTCORE_DIR}/disassembler/udis86
</span><ins>+ ${JAVASCRIPTCORE_DIR}/icu
</ins><span class="cx"> )
</span><span class="cx"> list(APPEND JavaScriptCore_HEADERS
</span><span class="cx"> ${DERIVED_SOURCES_JAVASCRIPTCORE_DIR}/TracingDtrace.h
</span></span></pre></div>
<a id="trunkSourceThirdPartyANGLEChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/ThirdParty/ANGLE/ChangeLog (182242 => 182243)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/ThirdParty/ANGLE/ChangeLog 2015-04-01 18:30:39 UTC (rev 182242)
+++ trunk/Source/ThirdParty/ANGLE/ChangeLog 2015-04-01 18:36:43 UTC (rev 182243)
</span><span class="lines">@@ -1,3 +1,13 @@
</span><ins>+2015-04-01 Alex Christensen <achristensen@webkit.org>
+
+ Progress towards CMake on Windows and Mac.
+ https://bugs.webkit.org/show_bug.cgi?id=143293
+
+ Reviewed by Filip Pizlo.
+
+ * include/GLES2/gl2.h:
+ Temporarily disabled WebGL on Windows CMake builds.
+
</ins><span class="cx"> 2015-03-17 Zan Dobersek <zdobersek@igalia.com>
</span><span class="cx">
</span><span class="cx"> [CMake] Use a forwarding header for ANGLE's ShaderLang.h to avoid picking up ANGLE's EGL headers
</span></span></pre></div>
<a id="trunkSourceThirdPartyANGLEincludeGLES2gl2h"></a>
<div class="modfile"><h4>Modified: trunk/Source/ThirdParty/ANGLE/include/GLES2/gl2.h (182242 => 182243)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/ThirdParty/ANGLE/include/GLES2/gl2.h 2015-04-01 18:30:39 UTC (rev 182242)
+++ trunk/Source/ThirdParty/ANGLE/include/GLES2/gl2.h 2015-04-01 18:36:43 UTC (rev 182243)
</span><span class="lines">@@ -470,7 +470,8 @@
</span><span class="cx"> * GL core functions.
</span><span class="cx"> *-----------------------------------------------------------------------*/
</span><span class="cx">
</span><del>-#if defined(_MSC_VER) && !defined(ANGLE_WEBKIT_WIN)
</del><ins>+// FIXME: Get WebGL working on Windows with CMake. https://bugs.webkit.org/show_bug.cgi?id=143311
+#if defined(_MSC_VER) && !defined(ANGLE_WEBKIT_WIN) && !defined(BUILDING_WITH_CMAKE)
</ins><span class="cx"> #include <GLES2/gl2softlinking.h>
</span><span class="cx"> #else
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWTFChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WTF/ChangeLog (182242 => 182243)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WTF/ChangeLog 2015-04-01 18:30:39 UTC (rev 182242)
+++ trunk/Source/WTF/ChangeLog 2015-04-01 18:36:43 UTC (rev 182243)
</span><span class="lines">@@ -1,3 +1,17 @@
</span><ins>+2015-04-01 Alex Christensen <achristensen@webkit.org>
+
+ Progress towards CMake on Windows and Mac.
+ https://bugs.webkit.org/show_bug.cgi?id=143293
+
+ Reviewed by Filip Pizlo.
+
+ * wtf/CMakeLists.txt:
+ Don't use bmalloc on Windows yet.
+ * wtf/FeatureDefines.h:
+ Temporarily disabled WebGL on Windows CMake builds.
+ * wtf/PlatformMac.cmake:
+ Tell open source builders where to find unicode headers.
+
</ins><span class="cx"> 2015-03-31 Alexey Proskuryakov <ap@apple.com>
</span><span class="cx">
</span><span class="cx"> Fix the build after <http://trac.webkit.org/changeset/182205>.
</span></span></pre></div>
<a id="trunkSourceWTFwtfCMakeListstxt"></a>
<div class="modfile"><h4>Modified: trunk/Source/WTF/wtf/CMakeLists.txt (182242 => 182243)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WTF/wtf/CMakeLists.txt 2015-04-01 18:30:39 UTC (rev 182242)
+++ trunk/Source/WTF/wtf/CMakeLists.txt 2015-04-01 18:36:43 UTC (rev 182243)
</span><span class="lines">@@ -221,9 +221,13 @@
</span><span class="cx">
</span><span class="cx"> set(WTF_LIBRARIES
</span><span class="cx"> ${CMAKE_DL_LIBS}
</span><del>- bmalloc
</del><span class="cx"> )
</span><span class="cx">
</span><ins>+# FIXME: Port bmalloc to Windows. https://bugs.webkit.org/show_bug.cgi?id=143310
+if (NOT WIN32)
+ list(APPEND WTF_LIBRARIES bmalloc)
+endif ()
+
</ins><span class="cx"> list(APPEND WTF_SOURCES
</span><span class="cx"> unicode/icu/CollatorICU.cpp
</span><span class="cx"> )
</span></span></pre></div>
<a id="trunkSourceWTFwtfFeatureDefinesh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WTF/wtf/FeatureDefines.h (182242 => 182243)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WTF/wtf/FeatureDefines.h 2015-04-01 18:30:39 UTC (rev 182242)
+++ trunk/Source/WTF/wtf/FeatureDefines.h 2015-04-01 18:36:43 UTC (rev 182243)
</span><span class="lines">@@ -260,8 +260,13 @@
</span><span class="cx"> #endif
</span><span class="cx">
</span><span class="cx"> #if !defined(ENABLE_WEBGL)
</span><ins>+// FIXME: Get WebGL working on Windows with CMake. https://bugs.webkit.org/show_bug.cgi?id=143311
+#if defined(BUILDING_WITH_CMAKE)
+#define ENABLE_WEBGL 0
+#else
</ins><span class="cx"> #define ENABLE_WEBGL 1
</span><span class="cx"> #endif
</span><ins>+#endif
</ins><span class="cx">
</span><span class="cx"> #endif /* PLATFORM(WIN) && !PLATFORM(WIN_CAIRO) */
</span><span class="cx">
</span><span class="lines">@@ -279,8 +284,13 @@
</span><span class="cx"> #endif
</span><span class="cx">
</span><span class="cx"> #if !defined(ENABLE_WEBGL)
</span><ins>+// FIXME: Get WebGL working on Windows with CMake. https://bugs.webkit.org/show_bug.cgi?id=143311
+#if defined(BUILDING_WITH_CMAKE)
+#define ENABLE_WEBGL 0
+#else
</ins><span class="cx"> #define ENABLE_WEBGL 1
</span><span class="cx"> #endif
</span><ins>+#endif
</ins><span class="cx">
</span><span class="cx"> #endif /* PLATFORM(WIN_CAIRO) */
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWTFwtfPlatformMaccmake"></a>
<div class="modfile"><h4>Modified: trunk/Source/WTF/wtf/PlatformMac.cmake (182242 => 182243)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WTF/wtf/PlatformMac.cmake 2015-04-01 18:30:39 UTC (rev 182242)
+++ trunk/Source/WTF/wtf/PlatformMac.cmake 2015-04-01 18:36:43 UTC (rev 182243)
</span><span class="lines">@@ -20,3 +20,7 @@
</span><span class="cx"> text/mac/StringMac.mm
</span><span class="cx"> text/mac/StringViewObjC.mm
</span><span class="cx"> )
</span><ins>+
+list(APPEND WTF_INCLUDE_DIRECTORIES
+ "${WTF_DIR}/icu"
+)
</ins></span></pre></div>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (182242 => 182243)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2015-04-01 18:30:39 UTC (rev 182242)
+++ trunk/Source/WebCore/ChangeLog 2015-04-01 18:36:43 UTC (rev 182243)
</span><span class="lines">@@ -1,3 +1,29 @@
</span><ins>+2015-04-01 Alex Christensen <achristensen@webkit.org>
+
+ Progress towards CMake on Windows and Mac.
+ https://bugs.webkit.org/show_bug.cgi?id=143293
+
+ Reviewed by Filip Pizlo.
+
+ * PlatformMac.cmake:
+ Tell open source builders where to find unicode headers.
+ * PlatformWin.cmake:
+ Include PlatformWinCairo.cmake.
+ * PlatformWinCairo.cmake:
+ Added from bug 115944 by Patrick Gansterer.
+ * bindings/js/JSDOMStringListCustom.cpp:
+ * bindings/js/JSDOMWrapper.cpp:
+ * bindings/js/JSMessageChannelCustom.cpp:
+ * bindings/js/JSPopStateEventCustom.cpp:
+ * bindings/js/JSReadableStreamCustom.cpp:
+ * bindings/js/ReadableStreamJSSource.cpp:
+ * bindings/js/ScriptController.cpp:
+ * css/CSSComputedStyleDeclaration.cpp:
+ * dom/Attr.cpp:
+ * dom/CollectionIndexCache.cpp:
+ * platform/graphics/ANGLEWebKitBridge.h:
+ Fixed include quirks.
+
</ins><span class="cx"> 2015-03-31 Simon Fraser <simon.fraser@apple.com>
</span><span class="cx">
</span><span class="cx"> Remove scrolling tree dependency on wheel event handler counts, and use fast scrolling even when there are wheel handlers
</span></span></pre></div>
<a id="trunkSourceWebCorePlatformMaccmake"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/PlatformMac.cmake (182242 => 182243)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/PlatformMac.cmake 2015-04-01 18:30:39 UTC (rev 182242)
+++ trunk/Source/WebCore/PlatformMac.cmake 2015-04-01 18:36:43 UTC (rev 182243)
</span><span class="lines">@@ -3,6 +3,7 @@
</span><span class="cx"> "${WEBCORE_DIR}/bindings/objc"
</span><span class="cx"> "${WEBCORE_DIR}/bridge/objc"
</span><span class="cx"> "${WEBCORE_DIR}/editing/mac"
</span><ins>+ "${WEBCORE_DIR}/icu"
</ins><span class="cx"> "${WEBCORE_DIR}/loader/archive/cf"
</span><span class="cx"> "${WEBCORE_DIR}/loader/cf"
</span><span class="cx"> "${WEBCORE_DIR}/loader/mac"
</span><span class="lines">@@ -83,7 +84,7 @@
</span><span class="cx"> platform/cf/MediaAccessibilitySoftLink.cpp
</span><span class="cx"> platform/cf/RunLoopObserver.cpp
</span><span class="cx"> platform/cf/SharedBufferCF.cpp
</span><del>- platform/cf/SharedTimerCF.mm
</del><ins>+ platform/cf/SharedTimerCF.cpp
</ins><span class="cx"> platform/cf/URLCF.cpp
</span><span class="cx">
</span><span class="cx"> platform/cocoa/DisplaySleepDisablerCocoa.cpp
</span></span></pre></div>
<a id="trunkSourceWebCorePlatformWincmake"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/PlatformWin.cmake (182242 => 182243)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/PlatformWin.cmake 2015-04-01 18:30:39 UTC (rev 182242)
+++ trunk/Source/WebCore/PlatformWin.cmake 2015-04-01 18:36:43 UTC (rev 182243)
</span><span class="lines">@@ -25,7 +25,6 @@
</span><span class="cx"> platform/graphics/opentype/OpenTypeUtilities.cpp
</span><span class="cx">
</span><span class="cx"> platform/graphics/win/DIBPixelData.cpp
</span><del>- platform/graphics/win/GDIExtras.cpp
</del><span class="cx"> platform/graphics/win/IconWin.cpp
</span><span class="cx"> platform/graphics/win/ImageWin.cpp
</span><span class="cx"> platform/graphics/win/IntPointWin.cpp
</span><span class="lines">@@ -65,28 +64,18 @@
</span><span class="cx"> platform/win/WebCoreInstanceHandle.cpp
</span><span class="cx"> platform/win/WheelEventWin.cpp
</span><span class="cx"> platform/win/WidgetWin.cpp
</span><del>-
- plugins/PluginDatabase.cpp
- plugins/PluginPackage.cpp
-
- plugins/win/PluginDatabaseWin.cpp
</del><span class="cx"> )
</span><span class="cx">
</span><del>-if (ENABLE_NETSCAPE_PLUGIN_API)
- list(APPEND WebCore_SOURCES
- plugins/PluginView.cpp
- plugins/npapi.cpp
</del><ins>+ADD_PRECOMPILED_HEADER("WebCorePrefix" WebCore_SOURCES)
</ins><span class="cx">
</span><del>- plugins/win/PluginMessageThrottlerWin.cpp
- plugins/win/PluginPackageWin.cpp
- plugins/win/PluginViewWin.cpp
- )
-endif ()
-
</del><span class="cx"> list(APPEND WebCore_SOURCES
</span><span class="cx"> "${DERIVED_SOURCES_WEBCORE_DIR}/WebCoreHeaderDetection.h"
</span><span class="cx"> )
</span><span class="cx">
</span><ins>+if (${WTF_PLATFORM_WIN_CAIRO})
+ include(PlatformWinCairo.cmake)
+endif ()
+
</ins><span class="cx"> # FIXME: This should test if AVF headers are available.
</span><span class="cx"> # https://bugs.webkit.org/show_bug.cgi?id=135861
</span><span class="cx"> add_custom_command(
</span></span></pre></div>
<a id="trunkSourceWebCorePlatformWinCairocmake"></a>
<div class="addfile"><h4>Added: trunk/Source/WebCore/PlatformWinCairo.cmake (0 => 182243)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/PlatformWinCairo.cmake (rev 0)
+++ trunk/Source/WebCore/PlatformWinCairo.cmake 2015-04-01 18:36:43 UTC (rev 182243)
</span><span class="lines">@@ -0,0 +1,231 @@
</span><ins>+list(APPEND WebCore_INCLUDE_DIRECTORIES
+ "${DERIVED_SOURCES_DIR}/ForwardingHeaders/JavaScriptCore"
+ "${DirectX_INCLUDE_DIRS}"
+ "$ENV{WEBKIT_LIBRARIES}/include"
+ "$ENV{WEBKIT_LIBRARIES}/include/cairo"
+ "$ENV{WEBKIT_LIBRARIES}/include/SQLite"
+ "$ENV{WEBKIT_LIBRARIES}/include/zlib"
+ "${JAVASCRIPTCORE_DIR}/wtf/text"
+ "${WEBCORE_DIR}/loader/archive/cf"
+ "${WEBCORE_DIR}/platform/cf"
+ "${WEBCORE_DIR}/platform/graphics/cairo"
+ "${WEBCORE_DIR}/platform/network/curl"
+ "${WEBCORE_DIR}/platform/network/win"
+)
+
+list(APPEND WebCore_SOURCES
+ accessibility/win/AXObjectCacheWin.cpp
+ accessibility/win/AccessibilityObjectWin.cpp
+ accessibility/win/AccessibilityObjectWrapperWin.cpp
+
+ editing/SmartReplace.cpp
+ editing/SmartReplaceCF.cpp
+
+ loader/archive/cf/LegacyWebArchive.cpp
+
+ page/win/FrameCairoWin.cpp
+ page/win/FrameWin.cpp
+
+ platform/cf/CFURLExtras.cpp
+ platform/cf/FileSystemCF.cpp
+ platform/cf/SharedBufferCF.cpp
+
+ platform/cf/win/CertificateCFWin.cpp
+
+ platform/graphics/FontPlatformData.cpp
+ platform/graphics/GLContext.cpp
+ platform/graphics/GraphicsLayer.cpp
+ platform/graphics/ImageSource.cpp
+ platform/graphics/ShadowBlur.cpp
+ platform/graphics/WOFFFileFormat.cpp
+
+ platform/graphics/cairo/BitmapImageCairo.cpp
+ platform/graphics/cairo/CairoUtilities.cpp
+ platform/graphics/cairo/FloatRectCairo.cpp
+ platform/graphics/cairo/FontCairo.cpp
+ platform/graphics/cairo/GradientCairo.cpp
+ platform/graphics/cairo/GraphicsContext3DCairo.cpp
+ platform/graphics/cairo/GraphicsContextCairo.cpp
+ platform/graphics/cairo/ImageBufferCairo.cpp
+ platform/graphics/cairo/ImageCairo.cpp
+ platform/graphics/cairo/IntRectCairo.cpp
+ platform/graphics/cairo/OwnPtrCairo.cpp
+ platform/graphics/cairo/PathCairo.cpp
+ platform/graphics/cairo/PatternCairo.cpp
+ platform/graphics/cairo/PlatformContextCairo.cpp
+ platform/graphics/cairo/PlatformPathCairo.cpp
+ platform/graphics/cairo/RefPtrCairo.cpp
+ platform/graphics/cairo/TransformationMatrixCairo.cpp
+
+ platform/graphics/win/DIBPixelData.cpp
+ platform/graphics/win/FontCacheWin.cpp
+ platform/graphics/win/FontCustomPlatformDataCairo.cpp
+ platform/graphics/win/FontPlatformDataCairoWin.cpp
+ platform/graphics/win/FontPlatformDataWin.cpp
+ platform/graphics/win/FontWin.cpp
+ platform/graphics/win/FullScreenController.cpp
+ platform/graphics/win/GlyphPageTreeNodeCairoWin.cpp
+ platform/graphics/win/GraphicsContextCairoWin.cpp
+ platform/graphics/win/GraphicsContextWin.cpp
+ platform/graphics/win/ImageCairoWin.cpp
+ platform/graphics/win/SimpleFontDataCairoWin.cpp
+ platform/graphics/win/SimpleFontDataWin.cpp
+ platform/graphics/win/TransformationMatrixWin.cpp
+ platform/graphics/win/UniscribeController.cpp
+
+ platform/image-decoders/cairo/ImageDecoderCairo.cpp
+
+ platform/network/CredentialStorage.cpp
+ platform/network/NetworkStorageSessionStub.cpp
+ platform/network/SynchronousLoaderClient.cpp
+
+ platform/network/curl/CookieJarCurl.cpp
+ platform/network/curl/CredentialStorageCurl.cpp
+ platform/network/curl/CurlDownload.cpp
+ platform/network/curl/DNSCurl.cpp
+ platform/network/curl/FormDataStreamCurl.cpp
+ platform/network/curl/MultipartHandle.cpp
+ platform/network/curl/ProxyServerCurl.cpp
+ platform/network/curl/ResourceHandleCurl.cpp
+ platform/network/curl/ResourceHandleManager.cpp
+ platform/network/curl/SocketStreamHandleCurl.cpp
+
+ platform/network/win/DownloadBundleWin.cpp
+
+ platform/text/cf/HyphenationCF.cpp
+
+ platform/text/win/LocaleWin.cpp
+ platform/text/win/TextBreakIteratorInternalICUWin.cpp
+
+ platform/win/DelayLoadedModulesEnumerator.cpp
+ platform/win/DragImageCairoWin.cpp
+ platform/win/GDIObjectCounter.cpp
+ platform/win/ImportedFunctionsEnumerator.cpp
+ platform/win/ImportedModulesEnumerator.cpp
+ platform/win/LoggingWin.cpp
+ platform/win/PEImage.cpp
+ platform/win/PathWalker.cpp
+ platform/win/ScrollbarThemeSafari.cpp
+ platform/win/WebCoreBundleWin.cpp
+ platform/win/WebCoreTextRenderer.cpp
+ platform/win/WindowMessageBroadcaster.cpp
+
+ rendering/RenderLayerBacking.cpp
+ rendering/RenderLayerCompositor.cpp
+ rendering/RenderThemeSafari.cpp
+ rendering/RenderThemeWin.cpp
+)
+
+list(APPEND WebCore_USER_AGENT_STYLE_SHEETS
+ ${WEBCORE_DIR}/css/themeWin.css
+ ${WEBCORE_DIR}/css/themeWinQuirks.css
+)
+
+list(APPEND WebCore_LIBRARIES
+ ${DirectX_LIBRARIES}
+ CFLite
+ SQLite3
+ cairo
+ comctl32
+ crypt32
+ iphlpapi
+ libcurl_imp
+ libjpeg
+ libpng
+ libxml2
+ libxslt
+ rpcrt4
+ shlwapi
+ usp10
+ version
+ winmm
+ ws2_32
+ zdll
+)
+
+list(APPEND WebCoreTestSupport_LIBRARIES
+ CFLite
+ cairo
+ shlwapi
+)
+
+set(WebCore_FORWARDING_HEADERS_DIRECTORIES
+ accessibility
+ bindings
+ bridge
+ css
+ dom
+ editing
+ history
+ html
+ inspector
+ loader
+ page
+ platform
+ plugins
+ rendering
+ storage
+ svg
+ websockets
+ workers
+ xml
+
+ Modules/geolocation
+ Modules/notifications
+ Modules/webdatabase
+
+ accessibility/win
+
+ bindings/generic
+ bindings/js
+
+ bridge/jsc
+
+ history/cf
+
+ html/forms
+ html/parser
+
+ loader/appcache
+ loader/archive
+ loader/cache
+ loader/icon
+
+ loader/archive/cf
+
+ page/animation
+ page/win
+
+ platform/animation
+ platform/cf
+ platform/graphics
+ platform/mock
+ platform/network
+ platform/sql
+ platform/text
+ platform/win
+
+ platform/cf/win
+
+ platform/graphics/cairo
+ platform/graphics/opentype
+ platform/graphics/transforms
+ platform/graphics/win
+
+ platform/graphics/ca/win
+
+ platform/network/curl
+
+ platform/text/transcoder
+
+ rendering/style
+ rendering/svg
+
+ svg/animation
+ svg/graphics
+ svg/properties
+
+ svg/graphics/filters
+)
+
+WEBKIT_CREATE_FORWARDING_HEADERS(WebCore DIRECTORIES ${WebCore_FORWARDING_HEADERS_DIRECTORIES})
</ins></span></pre></div>
<a id="trunkSourceWebCorebindingsjsJSDOMStringListCustomcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/bindings/js/JSDOMStringListCustom.cpp (182242 => 182243)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/bindings/js/JSDOMStringListCustom.cpp 2015-04-01 18:30:39 UTC (rev 182242)
+++ trunk/Source/WebCore/bindings/js/JSDOMStringListCustom.cpp 2015-04-01 18:36:43 UTC (rev 182243)
</span><span class="lines">@@ -19,6 +19,7 @@
</span><span class="cx"> #include "config.h"
</span><span class="cx"> #include "JSDOMStringList.h"
</span><span class="cx">
</span><ins>+#include "DOMWrapperWorld.h"
</ins><span class="cx"> #include <runtime/JSCJSValueInlines.h>
</span><span class="cx">
</span><span class="cx"> using namespace JSC;
</span></span></pre></div>
<a id="trunkSourceWebCorebindingsjsJSDOMWrappercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/bindings/js/JSDOMWrapper.cpp (182242 => 182243)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/bindings/js/JSDOMWrapper.cpp 2015-04-01 18:30:39 UTC (rev 182242)
+++ trunk/Source/WebCore/bindings/js/JSDOMWrapper.cpp 2015-04-01 18:36:43 UTC (rev 182243)
</span><span class="lines">@@ -26,6 +26,7 @@
</span><span class="cx"> #include "config.h"
</span><span class="cx"> #include "JSDOMWrapper.h"
</span><span class="cx">
</span><ins>+#include "DOMWrapperWorld.h"
</ins><span class="cx"> #include <runtime/Error.h>
</span><span class="cx">
</span><span class="cx"> using namespace JSC;
</span></span></pre></div>
<a id="trunkSourceWebCorebindingsjsJSMessageChannelCustomcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/bindings/js/JSMessageChannelCustom.cpp (182242 => 182243)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/bindings/js/JSMessageChannelCustom.cpp 2015-04-01 18:30:39 UTC (rev 182242)
+++ trunk/Source/WebCore/bindings/js/JSMessageChannelCustom.cpp 2015-04-01 18:36:43 UTC (rev 182243)
</span><span class="lines">@@ -27,6 +27,7 @@
</span><span class="cx">
</span><span class="cx"> #if ENABLE(CHANNEL_MESSAGING)
</span><span class="cx">
</span><ins>+#include "DOMWrapperWorld.h"
</ins><span class="cx"> #include "JSMessageChannel.h"
</span><span class="cx"> #include <heap/SlotVisitorInlines.h>
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCorebindingsjsJSPopStateEventCustomcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/bindings/js/JSPopStateEventCustom.cpp (182242 => 182243)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/bindings/js/JSPopStateEventCustom.cpp 2015-04-01 18:30:39 UTC (rev 182242)
+++ trunk/Source/WebCore/bindings/js/JSPopStateEventCustom.cpp 2015-04-01 18:36:43 UTC (rev 182243)
</span><span class="lines">@@ -31,6 +31,7 @@
</span><span class="cx"> #include "config.h"
</span><span class="cx"> #include "JSPopStateEvent.h"
</span><span class="cx">
</span><ins>+#include "DOMWrapperWorld.h"
</ins><span class="cx"> #include "JSHistory.h"
</span><span class="cx"> #include <runtime/JSCJSValueInlines.h>
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCorebindingsjsJSReadableStreamCustomcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/bindings/js/JSReadableStreamCustom.cpp (182242 => 182243)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/bindings/js/JSReadableStreamCustom.cpp 2015-04-01 18:30:39 UTC (rev 182242)
+++ trunk/Source/WebCore/bindings/js/JSReadableStreamCustom.cpp 2015-04-01 18:36:43 UTC (rev 182243)
</span><span class="lines">@@ -33,11 +33,13 @@
</span><span class="cx"> #include "JSReadableStream.h"
</span><span class="cx">
</span><span class="cx"> #include "ExceptionCode.h"
</span><ins>+#include "JSDOMBinding.h"
</ins><span class="cx"> #include "JSDOMPromise.h"
</span><span class="cx"> #include "JSReadableStreamReader.h"
</span><span class="cx"> #include "ReadableStream.h"
</span><span class="cx"> #include "ReadableStreamJSSource.h"
</span><span class="cx"> #include "ReadableStreamReader.h"
</span><ins>+#include <runtime/Error.h>
</ins><span class="cx"> #include <wtf/NeverDestroyed.h>
</span><span class="cx">
</span><span class="cx"> using namespace JSC;
</span></span></pre></div>
<a id="trunkSourceWebCorebindingsjsReadableStreamJSSourcecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/bindings/js/ReadableStreamJSSource.cpp (182242 => 182243)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/bindings/js/ReadableStreamJSSource.cpp 2015-04-01 18:30:39 UTC (rev 182242)
+++ trunk/Source/WebCore/bindings/js/ReadableStreamJSSource.cpp 2015-04-01 18:36:43 UTC (rev 182243)
</span><span class="lines">@@ -32,6 +32,7 @@
</span><span class="cx"> #if ENABLE(STREAMS_API)
</span><span class="cx"> #include "ReadableStreamJSSource.h"
</span><span class="cx">
</span><ins>+#include "DOMWrapperWorld.h"
</ins><span class="cx"> #include "JSDOMPromise.h"
</span><span class="cx"> #include "JSReadableStream.h"
</span><span class="cx"> #include "NotImplemented.h"
</span></span></pre></div>
<a id="trunkSourceWebCorebindingsjsScriptControllercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/bindings/js/ScriptController.cpp (182242 => 182243)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/bindings/js/ScriptController.cpp 2015-04-01 18:30:39 UTC (rev 182242)
+++ trunk/Source/WebCore/bindings/js/ScriptController.cpp 2015-04-01 18:36:43 UTC (rev 182243)
</span><span class="lines">@@ -52,6 +52,7 @@
</span><span class="cx"> #include <debugger/Debugger.h>
</span><span class="cx"> #include <heap/StrongInlines.h>
</span><span class="cx"> #include <inspector/ScriptCallStack.h>
</span><ins>+#include <profiler/Profile.h>
</ins><span class="cx"> #include <runtime/InitializeThreading.h>
</span><span class="cx"> #include <runtime/JSLock.h>
</span><span class="cx"> #include <wtf/Threading.h>
</span></span></pre></div>
<a id="trunkSourceWebCorecssCSSComputedStyleDeclarationcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/css/CSSComputedStyleDeclaration.cpp (182242 => 182243)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/css/CSSComputedStyleDeclaration.cpp 2015-04-01 18:30:39 UTC (rev 182242)
+++ trunk/Source/WebCore/css/CSSComputedStyleDeclaration.cpp 2015-04-01 18:36:43 UTC (rev 182243)
</span><span class="lines">@@ -56,6 +56,7 @@
</span><span class="cx"> #include "Pair.h"
</span><span class="cx"> #include "PseudoElement.h"
</span><span class="cx"> #include "Rect.h"
</span><ins>+#include "RenderBlock.h"
</ins><span class="cx"> #include "RenderBox.h"
</span><span class="cx"> #include "RenderStyle.h"
</span><span class="cx"> #include "SVGElement.h"
</span></span></pre></div>
<a id="trunkSourceWebCoredomAttrcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/dom/Attr.cpp (182242 => 182243)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/dom/Attr.cpp 2015-04-01 18:30:39 UTC (rev 182242)
+++ trunk/Source/WebCore/dom/Attr.cpp 2015-04-01 18:36:43 UTC (rev 182243)
</span><span class="lines">@@ -23,6 +23,7 @@
</span><span class="cx"> #include "config.h"
</span><span class="cx"> #include "Attr.h"
</span><span class="cx">
</span><ins>+#include "Event.h"
</ins><span class="cx"> #include "ExceptionCode.h"
</span><span class="cx"> #include "ScopedEventQueue.h"
</span><span class="cx"> #include "StyleProperties.h"
</span></span></pre></div>
<a id="trunkSourceWebCoredomCollectionIndexCachecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/dom/CollectionIndexCache.cpp (182242 => 182243)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/dom/CollectionIndexCache.cpp 2015-04-01 18:30:39 UTC (rev 182242)
+++ trunk/Source/WebCore/dom/CollectionIndexCache.cpp 2015-04-01 18:36:43 UTC (rev 182243)
</span><span class="lines">@@ -26,6 +26,7 @@
</span><span class="cx"> #include "config.h"
</span><span class="cx"> #include "CollectionIndexCache.h"
</span><span class="cx">
</span><ins>+#include "DOMWindow.h"
</ins><span class="cx"> #include "JSDOMWindowBase.h"
</span><span class="cx">
</span><span class="cx"> namespace WebCore {
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicsANGLEWebKitBridgeh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/ANGLEWebKitBridge.h (182242 => 182243)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/ANGLEWebKitBridge.h 2015-04-01 18:30:39 UTC (rev 182242)
+++ trunk/Source/WebCore/platform/graphics/ANGLEWebKitBridge.h 2015-04-01 18:36:43 UTC (rev 182243)
</span><span class="lines">@@ -31,7 +31,7 @@
</span><span class="cx">
</span><span class="cx"> #if !PLATFORM(GTK) && !PLATFORM(EFL) && !PLATFORM(WIN) && !defined(BUILDING_WITH_CMAKE)
</span><span class="cx"> #include "ANGLE/ShaderLang.h"
</span><del>-#elif PLATFORM(WIN)
</del><ins>+#elif PLATFORM(WIN) && !defined(BUILDING_WITH_CMAKE)
</ins><span class="cx"> #include "GLSLANG/ShaderLang.h"
</span><span class="cx"> #else
</span><span class="cx"> #include <ANGLE/ShaderLang.h>
</span></span></pre></div>
<a id="trunkSourceWebKitChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/ChangeLog (182242 => 182243)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/ChangeLog 2015-04-01 18:30:39 UTC (rev 182242)
+++ trunk/Source/WebKit/ChangeLog 2015-04-01 18:36:43 UTC (rev 182243)
</span><span class="lines">@@ -1,3 +1,13 @@
</span><ins>+2015-04-01 Alex Christensen <achristensen@webkit.org>
+
+ Progress towards CMake on Windows and Mac.
+ https://bugs.webkit.org/show_bug.cgi?id=143293
+
+ Reviewed by Filip Pizlo.
+
+ * PlatformMac.cmake:
+ Fixed some include directories.
+
</ins><span class="cx"> 2015-03-26 Alex Christensen <achristensen@webkit.org>
</span><span class="cx">
</span><span class="cx"> Progress towards CMake on Mac.
</span></span></pre></div>
<a id="trunkSourceWebKitPlatformMaccmake"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/PlatformMac.cmake (182242 => 182243)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/PlatformMac.cmake 2015-04-01 18:30:39 UTC (rev 182242)
+++ trunk/Source/WebKit/PlatformMac.cmake 2015-04-01 18:36:43 UTC (rev 182243)
</span><span class="lines">@@ -32,6 +32,7 @@
</span><span class="cx"> )
</span><span class="cx">
</span><span class="cx"> list(APPEND WebKit_INCLUDE_DIRECTORIES
</span><ins>+ "${DERIVED_SOURCES_WEBCORE_DIR}"
</ins><span class="cx"> "${JAVASCRIPTCORE_DIR}/dfg"
</span><span class="cx"> "${WEBCORE_DIR}/accessibility/mac"
</span><span class="cx"> "${WEBCORE_DIR}/bindings/objc"
</span><span class="lines">@@ -67,7 +68,7 @@
</span><span class="cx"> mac/DefaultDelegates
</span><span class="cx"> mac/DOM
</span><span class="cx"> mac/History
</span><del>- mac/icu/unicode
</del><ins>+ mac/icu
</ins><span class="cx"> mac/Misc
</span><span class="cx"> mac/Panels
</span><span class="cx"> mac/Plugins
</span></span></pre></div>
<a id="trunkSourcebmallocChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/bmalloc/ChangeLog (182242 => 182243)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/bmalloc/ChangeLog 2015-04-01 18:30:39 UTC (rev 182242)
+++ trunk/Source/bmalloc/ChangeLog 2015-04-01 18:36:43 UTC (rev 182243)
</span><span class="lines">@@ -1,3 +1,13 @@
</span><ins>+2015-04-01 Alex Christensen <achristensen@webkit.org>
+
+ Progress towards CMake on Windows and Mac.
+ https://bugs.webkit.org/show_bug.cgi?id=143293
+
+ Reviewed by Filip Pizlo.
+
+ * bmalloc/BAssert.h:
+ Removed ellipses from macros to appease Visual Studio.
+
</ins><span class="cx"> 2015-03-13 Alex Christensen <achristensen@webkit.org>
</span><span class="cx">
</span><span class="cx"> Progress towards CMake on Mac.
</span></span></pre></div>
<a id="trunkSourcebmallocbmallocBAsserth"></a>
<div class="modfile"><h4>Modified: trunk/Source/bmalloc/bmalloc/BAssert.h (182242 => 182243)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/bmalloc/bmalloc/BAssert.h 2015-04-01 18:30:39 UTC (rev 182242)
+++ trunk/Source/bmalloc/bmalloc/BAssert.h 2015-04-01 18:36:43 UTC (rev 182243)
</span><span class="lines">@@ -41,7 +41,7 @@
</span><span class="cx">
</span><span class="cx"> #define BASSERT(x)
</span><span class="cx">
</span><del>-#define IF_DEBUG(x...)
</del><ins>+#define IF_DEBUG(x)
</ins><span class="cx">
</span><span class="cx"> #endif // defined(NDEBUG)
</span><span class="cx">
</span><span class="lines">@@ -52,7 +52,7 @@
</span><span class="cx">
</span><span class="cx"> #define BASSERT(x) BASSERT_IMPL(x)
</span><span class="cx">
</span><del>-#define IF_DEBUG(x...) x
</del><ins>+#define IF_DEBUG(x) x
</ins><span class="cx">
</span><span class="cx"> #endif // !defined(NDEBUG)
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourcecmakeOptionsCommoncmake"></a>
<div class="modfile"><h4>Modified: trunk/Source/cmake/OptionsCommon.cmake (182242 => 182243)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/cmake/OptionsCommon.cmake 2015-04-01 18:30:39 UTC (rev 182242)
+++ trunk/Source/cmake/OptionsCommon.cmake 2015-04-01 18:36:43 UTC (rev 182243)
</span><span class="lines">@@ -7,8 +7,8 @@
</span><span class="cx"> # the reader.
</span><span class="cx"> if (MSVC)
</span><span class="cx"> # FIXME: Some codegenerators don't support paths with spaces. So use the executable name only.
</span><del>- get_filename_component(CODE_GENERATOR_PREPROCESSOR_EXECUTABLE ${CMAKE_CXX_COMPILER} NAME)
- set(CODE_GENERATOR_PREPROCESSOR "${CODE_GENERATOR_PREPROCESSOR_EXECUTABLE} /nologo /EP")
</del><ins>+ get_filename_component(CODE_GENERATOR_PREPROCESSOR_EXECUTABLE ${CMAKE_CXX_COMPILER} ABSOLUTE)
+ set(CODE_GENERATOR_PREPROCESSOR "\"${CODE_GENERATOR_PREPROCESSOR_EXECUTABLE}\" /nologo /EP")
</ins><span class="cx"> set(CODE_GENERATOR_PREPROCESSOR_WITH_LINEMARKERS "${CODE_GENERATOR_PREPROCESSOR}")
</span><span class="cx"> else ()
</span><span class="cx"> set(CODE_GENERATOR_PREPROCESSOR "${CMAKE_CXX_COMPILER} -E -P -x c++")
</span></span></pre></div>
<a id="trunkSourcecmakeOptionsWinCairocmake"></a>
<div class="modfile"><h4>Modified: trunk/Source/cmake/OptionsWinCairo.cmake (182242 => 182243)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/cmake/OptionsWinCairo.cmake 2015-04-01 18:30:39 UTC (rev 182242)
+++ trunk/Source/cmake/OptionsWinCairo.cmake 2015-04-01 18:36:43 UTC (rev 182243)
</span><span class="lines">@@ -4,3 +4,6 @@
</span><span class="cx"> set(WTF_USE_CF 1)
</span><span class="cx"> set(WTF_USE_CURL 1)
</span><span class="cx"> set(WTF_USE_ICU_UNICODE 1)
</span><ins>+set(WTF_USE_3D_GRAPHICS 1)
+
+add_definitions(-DWTF_PLATFORM_WIN_CAIRO=1)
</ins></span></pre></div>
<a id="trunkSourcecmakeOptionsWindowscmake"></a>
<div class="modfile"><h4>Modified: trunk/Source/cmake/OptionsWindows.cmake (182242 => 182243)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/cmake/OptionsWindows.cmake 2015-04-01 18:30:39 UTC (rev 182242)
+++ trunk/Source/cmake/OptionsWindows.cmake 2015-04-01 18:36:43 UTC (rev 182243)
</span><span class="lines">@@ -1,6 +1,12 @@
</span><span class="cx"> add_definitions(-D_HAS_EXCEPTIONS=0 -DNOMINMAX -DUNICODE)
</span><span class="cx">
</span><ins>+#FIXME: Make sure these are the same as the Windows feature defines once we get CMake working on Windows.
</ins><span class="cx"> WEBKIT_OPTION_BEGIN()
</span><ins>+WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_DRAG_SUPPORT ON)
+WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_LEGACY_VENDOR_PREFIXES OFF)
+WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_PICTURE_SIZES ON)
+WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_PROMISES OFF)
+WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_VIEW_MODE_CSS_MEDIA OFF)
</ins><span class="cx"> WEBKIT_OPTION_DEFAULT_PORT_VALUE(USE_SYSTEM_MALLOC ON)
</span><span class="cx"> WEBKIT_OPTION_END()
</span><span class="cx">
</span><span class="lines">@@ -11,15 +17,11 @@
</span><span class="cx"> /wd4018 /wd4068 /wd4099 /wd4100 /wd4127 /wd4138 /wd4146 /wd4180 /wd4189 /wd4201 /wd4244 /wd4251 /wd4267 /wd4275 /wd4288
</span><span class="cx"> /wd4291 /wd4305 /wd4309 /wd4344 /wd4355 /wd4389 /wd4396 /wd4481 /wd4503 /wd4505 /wd4510 /wd4512 /wd4530 /wd4610 /wd4702
</span><span class="cx"> /wd4706 /wd4800 /wd4819 /wd4951 /wd4952 /wd4996 /wd6011 /wd6031 /wd6211 /wd6246 /wd6255 /wd6387
</span><ins>+ /MP
</ins><span class="cx"> )
</span><span class="cx">
</span><span class="cx"> string(REGEX REPLACE "/EH[a-z]+" "" CMAKE_CXX_FLAGS ${CMAKE_CXX_FLAGS}) # Disable C++ exceptions
</span><span class="cx"> string(REGEX REPLACE "/GR" "" CMAKE_CXX_FLAGS ${CMAKE_CXX_FLAGS}) # Disable RTTI
</span><del>-
- if (NOT MSVC_VERSION LESS 1500)
- set(CMAKE_C_FLAGS "/MP ${CMAKE_C_FLAGS}")
- set(CMAKE_CXX_FLAGS "/MP ${CMAKE_CXX_FLAGS}")
- endif ()
</del><span class="cx"> endif ()
</span><span class="cx">
</span><span class="cx"> set(PORT Win)
</span></span></pre></div>
<a id="trunkSourcecmakeWebKitFScmake"></a>
<div class="modfile"><h4>Modified: trunk/Source/cmake/WebKitFS.cmake (182242 => 182243)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/cmake/WebKitFS.cmake 2015-04-01 18:30:39 UTC (rev 182242)
+++ trunk/Source/cmake/WebKitFS.cmake 2015-04-01 18:36:43 UTC (rev 182243)
</span><span class="lines">@@ -1,4 +1,5 @@
</span><span class="cx"> file(MAKE_DIRECTORY ${DERIVED_SOURCES_JAVASCRIPTCORE_DIR})
</span><ins>+file(MAKE_DIRECTORY ${DERIVED_SOURCES_WTF_DIR})
</ins><span class="cx"> file(MAKE_DIRECTORY ${CMAKE_BINARY_DIR}/Source/JavaScriptCore/runtime)
</span><span class="cx">
</span><span class="cx"> file(MAKE_DIRECTORY ${DERIVED_SOURCES_WEBINSPECTORUI_DIR})
</span></span></pre></div>
<a id="trunkSourcecmakeWebKitMacroscmake"></a>
<div class="modfile"><h4>Modified: trunk/Source/cmake/WebKitMacros.cmake (182242 => 182243)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/cmake/WebKitMacros.cmake 2015-04-01 18:30:39 UTC (rev 182242)
+++ trunk/Source/cmake/WebKitMacros.cmake 2015-04-01 18:36:43 UTC (rev 182243)
</span><span class="lines">@@ -23,6 +23,20 @@
</span><span class="cx"> set_source_files_properties(${_source} PROPERTIES OBJECT_DEPENDS "${_tmp}")
</span><span class="cx"> endmacro()
</span><span class="cx">
</span><ins>+macro(ADD_PRECOMPILED_HEADER _name _output_source)
+ if (MSVC)
+ set_source_files_properties(${_name}.cpp
+ PROPERTIES COMPILE_FLAGS "/Yc\"${_name}.h\" /Fp\"${_name}.pch\""
+ OBJECT_OUTPUTS "${_name}.pch")
+ foreach (_file ${_input_files})
+ set_source_files_properties(${_file}
+ PROPERTIES COMPILE_FLAGS "/Yu\"${_name}.h\" /FI\"${_name}.h\" /Fp\"${_name}.pch\""
+ OBJECT_DEPENDS "${PrecompiledBinary}")
+ endforeach ()
+ endif ()
+ #FIXME: Add Xcode precompiled header support.
+ list(APPEND ${_output_source} ${PrecompiledSource})
+endmacro()
</ins><span class="cx">
</span><span class="cx"> # Helper macro which wraps generate-bindings.pl script.
</span><span class="cx"> # _output_source is a list name which will contain generated sources.(eg. WebCore_SOURCES)
</span></span></pre>
</div>
</div>
</body>
</html>