<!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>[189749] 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/189749">189749</a></dd>
<dt>Author</dt> <dd>achristensen@apple.com</dd>
<dt>Date</dt> <dd>2015-09-14 14:22:46 -0700 (Mon, 14 Sep 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>Progress towards CMake on Mac.
https://bugs.webkit.org/show_bug.cgi?id=149123
Reviewed by Chris Dumez.
.:
* Source/cmake/OptionsMac.cmake:
* Source/cmake/WebKitFeatures.cmake:
Defined and enabled some more features needed on Mac.
* Source/cmake/WebKitMacros.cmake:
Objective C bindings need special changes when generating:
Some of the bindings do not generate a .mm file but the header is needed.
Some of the bindings do generate a .mm file that doesn't compile but the header is needed.
In order to handle these cases, it is necessary to change the GENERATE_BINDINGS macro just for ObjC.
Source/JavaScriptCore:
* CMakeLists.txt:
Make forwarding headers for the replay subdirectory.
* PlatformMac.cmake:
Make forwarding headers for the generated inspector headers.
They should eventually either be packaged correctly with JavaScriptCore headers and included correctly.
Source/WebCore:
* CMakeLists.txt:
Added some more files.
* PlatformMac.cmake:
Added more files and listed the strange ObjC bindings.
* contentextensions/DFACombiner.cpp:
* contentextensions/DFACombiner.h:
Added preprocessor protection.
* platform/FileSystem.h:
Include utility. It's needed to compile the different configurations.
* platform/ScrollAnimator.cpp:
ScrollAnimator is an abstract class on Mac. Don't compile it.
* platform/graphics/ca/cocoa/PlatformCALayerCocoa.mm:
FontAntialiasingStateSaver.h is only used on iOS.
* rendering/RenderThemeMac.mm:
config.h needs to be outside the #if !PLATFORM(IOS) to compile correctly without precompiled headers.
Source/WebKit:
* CMakeLists.txt:
* PlatformMac.cmake:
Added more sources, make non-c99 sources compile as objc++
* PlatformWin.cmake:
Moved WebCoreTestSupport sources and includes to CMakeLists.txt to share.
Source/WebKit/mac:
* WebView/WebPDFDocumentExtras.mm:
(appendValuesInPDFNameSubtreeToVector):
* WebView/WebPDFView.mm:
Removed cmake include quirks that are not needed when we include things correctly from Quartz.framework/Frameworks.
Source/WebKit2:
* PlatformMac.cmake:
Added some more sources.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkChangeLog">trunk/ChangeLog</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="#trunkSourceWebCoreCMakeListstxt">trunk/Source/WebCore/CMakeLists.txt</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="#trunkSourceWebCorecontentextensionsDFACombinercpp">trunk/Source/WebCore/contentextensions/DFACombiner.cpp</a></li>
<li><a href="#trunkSourceWebCorecontentextensionsDFACombinerh">trunk/Source/WebCore/contentextensions/DFACombiner.h</a></li>
<li><a href="#trunkSourceWebCoreplatformFileSystemh">trunk/Source/WebCore/platform/FileSystem.h</a></li>
<li><a href="#trunkSourceWebCoreplatformScrollAnimatorcpp">trunk/Source/WebCore/platform/ScrollAnimator.cpp</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicscacocoaPlatformCALayerCocoamm">trunk/Source/WebCore/platform/graphics/ca/cocoa/PlatformCALayerCocoa.mm</a></li>
<li><a href="#trunkSourceWebCorerenderingRenderThemeMacmm">trunk/Source/WebCore/rendering/RenderThemeMac.mm</a></li>
<li><a href="#trunkSourceWebKitCMakeListstxt">trunk/Source/WebKit/CMakeLists.txt</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="#trunkSourceWebKitPlatformWincmake">trunk/Source/WebKit/PlatformWin.cmake</a></li>
<li><a href="#trunkSourceWebKitmacChangeLog">trunk/Source/WebKit/mac/ChangeLog</a></li>
<li><a href="#trunkSourceWebKitmacWebViewWebPDFDocumentExtrasmm">trunk/Source/WebKit/mac/WebView/WebPDFDocumentExtras.mm</a></li>
<li><a href="#trunkSourceWebKitmacWebViewWebPDFViewmm">trunk/Source/WebKit/mac/WebView/WebPDFView.mm</a></li>
<li><a href="#trunkSourceWebKit2ChangeLog">trunk/Source/WebKit2/ChangeLog</a></li>
<li><a href="#trunkSourceWebKit2PlatformMaccmake">trunk/Source/WebKit2/PlatformMac.cmake</a></li>
<li><a href="#trunkSourcecmakeOptionsMaccmake">trunk/Source/cmake/OptionsMac.cmake</a></li>
<li><a href="#trunkSourcecmakeWebKitFeaturescmake">trunk/Source/cmake/WebKitFeatures.cmake</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 (189748 => 189749)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/ChangeLog 2015-09-14 21:16:31 UTC (rev 189748)
+++ trunk/ChangeLog 2015-09-14 21:22:46 UTC (rev 189749)
</span><span class="lines">@@ -1,3 +1,19 @@
</span><ins>+2015-09-14 Alex Christensen <achristensen@webkit.org>
+
+ Progress towards CMake on Mac.
+ https://bugs.webkit.org/show_bug.cgi?id=149123
+
+ Reviewed by Chris Dumez.
+
+ * Source/cmake/OptionsMac.cmake:
+ * Source/cmake/WebKitFeatures.cmake:
+ Defined and enabled some more features needed on Mac.
+ * Source/cmake/WebKitMacros.cmake:
+ Objective C bindings need special changes when generating:
+ Some of the bindings do not generate a .mm file but the header is needed.
+ Some of the bindings do generate a .mm file that doesn't compile but the header is needed.
+ In order to handle these cases, it is necessary to change the GENERATE_BINDINGS macro just for ObjC.
+
</ins><span class="cx"> 2015-09-08 Daniel Bates <dabates@apple.com>
</span><span class="cx">
</span><span class="cx"> Convert manual test added in http://trac.webkit.org/changeset/70321 to an automated test
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreCMakeListstxt"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/CMakeLists.txt (189748 => 189749)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/CMakeLists.txt 2015-09-14 21:16:31 UTC (rev 189748)
+++ trunk/Source/JavaScriptCore/CMakeLists.txt 2015-09-14 21:22:46 UTC (rev 189749)
</span><span class="lines">@@ -950,6 +950,7 @@
</span><span class="cx"> llint
</span><span class="cx"> parser
</span><span class="cx"> profiler
</span><ins>+ replay
</ins><span class="cx"> runtime
</span><span class="cx"> yarr
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/ChangeLog (189748 => 189749)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/ChangeLog 2015-09-14 21:16:31 UTC (rev 189748)
+++ trunk/Source/JavaScriptCore/ChangeLog 2015-09-14 21:22:46 UTC (rev 189749)
</span><span class="lines">@@ -1,3 +1,16 @@
</span><ins>+2015-09-14 Alex Christensen <achristensen@webkit.org>
+
+ Progress towards CMake on Mac.
+ https://bugs.webkit.org/show_bug.cgi?id=149123
+
+ Reviewed by Chris Dumez.
+
+ * CMakeLists.txt:
+ Make forwarding headers for the replay subdirectory.
+ * PlatformMac.cmake:
+ Make forwarding headers for the generated inspector headers.
+ They should eventually either be packaged correctly with JavaScriptCore headers and included correctly.
+
</ins><span class="cx"> 2015-09-14 Yusuke Suzuki <utatane.tea@gmail.com>
</span><span class="cx">
</span><span class="cx"> [ES6] Cache the resolution result in JSModuleRecord
</span></span></pre></div>
<a id="trunkSourceJavaScriptCorePlatformMaccmake"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/PlatformMac.cmake (189748 => 189749)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/PlatformMac.cmake 2015-09-14 21:16:31 UTC (rev 189748)
+++ trunk/Source/JavaScriptCore/PlatformMac.cmake 2015-09-14 21:22:46 UTC (rev 189749)
</span><span class="lines">@@ -41,3 +41,14 @@
</span><span class="cx"> list(APPEND JavaScriptCore_HEADERS
</span><span class="cx"> ${DERIVED_SOURCES_JAVASCRIPTCORE_DIR}/TracingDtrace.h
</span><span class="cx"> )
</span><ins>+
+# FIXME: Make including these files consistent in the source so these forwarding headers are not needed.
+if (NOT EXISTS ${DERIVED_SOURCES_JAVASCRIPTCORE_DIR}/InspectorBackendDispatchers.h)
+ file(WRITE ${DERIVED_SOURCES_JAVASCRIPTCORE_DIR}/InspectorBackendDispatchers.h "#include \"inspector/InspectorBackendDispatchers.h\"")
+endif ()
+if (NOT EXISTS ${DERIVED_SOURCES_JAVASCRIPTCORE_DIR}/InspectorFrontendDispatchers.h)
+ file(WRITE ${DERIVED_SOURCES_JAVASCRIPTCORE_DIR}/InspectorFrontendDispatchers.h "#include \"inspector/InspectorFrontendDispatchers.h\"")
+endif ()
+if (NOT EXISTS ${DERIVED_SOURCES_JAVASCRIPTCORE_DIR}/InspectorProtocolObjects.h)
+ file(WRITE ${DERIVED_SOURCES_JAVASCRIPTCORE_DIR}/InspectorProtocolObjects.h "#include \"inspector/InspectorProtocolObjects.h\"")
+endif ()
</ins></span></pre></div>
<a id="trunkSourceWebCoreCMakeListstxt"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/CMakeLists.txt (189748 => 189749)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/CMakeLists.txt 2015-09-14 21:16:31 UTC (rev 189748)
+++ trunk/Source/WebCore/CMakeLists.txt 2015-09-14 21:22:46 UTC (rev 189749)
</span><span class="lines">@@ -1245,6 +1245,7 @@
</span><span class="cx">
</span><span class="cx"> bridge/jsc/BridgeJSC.cpp
</span><span class="cx">
</span><ins>+ contentextensions/CombinedFiltersAlphabet.cpp
</ins><span class="cx"> contentextensions/CombinedURLFilters.cpp
</span><span class="cx"> contentextensions/CompiledContentExtension.cpp
</span><span class="cx"> contentextensions/ContentExtension.cpp
</span><span class="lines">@@ -1252,10 +1253,14 @@
</span><span class="cx"> contentextensions/ContentExtensionError.cpp
</span><span class="cx"> contentextensions/ContentExtensionParser.cpp
</span><span class="cx"> contentextensions/ContentExtensionRule.cpp
</span><ins>+ contentextensions/ContentExtensionStyleSheet.cpp
</ins><span class="cx"> contentextensions/ContentExtensionsBackend.cpp
</span><span class="cx"> contentextensions/DFA.cpp
</span><span class="cx"> contentextensions/DFABytecodeCompiler.cpp
</span><span class="cx"> contentextensions/DFABytecodeInterpreter.cpp
</span><ins>+ contentextensions/DFACombiner.cpp
+ contentextensions/DFAMinimizer.cpp
+ contentextensions/DFANode.cpp
</ins><span class="cx"> contentextensions/NFA.cpp
</span><span class="cx"> contentextensions/NFAToDFA.cpp
</span><span class="cx"> contentextensions/URLFilterParser.cpp
</span><span class="lines">@@ -2033,6 +2038,7 @@
</span><span class="cx"> page/animation/ImplicitAnimation.cpp
</span><span class="cx"> page/animation/KeyframeAnimation.cpp
</span><span class="cx">
</span><ins>+ page/scrolling/AxisScrollSnapOffsets.cpp
</ins><span class="cx"> page/scrolling/ScrollLatchingState.cpp
</span><span class="cx"> page/scrolling/ScrollingConstraints.cpp
</span><span class="cx"> page/scrolling/ScrollingCoordinator.cpp
</span><span class="lines">@@ -2043,6 +2049,13 @@
</span><span class="cx"> page/scrolling/ScrollingStateScrollingNode.cpp
</span><span class="cx"> page/scrolling/ScrollingStateStickyNode.cpp
</span><span class="cx"> page/scrolling/ScrollingStateTree.cpp
</span><ins>+ page/scrolling/ScrollingThread.cpp
+ page/scrolling/ScrollingTree.cpp
+ page/scrolling/ScrollingTreeFrameScrollingNode.cpp
+ page/scrolling/ScrollingTreeNode.cpp
+ page/scrolling/ScrollingTreeOverflowScrollingNode.cpp
+ page/scrolling/ScrollingTreeScrollingNode.cpp
+ page/scrolling/ThreadedScrollingTree.cpp
</ins><span class="cx">
</span><span class="cx"> platform/CalculationValue.cpp
</span><span class="cx"> platform/Clock.cpp
</span></span></pre></div>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (189748 => 189749)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2015-09-14 21:16:31 UTC (rev 189748)
+++ trunk/Source/WebCore/ChangeLog 2015-09-14 21:22:46 UTC (rev 189749)
</span><span class="lines">@@ -1,3 +1,26 @@
</span><ins>+2015-09-14 Alex Christensen <achristensen@webkit.org>
+
+ Progress towards CMake on Mac.
+ https://bugs.webkit.org/show_bug.cgi?id=149123
+
+ Reviewed by Chris Dumez.
+
+ * CMakeLists.txt:
+ Added some more files.
+ * PlatformMac.cmake:
+ Added more files and listed the strange ObjC bindings.
+ * contentextensions/DFACombiner.cpp:
+ * contentextensions/DFACombiner.h:
+ Added preprocessor protection.
+ * platform/FileSystem.h:
+ Include utility. It's needed to compile the different configurations.
+ * platform/ScrollAnimator.cpp:
+ ScrollAnimator is an abstract class on Mac. Don't compile it.
+ * platform/graphics/ca/cocoa/PlatformCALayerCocoa.mm:
+ FontAntialiasingStateSaver.h is only used on iOS.
+ * rendering/RenderThemeMac.mm:
+ config.h needs to be outside the #if !PLATFORM(IOS) to compile correctly without precompiled headers.
+
</ins><span class="cx"> 2015-09-14 Brady Eidson <beidson@apple.com>
</span><span class="cx">
</span><span class="cx"> Rename current concrete IDB implementation to "Legacy".
</span></span></pre></div>
<a id="trunkSourceWebCorePlatformMaccmake"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/PlatformMac.cmake (189748 => 189749)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/PlatformMac.cmake 2015-09-14 21:16:31 UTC (rev 189748)
+++ trunk/Source/WebCore/PlatformMac.cmake 2015-09-14 21:22:46 UTC (rev 189749)
</span><span class="lines">@@ -1,15 +1,39 @@
</span><ins>+find_library(QUARTZ_FRAMEWORK Quartz)
+add_definitions(-iframework ${QUARTZ_FRAMEWORK}/Frameworks)
+
</ins><span class="cx"> list(APPEND WebCore_INCLUDE_DIRECTORIES
</span><ins>+ "${DERIVED_SOURCES_DIR}/ForwardingHeaders/JavaScriptCore"
+ "${DERIVED_SOURCES_JAVASCRIPTCORE_DIR}"
+ "${DERIVED_SOURCES_JAVASCRIPTCORE_DIR}/inspector"
+ "${JAVASCRIPTCORE_DIR}/replay"
+ "${THIRDPARTY_DIR}/ANGLE"
+ "${THIRDPARTY_DIR}/ANGLE/include/KHR"
</ins><span class="cx"> "${WEBCORE_DIR}/accessibility/mac"
</span><span class="cx"> "${WEBCORE_DIR}/bindings/objc"
</span><span class="cx"> "${WEBCORE_DIR}/bridge/objc"
</span><span class="cx"> "${WEBCORE_DIR}/editing/cocoa"
</span><span class="cx"> "${WEBCORE_DIR}/editing/mac"
</span><ins>+ "${WEBCORE_DIR}/ForwardingHeaders"
+ "${WEBCORE_DIR}/ForwardingHeaders/bindings"
+ "${WEBCORE_DIR}/ForwardingHeaders/bytecode"
+ "${WEBCORE_DIR}/ForwardingHeaders/debugger"
+ "${WEBCORE_DIR}/ForwardingHeaders/heap"
+ "${WEBCORE_DIR}/ForwardingHeaders/inspector"
+ "${WEBCORE_DIR}/ForwardingHeaders/interpreter"
+ "${WEBCORE_DIR}/ForwardingHeaders/jit"
+ "${WEBCORE_DIR}/ForwardingHeaders/masm"
+ "${WEBCORE_DIR}/ForwardingHeaders/parser"
+ "${WEBCORE_DIR}/ForwardingHeaders/profiler"
+ "${WEBCORE_DIR}/ForwardingHeaders/replay"
+ "${WEBCORE_DIR}/ForwardingHeaders/runtime"
+ "${WEBCORE_DIR}/ForwardingHeaders/yarr"
</ins><span class="cx"> "${WEBCORE_DIR}/icu"
</span><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="cx"> "${WEBCORE_DIR}/page/cocoa"
</span><span class="cx"> "${WEBCORE_DIR}/page/mac"
</span><ins>+ "${WEBCORE_DIR}/page/scrolling/mac"
</ins><span class="cx"> "${WEBCORE_DIR}/platform/audio/mac"
</span><span class="cx"> "${WEBCORE_DIR}/platform/cf"
</span><span class="cx"> "${WEBCORE_DIR}/platform/cocoa"
</span><span class="lines">@@ -17,7 +41,7 @@
</span><span class="cx"> "${WEBCORE_DIR}/platform/graphics/avfoundation/cf"
</span><span class="cx"> "${WEBCORE_DIR}/platform/graphics/avfoundation/objc"
</span><span class="cx"> "${WEBCORE_DIR}/platform/graphics/ca"
</span><del>- "${WEBCORE_DIR}/platform/graphics/ca/mac"
</del><ins>+ "${WEBCORE_DIR}/platform/graphics/ca/cocoa"
</ins><span class="cx"> "${WEBCORE_DIR}/platform/graphics/cocoa"
</span><span class="cx"> "${WEBCORE_DIR}/platform/graphics/cg"
</span><span class="cx"> "${WEBCORE_DIR}/platform/graphics/opentype"
</span><span class="lines">@@ -32,21 +56,56 @@
</span><span class="cx"> "${WEBCORE_DIR}/platform/spi/cf"
</span><span class="cx"> "${WEBCORE_DIR}/platform/spi/cg"
</span><span class="cx"> "${WEBCORE_DIR}/platform/spi/cocoa"
</span><ins>+ "${WEBCORE_DIR}/platform/spi/ios"
</ins><span class="cx"> "${WEBCORE_DIR}/platform/spi/mac"
</span><span class="cx"> "${WEBCORE_DIR}/plugins/mac"
</span><ins>+ "${WTF_DIR}"
</ins><span class="cx"> )
</span><span class="cx">
</span><ins>+list(APPEND WebCore_USER_AGENT_STYLE_SHEETS
+ ${WEBCORE_DIR}/html/shadow/mac/imageControlsMac.css
+ ${WEBCORE_DIR}/Modules/plugins/QuickTimePluginReplacement.css
+)
+
+add_custom_command(
+ OUTPUT ${DERIVED_SOURCES_WEBCORE_DIR}/UserAgentScripts.h ${DERIVED_SOURCES_WEBCORE_DIR}/UserAgentScripts.cpp
+ MAIN_DEPENDENCY ${WEBCORE_DIR}/Modules/plugins/QuickTimePluginReplacement.js
+ DEPENDS Scripts/make-js-file-arrays.py
+ COMMAND PYTHONPATH=${WebCore_INSPECTOR_SCRIPTS_DIR} ${PYTHON_EXECUTABLE} ${WEBCORE_DIR}/Scripts/make-js-file-arrays.py ${DERIVED_SOURCES_WEBCORE_DIR}/UserAgentScripts.h ${DERIVED_SOURCES_WEBCORE_DIR}/UserAgentScripts.cpp ${WEBCORE_DIR}/Modules/plugins/QuickTimePluginReplacement.js
+ VERBATIM)
+
+#FIXME: Use ios-encodings.txt once we get CMake working for iOS.
+add_custom_command(
+ OUTPUT ${DERIVED_SOURCES_WEBCORE_DIR}/CharsetData.cpp
+ MAIN_DEPENDENCY ${WEBCORE_DIR}/platform/text/mac/make-charset-table.pl
+ DEPENDS platform/text/mac/character-sets.txt
+ DEPENDS platform/text/mac/mac-encodings.txt
+ COMMAND ${PERL_EXECUTABLE} ${WEBCORE_DIR}/platform/text/mac/make-charset-table.pl ${WEBCORE_DIR}/platform/text/mac/character-sets.txt ${WEBCORE_DIR}/platform/text/mac/mac-encodings.txt kTextEncoding > ${DERIVED_SOURCES_WEBCORE_DIR}/CharsetData.cpp
+ VERBATIM)
+
+list(APPEND WebCore_SOURCES
+ ${DERIVED_SOURCES_WEBCORE_DIR}/CharsetData.cpp
+ ${DERIVED_SOURCES_WEBCORE_DIR}/UserAgentScripts.cpp
+)
+
</ins><span class="cx"> list(APPEND WebCore_SYSTEM_INCLUDE_DIRECTORIES
</span><span class="cx"> "/usr/include/libxslt"
</span><span class="cx"> "/usr/include/libxml2"
</span><span class="cx"> )
</span><span class="cx">
</span><span class="cx"> list(APPEND WebCore_SOURCES
</span><ins>+ Modules/indieui/UIRequestEvent.cpp
+
+ Modules/plugins/QuickTimePluginReplacement.mm
+ Modules/plugins/YouTubePluginReplacement.cpp
+
</ins><span class="cx"> accessibility/mac/AXObjectCacheMac.mm
</span><span class="cx"> accessibility/mac/AccessibilityObjectMac.mm
</span><span class="cx"> accessibility/mac/WebAccessibilityObjectWrapperBase.mm
</span><span class="cx"> accessibility/mac/WebAccessibilityObjectWrapperMac.mm
</span><span class="cx">
</span><ins>+ bindings/js/ScriptControllerMac.mm
+
</ins><span class="cx"> bindings/objc/DOM.mm
</span><span class="cx"> bindings/objc/DOMAbstractView.mm
</span><span class="cx"> bindings/objc/DOMCSS.mm
</span><span class="lines">@@ -63,6 +122,12 @@
</span><span class="cx"> bindings/objc/ObjCNodeFilterCondition.mm
</span><span class="cx"> bindings/objc/WebScriptObject.mm
</span><span class="cx">
</span><ins>+ bridge/objc/ObjCRuntimeObject.mm
+ bridge/objc/objc_class.mm
+ bridge/objc/objc_instance.mm
+ bridge/objc/objc_runtime.mm
+ bridge/objc/objc_utility.mm
+
</ins><span class="cx"> crypto/CommonCryptoUtilities.cpp
</span><span class="cx"> crypto/CryptoAlgorithm.cpp
</span><span class="cx"> crypto/CryptoAlgorithmDescriptionBuilder.cpp
</span><span class="lines">@@ -101,6 +166,12 @@
</span><span class="cx"> crypto/mac/CryptoKeyRSAMac.cpp
</span><span class="cx"> crypto/mac/SerializedCryptoKeyWrapMac.mm
</span><span class="cx">
</span><ins>+ dom/DataTransferMac.mm
+
+ editing/SelectionRectGatherer.cpp
+ editing/SmartReplaceCF.cpp
+
+ editing/cocoa/EditorCocoa.mm
</ins><span class="cx"> editing/cocoa/HTMLConverter.mm
</span><span class="cx">
</span><span class="cx"> editing/mac/AlternativeTextUIController.mm
</span><span class="lines">@@ -111,25 +182,63 @@
</span><span class="cx"> editing/mac/TextAlternativeWithRange.mm
</span><span class="cx"> editing/mac/TextUndoInsertionMarkupMac.mm
</span><span class="cx">
</span><ins>+ fileapi/FileMac.mm
+
+ html/shadow/ImageControlsRootElement.cpp
+ html/shadow/YouTubeEmbedShadowElement.cpp
+
+ html/shadow/mac/ImageControlsButtonElementMac.cpp
+ html/shadow/mac/ImageControlsRootElementMac.cpp
+
</ins><span class="cx"> history/mac/HistoryItemMac.mm
</span><span class="cx">
</span><ins>+ loader/ResourceLoadInfo.cpp
+
</ins><span class="cx"> loader/archive/cf/LegacyWebArchive.cpp
</span><span class="cx"> loader/archive/cf/LegacyWebArchiveMac.mm
</span><span class="cx">
</span><ins>+ loader/cocoa/DiskCacheMonitorCocoa.mm
+ loader/cocoa/SubresourceLoaderCocoa.mm
+
</ins><span class="cx"> loader/cf/ResourceLoaderCFNet.cpp
</span><span class="cx"> loader/cf/SubresourceLoaderCF.cpp
</span><span class="cx">
</span><ins>+ loader/mac/DocumentLoaderMac.cpp
+ loader/mac/LoaderNSURLExtras.mm
+ loader/mac/ResourceLoaderMac.mm
+
+ page/CaptionUserPreferencesMediaAF.cpp
+ page/PageDebuggable.cpp
+
</ins><span class="cx"> page/cocoa/UserAgent.mm
</span><span class="cx">
</span><span class="cx"> page/mac/ChromeMac.mm
</span><span class="cx"> page/mac/DragControllerMac.mm
</span><span class="cx"> page/mac/EventHandlerMac.mm
</span><span class="cx"> page/mac/PageMac.cpp
</span><ins>+ page/mac/ServicesOverlayController.mm
</ins><span class="cx"> page/mac/SettingsMac.mm
</span><ins>+ page/mac/TextIndicatorWindow.mm
</ins><span class="cx"> page/mac/UserAgentMac.mm
</span><span class="cx">
</span><ins>+ page/scrolling/AsyncScrollingCoordinator.cpp
+
+ page/scrolling/cocoa/ScrollingStateNode.mm
+
+ page/scrolling/mac/ScrollingCoordinatorMac.mm
+ page/scrolling/mac/ScrollingStateFrameScrollingNodeMac.mm
+ page/scrolling/mac/ScrollingThreadMac.mm
+ page/scrolling/mac/ScrollingTreeFixedNode.mm
+ page/scrolling/mac/ScrollingTreeFrameScrollingNodeMac.mm
+ page/scrolling/mac/ScrollingTreeMac.cpp
+ page/scrolling/mac/ScrollingTreeStickyNode.mm
+
</ins><span class="cx"> platform/LocalizedStrings.cpp
</span><ins>+ platform/ScrollableArea.cpp
+ platform/VNodeTracker.cpp
</ins><span class="cx">
</span><ins>+ platform/audio/AudioSession.cpp
+
</ins><span class="cx"> platform/audio/mac/AudioBusMac.mm
</span><span class="cx"> platform/audio/mac/AudioDestinationMac.cpp
</span><span class="cx"> platform/audio/mac/AudioFileReaderMac.cpp
</span><span class="lines">@@ -151,10 +260,21 @@
</span><span class="cx"> platform/cocoa/ContentFilterUnblockHandlerCocoa.mm
</span><span class="cx"> platform/cocoa/DisplaySleepDisablerCocoa.cpp
</span><span class="cx"> platform/cocoa/KeyEventCocoa.mm
</span><ins>+ platform/cocoa/LocalizedStringsCocoa.mm
+ platform/cocoa/MachSendRight.cpp
</ins><span class="cx"> platform/cocoa/MemoryPressureHandlerCocoa.mm
</span><ins>+ platform/cocoa/NetworkExtensionContentFilter.mm
+ platform/cocoa/ParentalControlsContentFilter.mm
+ platform/cocoa/ScrollController.mm
</ins><span class="cx"> platform/cocoa/SystemVersion.mm
</span><span class="cx"> platform/cocoa/TelephoneNumberDetectorCocoa.cpp
</span><ins>+ platform/cocoa/ThemeCocoa.cpp
+ platform/cocoa/VNodeTrackerCocoa.cpp
</ins><span class="cx">
</span><ins>+ platform/graphics/DisplayRefreshMonitor.cpp
+ platform/graphics/DisplayRefreshMonitorManager.cpp
+ platform/graphics/FontPlatformData.cpp
+
</ins><span class="cx"> platform/graphics/avfoundation/AVTrackPrivateAVFObjCImpl.mm
</span><span class="cx"> platform/graphics/avfoundation/AudioSourceProviderAVFObjC.mm
</span><span class="cx"> platform/graphics/avfoundation/CDMPrivateMediaSourceAVFObjC.mm
</span><span class="lines">@@ -188,6 +308,13 @@
</span><span class="cx"> platform/graphics/ca/TileGrid.cpp
</span><span class="cx"> platform/graphics/ca/TransformationMatrixCA.cpp
</span><span class="cx">
</span><ins>+ platform/graphics/ca/cocoa/LayerFlushSchedulerMac.cpp
+ platform/graphics/ca/cocoa/PlatformCAAnimationCocoa.mm
+ platform/graphics/ca/cocoa/PlatformCAFiltersCocoa.mm
+ platform/graphics/ca/cocoa/PlatformCALayerCocoa.mm
+ platform/graphics/ca/cocoa/WebSystemBackdropLayer.mm
+ platform/graphics/ca/cocoa/WebTiledBackingLayer.mm
+
</ins><span class="cx"> platform/graphics/cg/BitmapImageCG.cpp
</span><span class="cx"> platform/graphics/cg/ColorCG.cpp
</span><span class="cx"> platform/graphics/cg/FloatPointCG.cpp
</span><span class="lines">@@ -212,6 +339,7 @@
</span><span class="cx"> platform/graphics/cg/SubimageCacheWithTimer.cpp
</span><span class="cx"> platform/graphics/cg/TransformationMatrixCG.cpp
</span><span class="cx">
</span><ins>+ platform/graphics/cocoa/FontCacheCoreText.cpp
</ins><span class="cx"> platform/graphics/cocoa/FontCascadeCocoa.mm
</span><span class="cx"> platform/graphics/cocoa/FontCocoa.mm
</span><span class="cx"> platform/graphics/cocoa/FontPlatformDataCocoa.mm
</span><span class="lines">@@ -237,6 +365,7 @@
</span><span class="cx"> platform/graphics/mac/IntPointMac.mm
</span><span class="cx"> platform/graphics/mac/IntRectMac.mm
</span><span class="cx"> platform/graphics/mac/IntSizeMac.mm
</span><ins>+ platform/graphics/mac/MediaPlayerPrivateQTKit.mm
</ins><span class="cx"> platform/graphics/mac/MediaTimeQTKit.mm
</span><span class="cx"> platform/graphics/mac/PDFDocumentImageMac.mm
</span><span class="cx"> platform/graphics/mac/SimpleFontDataCoreText.cpp
</span><span class="lines">@@ -275,6 +404,7 @@
</span><span class="cx"> platform/mac/PlatformPasteboardMac.mm
</span><span class="cx"> platform/mac/PlatformScreenMac.mm
</span><span class="cx"> platform/mac/PlatformSpeechSynthesizerMac.mm
</span><ins>+ platform/mac/PowerObserverMac.cpp
</ins><span class="cx"> platform/mac/PublicSuffixMac.mm
</span><span class="cx"> platform/mac/SSLKeyGeneratorMac.cpp
</span><span class="cx"> platform/mac/ScrollAnimatorMac.mm
</span><span class="lines">@@ -352,6 +482,9 @@
</span><span class="cx"> platform/text/mac/TextBoundaries.mm
</span><span class="cx"> platform/text/mac/TextBreakIteratorInternalICUMac.mm
</span><span class="cx"> platform/text/mac/TextCodecMac.cpp
</span><ins>+
+ rendering/RenderThemeMac.mm
+ rendering/TextAutoSizing.cpp
</ins><span class="cx"> )
</span><span class="cx">
</span><span class="cx"> # FIXME: We do not need everything from all of these directories.
</span><span class="lines">@@ -399,6 +532,7 @@
</span><span class="cx"> loader/appcache
</span><span class="cx"> loader/archive
</span><span class="cx"> loader/cache
</span><ins>+ loader/cocoa
</ins><span class="cx">
</span><span class="cx"> loader/archive/cf
</span><span class="cx">
</span><span class="lines">@@ -411,6 +545,7 @@
</span><span class="cx"> platform/audio
</span><span class="cx"> platform/graphics
</span><span class="cx"> platform/mac
</span><ins>+ platform/mediastream
</ins><span class="cx"> platform/mock
</span><span class="cx"> platform/network
</span><span class="cx"> platform/sql
</span><span class="lines">@@ -509,6 +644,42 @@
</span><span class="cx"> ${WORKERGLOBALSCOPE_CONSTRUCTORS_FILE}
</span><span class="cx"> ${DEDICATEDWORKERGLOBALSCOPE_CONSTRUCTORS_FILE}
</span><span class="cx"> )
</span><ins>+
+set(ObjC_BINDINGS_NO_MM
+ AbstractView
+ AbstractWorker
+ ChildNode
+ DOMURLMediaSource
+ DOMURLMediaStream
+ DOMWindowIndexedDatabase
+ DOMWindowNotifications
+ DOMWindowSpeechSynthesis
+ DOMWindowWebDatabase
+ EventListener
+ EventTarget
+ GlobalEventHandlers
+ HTMLMediaElementMediaSession
+ HTMLMediaElementMediaStream
+ NavigatorBattery
+ NavigatorContentUtils
+ NavigatorGamepad
+ NavigatorGeolocation
+ NavigatorMediaDevices
+ NavigatorUserMedia
+ NavigatorVibration
+ NodeFilter
+ NonDocumentTypeChildNode
+ NonElementParentNode
+ ParentNode
+ URLUtils
+ WindowBase64
+ WindowEventHandlers
+ WindowTimers
+ WorkerGlobalScopeIndexedDatabase
+ WorkerGlobalScopeNotifications
+ XPathNSResolver
+)
+
</ins><span class="cx"> GENERATE_BINDINGS(WebCore_SOURCES
</span><span class="cx"> "${OBJC_BINDINGS_IDL_FILES}"
</span><span class="cx"> "${WEBCORE_DIR}"
</span><span class="lines">@@ -519,136 +690,128 @@
</span><span class="cx"> ${SUPPLEMENTAL_DEPENDENCY_FILE}
</span><span class="cx"> ${ADDITIONAL_BINDINGS_DEPENDENCIES})
</span><span class="cx">
</span><del>-list(REMOVE_ITEM WebCore_SOURCES
- ${DERIVED_SOURCES_WEBCORE_DIR}/DOMAbstractView.mm
- ${DERIVED_SOURCES_WEBCORE_DIR}/DOMAbstractWorker.mm
- ${DERIVED_SOURCES_WEBCORE_DIR}/DOMAnalyserNode.mm
- ${DERIVED_SOURCES_WEBCORE_DIR}/DOMAudioBuffer.mm
- ${DERIVED_SOURCES_WEBCORE_DIR}/DOMAudioBufferSourceNode.mm
- ${DERIVED_SOURCES_WEBCORE_DIR}/DOMAudioContext.mm
- ${DERIVED_SOURCES_WEBCORE_DIR}/DOMAudioDestinationNode.mm
- ${DERIVED_SOURCES_WEBCORE_DIR}/DOMAudioNode.mm
- ${DERIVED_SOURCES_WEBCORE_DIR}/DOMAudioParam.mm
- ${DERIVED_SOURCES_WEBCORE_DIR}/DOMBiquadFilterNode.mm
- ${DERIVED_SOURCES_WEBCORE_DIR}/DOMCanvasRenderingContext2D.mm
- ${DERIVED_SOURCES_WEBCORE_DIR}/DOMChannelMergerNode.mm
- ${DERIVED_SOURCES_WEBCORE_DIR}/DOMChannelSplitterNode.mm
- ${DERIVED_SOURCES_WEBCORE_DIR}/DOMChildNode.mm
- ${DERIVED_SOURCES_WEBCORE_DIR}/DOMCommandLineAPIHost.mm
- ${DERIVED_SOURCES_WEBCORE_DIR}/DOMConvolverNode.mm
- ${DERIVED_SOURCES_WEBCORE_DIR}/DOMCoordinates.mm
- ${DERIVED_SOURCES_WEBCORE_DIR}/DOMCountQueuingStrategy.mm
- ${DERIVED_SOURCES_WEBCORE_DIR}/DOMCrypto.mm
- ${DERIVED_SOURCES_WEBCORE_DIR}/DOMCryptoKey.mm
- ${DERIVED_SOURCES_WEBCORE_DIR}/DOMCustomEvent.mm
- ${DERIVED_SOURCES_WEBCORE_DIR}/DOMDataCue.mm
- ${DERIVED_SOURCES_WEBCORE_DIR}/DOMDataTransfer.mm
- ${DERIVED_SOURCES_WEBCORE_DIR}/DOMDedicatedWorkerGlobalScope.mm
- ${DERIVED_SOURCES_WEBCORE_DIR}/DOMDelayNode.mm
- ${DERIVED_SOURCES_WEBCORE_DIR}/DOMDOMCoreException.mm
- ${DERIVED_SOURCES_WEBCORE_DIR}/DOMDOMFormData.mm
- ${DERIVED_SOURCES_WEBCORE_DIR}/DOMDOMPath.mm
- ${DERIVED_SOURCES_WEBCORE_DIR}/DOMDOMSettableTokenList.mm
- ${DERIVED_SOURCES_WEBCORE_DIR}/DOMDOMStringMap.mm
- ${DERIVED_SOURCES_WEBCORE_DIR}/DOMDOMURL.mm
- ${DERIVED_SOURCES_WEBCORE_DIR}/DOMDOMURLMediaSource.mm
- ${DERIVED_SOURCES_WEBCORE_DIR}/DOMDOMURLMediaStream.mm
- ${DERIVED_SOURCES_WEBCORE_DIR}/DOMDOMWindow.mm
- ${DERIVED_SOURCES_WEBCORE_DIR}/DOMDOMWindowIndexedDatabase.mm
- ${DERIVED_SOURCES_WEBCORE_DIR}/DOMDOMWindowNotifications.mm
- ${DERIVED_SOURCES_WEBCORE_DIR}/DOMDOMWindowSpeechSynthesis.mm
- ${DERIVED_SOURCES_WEBCORE_DIR}/DOMDOMWindowWebDatabase.mm
- ${DERIVED_SOURCES_WEBCORE_DIR}/DOMDynamicsCompressorNode.mm
- ${DERIVED_SOURCES_WEBCORE_DIR}/DOMEventListener.mm
- ${DERIVED_SOURCES_WEBCORE_DIR}/DOMEventTarget.mm
- ${DERIVED_SOURCES_WEBCORE_DIR}/DOMFileException.mm
- ${DERIVED_SOURCES_WEBCORE_DIR}/DOMFileReader.mm
- ${DERIVED_SOURCES_WEBCORE_DIR}/DOMFileReaderSync.mm
- ${DERIVED_SOURCES_WEBCORE_DIR}/DOMGainNode.mm
- ${DERIVED_SOURCES_WEBCORE_DIR}/DOMGeolocation.mm
- ${DERIVED_SOURCES_WEBCORE_DIR}/DOMHistory.mm
- ${DERIVED_SOURCES_WEBCORE_DIR}/DOMHTMLFormControlsCollection.mm
- ${DERIVED_SOURCES_WEBCORE_DIR}/DOMHTMLMediaElement.mm
- ${DERIVED_SOURCES_WEBCORE_DIR}/DOMHTMLMediaElementMediaSession.mm
- ${DERIVED_SOURCES_WEBCORE_DIR}/DOMHTMLMediaElementMediaStream.mm
- ${DERIVED_SOURCES_WEBCORE_DIR}/DOMHTMLTrackElement.mm
- ${DERIVED_SOURCES_WEBCORE_DIR}/DOMHTMLVideoElement.mm
- ${DERIVED_SOURCES_WEBCORE_DIR}/DOMIDBAny.mm
- ${DERIVED_SOURCES_WEBCORE_DIR}/DOMIDBCursor.mm
- ${DERIVED_SOURCES_WEBCORE_DIR}/DOMIDBCursor.mm
- ${DERIVED_SOURCES_WEBCORE_DIR}/DOMIDBCursorWithValue.mm
- ${DERIVED_SOURCES_WEBCORE_DIR}/DOMIDBCursorWithValue.mm
- ${DERIVED_SOURCES_WEBCORE_DIR}/DOMIDBDatabase.mm
- ${DERIVED_SOURCES_WEBCORE_DIR}/DOMIDBDatabase.mm
- ${DERIVED_SOURCES_WEBCORE_DIR}/DOMIDBFactory.mm
- ${DERIVED_SOURCES_WEBCORE_DIR}/DOMIDBFactory.mm
- ${DERIVED_SOURCES_WEBCORE_DIR}/DOMIDBIndex.mm
- ${DERIVED_SOURCES_WEBCORE_DIR}/DOMIDBIndex.mm
- ${DERIVED_SOURCES_WEBCORE_DIR}/DOMIDBKeyRange.mm
- ${DERIVED_SOURCES_WEBCORE_DIR}/DOMIDBKeyRange.mm
- ${DERIVED_SOURCES_WEBCORE_DIR}/DOMIDBObjectStore.mm
- ${DERIVED_SOURCES_WEBCORE_DIR}/DOMIDBObjectStore.mm
- ${DERIVED_SOURCES_WEBCORE_DIR}/DOMIDBOpenDBRequest.mm
- ${DERIVED_SOURCES_WEBCORE_DIR}/DOMIDBOpenDBRequest.mm
- ${DERIVED_SOURCES_WEBCORE_DIR}/DOMIDBRequest.mm
- ${DERIVED_SOURCES_WEBCORE_DIR}/DOMIDBRequest.mm
- ${DERIVED_SOURCES_WEBCORE_DIR}/DOMIDBTransaction.mm
- ${DERIVED_SOURCES_WEBCORE_DIR}/DOMIDBTransaction.mm
- ${DERIVED_SOURCES_WEBCORE_DIR}/DOMIDBVersionChangeEvent.mm
- ${DERIVED_SOURCES_WEBCORE_DIR}/DOMIDBVersionChangeEvent.mm
- ${DERIVED_SOURCES_WEBCORE_DIR}/DOMInspectorFrontendHost.mm
- ${DERIVED_SOURCES_WEBCORE_DIR}/DOMLocation.mm
- ${DERIVED_SOURCES_WEBCORE_DIR}/DOMMediaControlsHost.mm
- ${DERIVED_SOURCES_WEBCORE_DIR}/DOMMediaElementAudioSourceNode.mm
- ${DERIVED_SOURCES_WEBCORE_DIR}/DOMMediaSource.mm
- ${DERIVED_SOURCES_WEBCORE_DIR}/DOMMutationObserver.mm
- ${DERIVED_SOURCES_WEBCORE_DIR}/DOMNavigator.mm
- ${DERIVED_SOURCES_WEBCORE_DIR}/DOMNavigatorBattery.mm
- ${DERIVED_SOURCES_WEBCORE_DIR}/DOMNavigatorContentUtils.mm
- ${DERIVED_SOURCES_WEBCORE_DIR}/DOMNavigatorGamepad.mm
- ${DERIVED_SOURCES_WEBCORE_DIR}/DOMNavigatorGeolocation.mm
- ${DERIVED_SOURCES_WEBCORE_DIR}/DOMNavigatorMediaDevices.mm
- ${DERIVED_SOURCES_WEBCORE_DIR}/DOMNavigatorUserMedia.mm
- ${DERIVED_SOURCES_WEBCORE_DIR}/DOMNavigatorVibration.mm
- ${DERIVED_SOURCES_WEBCORE_DIR}/DOMNodeFilter.mm
- ${DERIVED_SOURCES_WEBCORE_DIR}/DOMNotification.mm
- ${DERIVED_SOURCES_WEBCORE_DIR}/DOMOfflineAudioContext.mm
- ${DERIVED_SOURCES_WEBCORE_DIR}/DOMOscillatorNode.mm
- ${DERIVED_SOURCES_WEBCORE_DIR}/DOMPannerNode.mm
- ${DERIVED_SOURCES_WEBCORE_DIR}/DOMPopStateEvent.mm
- ${DERIVED_SOURCES_WEBCORE_DIR}/DOMRadioNodeList.mm
- ${DERIVED_SOURCES_WEBCORE_DIR}/DOMReadableStream.mm
- ${DERIVED_SOURCES_WEBCORE_DIR}/DOMReadableStreamReader.mm
- ${DERIVED_SOURCES_WEBCORE_DIR}/DOMScriptProcessorNode.mm
- ${DERIVED_SOURCES_WEBCORE_DIR}/DOMScriptProfile.mm
- ${DERIVED_SOURCES_WEBCORE_DIR}/DOMScriptProfileNode.mm
- ${DERIVED_SOURCES_WEBCORE_DIR}/DOMSourceBuffer.mm
- ${DERIVED_SOURCES_WEBCORE_DIR}/DOMSourceBufferList.mm
- ${DERIVED_SOURCES_WEBCORE_DIR}/DOMSQLError.mm
- ${DERIVED_SOURCES_WEBCORE_DIR}/DOMSQLException.mm
- ${DERIVED_SOURCES_WEBCORE_DIR}/DOMSQLResultSetRowList.mm
- ${DERIVED_SOURCES_WEBCORE_DIR}/DOMSQLStatementErrorCallback.mm
- ${DERIVED_SOURCES_WEBCORE_DIR}/DOMSQLTransaction.mm
- ${DERIVED_SOURCES_WEBCORE_DIR}/DOMSQLTransactionErrorCallback.mm
- ${DERIVED_SOURCES_WEBCORE_DIR}/DOMSubtleCrypto.mm
- ${DERIVED_SOURCES_WEBCORE_DIR}/DOMTrackEvent.mm
- ${DERIVED_SOURCES_WEBCORE_DIR}/DOMUIRequestEvent.mm
- ${DERIVED_SOURCES_WEBCORE_DIR}/DOMURLUtils.mm
- ${DERIVED_SOURCES_WEBCORE_DIR}/DOMVTTCue.mm
- ${DERIVED_SOURCES_WEBCORE_DIR}/DOMWaveShaperNode.mm
- ${DERIVED_SOURCES_WEBCORE_DIR}/DOMWebGL2RenderingContext.mm
- ${DERIVED_SOURCES_WEBCORE_DIR}/DOMWebGLRenderingContext.mm
- ${DERIVED_SOURCES_WEBCORE_DIR}/DOMWebGLRenderingContextBase.mm
- ${DERIVED_SOURCES_WEBCORE_DIR}/DOMWebSocket.mm
- ${DERIVED_SOURCES_WEBCORE_DIR}/DOMWindowBase64.mm
- ${DERIVED_SOURCES_WEBCORE_DIR}/DOMWindowIndexedDatabase.mm
- ${DERIVED_SOURCES_WEBCORE_DIR}/DOMWindowTimers.mm
- ${DERIVED_SOURCES_WEBCORE_DIR}/DOMWorker.mm
- ${DERIVED_SOURCES_WEBCORE_DIR}/DOMWorkerGlobalScope.mm
- ${DERIVED_SOURCES_WEBCORE_DIR}/DOMWorkerGlobalScopeIndexedDatabase.mm
- ${DERIVED_SOURCES_WEBCORE_DIR}/DOMWorkerGlobalScopeIndexedDatabase.mm
- ${DERIVED_SOURCES_WEBCORE_DIR}/DOMWorkerGlobalScopeNotifications.mm
- ${DERIVED_SOURCES_WEBCORE_DIR}/DOMXMLHttpRequest.mm
- ${DERIVED_SOURCES_WEBCORE_DIR}/DOMXMLHttpRequestProgressEvent.mm
- ${DERIVED_SOURCES_WEBCORE_DIR}/DOMXPathNSResolver.mm
</del><ins>+list(APPEND WebCore_SOURCES
+ ${DERIVED_SOURCES_WEBCORE_DIR}/DOMAttr.mm
+ ${DERIVED_SOURCES_WEBCORE_DIR}/DOMBeforeLoadEvent.mm
+ ${DERIVED_SOURCES_WEBCORE_DIR}/DOMCDATASection.mm
+ ${DERIVED_SOURCES_WEBCORE_DIR}/DOMCharacterData.mm
+ ${DERIVED_SOURCES_WEBCORE_DIR}/DOMComment.mm
+ ${DERIVED_SOURCES_WEBCORE_DIR}/DOMCounter.mm
+ ${DERIVED_SOURCES_WEBCORE_DIR}/DOMCSSCharsetRule.mm
+ ${DERIVED_SOURCES_WEBCORE_DIR}/DOMCSSFontFaceRule.mm
+ ${DERIVED_SOURCES_WEBCORE_DIR}/DOMCSSImportRule.mm
+ ${DERIVED_SOURCES_WEBCORE_DIR}/DOMCSSKeyframeRule.mm
+ ${DERIVED_SOURCES_WEBCORE_DIR}/DOMCSSKeyframesRule.mm
+ ${DERIVED_SOURCES_WEBCORE_DIR}/DOMCSSMediaRule.mm
+ ${DERIVED_SOURCES_WEBCORE_DIR}/DOMCSSPageRule.mm
+ ${DERIVED_SOURCES_WEBCORE_DIR}/DOMCSSPrimitiveValue.mm
+ ${DERIVED_SOURCES_WEBCORE_DIR}/DOMCSSRule.mm
+ ${DERIVED_SOURCES_WEBCORE_DIR}/DOMCSSRuleList.mm
+ ${DERIVED_SOURCES_WEBCORE_DIR}/DOMCSSStyleDeclaration.mm
+ ${DERIVED_SOURCES_WEBCORE_DIR}/DOMCSSStyleRule.mm
+ ${DERIVED_SOURCES_WEBCORE_DIR}/DOMCSSStyleSheet.mm
+ ${DERIVED_SOURCES_WEBCORE_DIR}/DOMCSSSupportsRule.mm
+ ${DERIVED_SOURCES_WEBCORE_DIR}/DOMCSSUnknownRule.mm
+ ${DERIVED_SOURCES_WEBCORE_DIR}/DOMCSSValue.mm
+ ${DERIVED_SOURCES_WEBCORE_DIR}/DOMCSSValueList.mm
+ ${DERIVED_SOURCES_WEBCORE_DIR}/DOMDocument.mm
+ ${DERIVED_SOURCES_WEBCORE_DIR}/DOMDocumentFragment.mm
+ ${DERIVED_SOURCES_WEBCORE_DIR}/DOMDocumentType.mm
+ ${DERIVED_SOURCES_WEBCORE_DIR}/DOMDOMImplementation.mm
+ ${DERIVED_SOURCES_WEBCORE_DIR}/DOMDOMNamedFlowCollection.mm
+ ${DERIVED_SOURCES_WEBCORE_DIR}/DOMDOMTokenList.mm
+ ${DERIVED_SOURCES_WEBCORE_DIR}/DOMElement.mm
+ ${DERIVED_SOURCES_WEBCORE_DIR}/DOMEntity.mm
+ ${DERIVED_SOURCES_WEBCORE_DIR}/DOMEntityReference.mm
+ ${DERIVED_SOURCES_WEBCORE_DIR}/DOMEvent.mm
+ ${DERIVED_SOURCES_WEBCORE_DIR}/DOMFile.mm
+ ${DERIVED_SOURCES_WEBCORE_DIR}/DOMFileList.mm
+ ${DERIVED_SOURCES_WEBCORE_DIR}/DOMHTMLAnchorElement.mm
+ ${DERIVED_SOURCES_WEBCORE_DIR}/DOMHTMLAppletElement.mm
+ ${DERIVED_SOURCES_WEBCORE_DIR}/DOMHTMLAreaElement.mm
+ ${DERIVED_SOURCES_WEBCORE_DIR}/DOMHTMLBaseElement.mm
+ ${DERIVED_SOURCES_WEBCORE_DIR}/DOMHTMLBaseFontElement.mm
+ ${DERIVED_SOURCES_WEBCORE_DIR}/DOMHTMLBodyElement.mm
+ ${DERIVED_SOURCES_WEBCORE_DIR}/DOMHTMLBRElement.mm
+ ${DERIVED_SOURCES_WEBCORE_DIR}/DOMHTMLButtonElement.mm
+ ${DERIVED_SOURCES_WEBCORE_DIR}/DOMHTMLCanvasElement.mm
+ ${DERIVED_SOURCES_WEBCORE_DIR}/DOMHTMLCollection.mm
+ ${DERIVED_SOURCES_WEBCORE_DIR}/DOMHTMLDirectoryElement.mm
+ ${DERIVED_SOURCES_WEBCORE_DIR}/DOMHTMLDivElement.mm
+ ${DERIVED_SOURCES_WEBCORE_DIR}/DOMHTMLDListElement.mm
+ ${DERIVED_SOURCES_WEBCORE_DIR}/DOMHTMLDocument.mm
+ ${DERIVED_SOURCES_WEBCORE_DIR}/DOMHTMLElement.mm
+ ${DERIVED_SOURCES_WEBCORE_DIR}/DOMHTMLEmbedElement.mm
+ ${DERIVED_SOURCES_WEBCORE_DIR}/DOMHTMLFieldSetElement.mm
+ ${DERIVED_SOURCES_WEBCORE_DIR}/DOMHTMLFontElement.mm
+ ${DERIVED_SOURCES_WEBCORE_DIR}/DOMHTMLFormElement.mm
+ ${DERIVED_SOURCES_WEBCORE_DIR}/DOMHTMLFrameElement.mm
+ ${DERIVED_SOURCES_WEBCORE_DIR}/DOMHTMLFrameSetElement.mm
+ ${DERIVED_SOURCES_WEBCORE_DIR}/DOMHTMLHeadElement.mm
+ ${DERIVED_SOURCES_WEBCORE_DIR}/DOMHTMLHeadingElement.mm
+ ${DERIVED_SOURCES_WEBCORE_DIR}/DOMHTMLHRElement.mm
+ ${DERIVED_SOURCES_WEBCORE_DIR}/DOMHTMLHtmlElement.mm
+ ${DERIVED_SOURCES_WEBCORE_DIR}/DOMHTMLIFrameElement.mm
+ ${DERIVED_SOURCES_WEBCORE_DIR}/DOMHTMLImageElement.mm
+ ${DERIVED_SOURCES_WEBCORE_DIR}/DOMHTMLInputElement.mm
+ ${DERIVED_SOURCES_WEBCORE_DIR}/DOMHTMLLabelElement.mm
+ ${DERIVED_SOURCES_WEBCORE_DIR}/DOMHTMLLegendElement.mm
+ ${DERIVED_SOURCES_WEBCORE_DIR}/DOMHTMLLIElement.mm
+ ${DERIVED_SOURCES_WEBCORE_DIR}/DOMHTMLLinkElement.mm
+ ${DERIVED_SOURCES_WEBCORE_DIR}/DOMHTMLMapElement.mm
+ ${DERIVED_SOURCES_WEBCORE_DIR}/DOMHTMLMarqueeElement.mm
+ ${DERIVED_SOURCES_WEBCORE_DIR}/DOMHTMLMenuElement.mm
+ ${DERIVED_SOURCES_WEBCORE_DIR}/DOMHTMLMetaElement.mm
+ ${DERIVED_SOURCES_WEBCORE_DIR}/DOMHTMLModElement.mm
+ ${DERIVED_SOURCES_WEBCORE_DIR}/DOMHTMLObjectElement.mm
+ ${DERIVED_SOURCES_WEBCORE_DIR}/DOMHTMLOListElement.mm
+ ${DERIVED_SOURCES_WEBCORE_DIR}/DOMHTMLOptGroupElement.mm
+ ${DERIVED_SOURCES_WEBCORE_DIR}/DOMHTMLOptionElement.mm
+ ${DERIVED_SOURCES_WEBCORE_DIR}/DOMHTMLOptionsCollection.mm
+ ${DERIVED_SOURCES_WEBCORE_DIR}/DOMHTMLParagraphElement.mm
+ ${DERIVED_SOURCES_WEBCORE_DIR}/DOMHTMLParamElement.mm
+ ${DERIVED_SOURCES_WEBCORE_DIR}/DOMHTMLPreElement.mm
+ ${DERIVED_SOURCES_WEBCORE_DIR}/DOMHTMLQuoteElement.mm
+ ${DERIVED_SOURCES_WEBCORE_DIR}/DOMHTMLScriptElement.mm
+ ${DERIVED_SOURCES_WEBCORE_DIR}/DOMHTMLSelectElement.mm
+ ${DERIVED_SOURCES_WEBCORE_DIR}/DOMHTMLStyleElement.mm
+ ${DERIVED_SOURCES_WEBCORE_DIR}/DOMHTMLTableCaptionElement.mm
+ ${DERIVED_SOURCES_WEBCORE_DIR}/DOMHTMLTableCellElement.mm
+ ${DERIVED_SOURCES_WEBCORE_DIR}/DOMHTMLTableColElement.mm
+ ${DERIVED_SOURCES_WEBCORE_DIR}/DOMHTMLTableElement.mm
+ ${DERIVED_SOURCES_WEBCORE_DIR}/DOMHTMLTableRowElement.mm
+ ${DERIVED_SOURCES_WEBCORE_DIR}/DOMHTMLTableSectionElement.mm
+ ${DERIVED_SOURCES_WEBCORE_DIR}/DOMHTMLTextAreaElement.mm
+ ${DERIVED_SOURCES_WEBCORE_DIR}/DOMHTMLTitleElement.mm
+ ${DERIVED_SOURCES_WEBCORE_DIR}/DOMHTMLUListElement.mm
+ ${DERIVED_SOURCES_WEBCORE_DIR}/DOMKeyboardEvent.mm
+ ${DERIVED_SOURCES_WEBCORE_DIR}/DOMMediaList.mm
+ ${DERIVED_SOURCES_WEBCORE_DIR}/DOMMessageEvent.mm
+ ${DERIVED_SOURCES_WEBCORE_DIR}/DOMMessagePort.mm
+ ${DERIVED_SOURCES_WEBCORE_DIR}/DOMMouseEvent.mm
+ ${DERIVED_SOURCES_WEBCORE_DIR}/DOMMutationEvent.mm
+ ${DERIVED_SOURCES_WEBCORE_DIR}/DOMNamedNodeMap.mm
+ ${DERIVED_SOURCES_WEBCORE_DIR}/DOMNode.mm
+ ${DERIVED_SOURCES_WEBCORE_DIR}/DOMNodeIterator.mm
+ ${DERIVED_SOURCES_WEBCORE_DIR}/DOMNodeList.mm
+ ${DERIVED_SOURCES_WEBCORE_DIR}/DOMOverflowEvent.mm
+ ${DERIVED_SOURCES_WEBCORE_DIR}/DOMProcessingInstruction.mm
+ ${DERIVED_SOURCES_WEBCORE_DIR}/DOMProgressEvent.mm
+ ${DERIVED_SOURCES_WEBCORE_DIR}/DOMRange.mm
+ ${DERIVED_SOURCES_WEBCORE_DIR}/DOMRect.mm
+ ${DERIVED_SOURCES_WEBCORE_DIR}/DOMRGBColor.mm
+ ${DERIVED_SOURCES_WEBCORE_DIR}/DOMStyleSheet.mm
+ ${DERIVED_SOURCES_WEBCORE_DIR}/DOMStyleSheetList.mm
+ ${DERIVED_SOURCES_WEBCORE_DIR}/DOMText.mm
+ ${DERIVED_SOURCES_WEBCORE_DIR}/DOMTextEvent.mm
+ ${DERIVED_SOURCES_WEBCORE_DIR}/DOMTreeWalker.mm
+ ${DERIVED_SOURCES_WEBCORE_DIR}/DOMUIEvent.mm
+ ${DERIVED_SOURCES_WEBCORE_DIR}/DOMValidityState.mm
+ ${DERIVED_SOURCES_WEBCORE_DIR}/DOMWebKitCSSFilterValue.mm
+ ${DERIVED_SOURCES_WEBCORE_DIR}/DOMWebKitCSSRegionRule.mm
+ ${DERIVED_SOURCES_WEBCORE_DIR}/DOMWebKitCSSTransformValue.mm
+ ${DERIVED_SOURCES_WEBCORE_DIR}/DOMWebKitNamedFlow.mm
+ ${DERIVED_SOURCES_WEBCORE_DIR}/DOMWheelEvent.mm
+ ${DERIVED_SOURCES_WEBCORE_DIR}/DOMXPathExpression.mm
+ ${DERIVED_SOURCES_WEBCORE_DIR}/DOMXPathResult.mm
</ins><span class="cx"> )
</span></span></pre></div>
<a id="trunkSourceWebCorecontentextensionsDFACombinercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/contentextensions/DFACombiner.cpp (189748 => 189749)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/contentextensions/DFACombiner.cpp 2015-09-14 21:16:31 UTC (rev 189748)
+++ trunk/Source/WebCore/contentextensions/DFACombiner.cpp 2015-09-14 21:22:46 UTC (rev 189749)
</span><span class="lines">@@ -26,6 +26,8 @@
</span><span class="cx"> #include "config.h"
</span><span class="cx"> #include "DFACombiner.h"
</span><span class="cx">
</span><ins>+#if ENABLE(CONTENT_EXTENSIONS)
+
</ins><span class="cx"> #include "MutableRangeList.h"
</span><span class="cx"> #include <wtf/HashMap.h>
</span><span class="cx"> #include <wtf/HashSet.h>
</span><span class="lines">@@ -221,3 +223,5 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> } // namespace WebCore
</span><ins>+
+#endif
</ins></span></pre></div>
<a id="trunkSourceWebCorecontentextensionsDFACombinerh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/contentextensions/DFACombiner.h (189748 => 189749)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/contentextensions/DFACombiner.h 2015-09-14 21:16:31 UTC (rev 189748)
+++ trunk/Source/WebCore/contentextensions/DFACombiner.h 2015-09-14 21:22:46 UTC (rev 189749)
</span><span class="lines">@@ -26,6 +26,8 @@
</span><span class="cx"> #ifndef DFACombiner_h
</span><span class="cx"> #define DFACombiner_h
</span><span class="cx">
</span><ins>+#if ENABLE(CONTENT_EXTENSIONS)
+
</ins><span class="cx"> #include "DFA.h"
</span><span class="cx"> #include <wtf/Vector.h>
</span><span class="cx">
</span><span class="lines">@@ -53,3 +55,5 @@
</span><span class="cx"> } // namespace WebCore
</span><span class="cx">
</span><span class="cx"> #endif
</span><ins>+
+#endif
</ins></span></pre></div>
<a id="trunkSourceWebCoreplatformFileSystemh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/FileSystem.h (189748 => 189749)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/FileSystem.h 2015-09-14 21:16:31 UTC (rev 189748)
+++ trunk/Source/WebCore/platform/FileSystem.h 2015-09-14 21:22:46 UTC (rev 189749)
</span><span class="lines">@@ -32,6 +32,7 @@
</span><span class="cx"> #define FileSystem_h
</span><span class="cx">
</span><span class="cx"> #include <time.h>
</span><ins>+#include <utility>
</ins><span class="cx"> #include <wtf/Forward.h>
</span><span class="cx"> #include <wtf/Vector.h>
</span><span class="cx"> #include <wtf/text/WTFString.h>
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformScrollAnimatorcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/ScrollAnimator.cpp (189748 => 189749)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/ScrollAnimator.cpp 2015-09-14 21:16:31 UTC (rev 189748)
+++ trunk/Source/WebCore/platform/ScrollAnimator.cpp 2015-09-14 21:22:46 UTC (rev 189749)
</span><span class="lines">@@ -40,7 +40,7 @@
</span><span class="cx">
</span><span class="cx"> namespace WebCore {
</span><span class="cx">
</span><del>-#if !ENABLE(SMOOTH_SCROLLING) && !PLATFORM(IOS)
</del><ins>+#if !ENABLE(SMOOTH_SCROLLING) && !PLATFORM(IOS) && !PLATFORM(MAC)
</ins><span class="cx"> std::unique_ptr<ScrollAnimator> ScrollAnimator::create(ScrollableArea& scrollableArea)
</span><span class="cx"> {
</span><span class="cx"> return std::make_unique<ScrollAnimator>(scrollableArea);
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicscacocoaPlatformCALayerCocoamm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/ca/cocoa/PlatformCALayerCocoa.mm (189748 => 189749)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/ca/cocoa/PlatformCALayerCocoa.mm 2015-09-14 21:16:31 UTC (rev 189748)
+++ trunk/Source/WebCore/platform/graphics/ca/cocoa/PlatformCALayerCocoa.mm 2015-09-14 21:22:46 UTC (rev 189749)
</span><span class="lines">@@ -28,7 +28,6 @@
</span><span class="cx">
</span><span class="cx"> #import "AnimationUtilities.h"
</span><span class="cx"> #import "BlockExceptions.h"
</span><del>-#import "FontAntialiasingStateSaver.h"
</del><span class="cx"> #import "GraphicsContext.h"
</span><span class="cx"> #import "GraphicsLayerCA.h"
</span><span class="cx"> #import "LengthFunctions.h"
</span><span class="lines">@@ -53,6 +52,7 @@
</span><span class="cx"> #import <wtf/RetainPtr.h>
</span><span class="cx">
</span><span class="cx"> #if PLATFORM(IOS)
</span><ins>+#import "FontAntialiasingStateSaver.h"
</ins><span class="cx"> #import "WAKWindow.h"
</span><span class="cx"> #import "WKGraphics.h"
</span><span class="cx"> #import "WebCoreThread.h"
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingRenderThemeMacmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/RenderThemeMac.mm (189748 => 189749)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/RenderThemeMac.mm 2015-09-14 21:16:31 UTC (rev 189748)
+++ trunk/Source/WebCore/rendering/RenderThemeMac.mm 2015-09-14 21:22:46 UTC (rev 189749)
</span><span class="lines">@@ -16,9 +16,10 @@
</span><span class="cx"> * the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
</span><span class="cx"> * Boston, MA 02110-1301, USA.
</span><span class="cx"> */
</span><ins>+#import "config.h"
+
</ins><span class="cx"> #if !PLATFORM(IOS)
</span><span class="cx">
</span><del>-#import "config.h"
</del><span class="cx"> #import "RenderThemeMac.h"
</span><span class="cx">
</span><span class="cx"> #import "BitmapImage.h"
</span></span></pre></div>
<a id="trunkSourceWebKitCMakeListstxt"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/CMakeLists.txt (189748 => 189749)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/CMakeLists.txt 2015-09-14 21:16:31 UTC (rev 189748)
+++ trunk/Source/WebKit/CMakeLists.txt 2015-09-14 21:22:46 UTC (rev 189749)
</span><span class="lines">@@ -2,9 +2,11 @@
</span><span class="cx"> include(WebKitCommon)
</span><span class="cx">
</span><span class="cx"> set(WebKit_SOURCES
</span><ins>+ WebCoreSupport/WebViewGroup.cpp
</ins><span class="cx"> )
</span><span class="cx">
</span><span class="cx"> set(WebKit_INCLUDE_DIRECTORIES
</span><ins>+ WebCoreSupport
</ins><span class="cx"> "${CMAKE_BINARY_DIR}"
</span><span class="cx"> "${CMAKE_SOURCE_DIR}/Source"
</span><span class="cx"> "${DERIVED_SOURCES_DIR}"
</span></span></pre></div>
<a id="trunkSourceWebKitChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/ChangeLog (189748 => 189749)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/ChangeLog 2015-09-14 21:16:31 UTC (rev 189748)
+++ trunk/Source/WebKit/ChangeLog 2015-09-14 21:22:46 UTC (rev 189749)
</span><span class="lines">@@ -1,3 +1,16 @@
</span><ins>+2015-09-14 Alex Christensen <achristensen@webkit.org>
+
+ Progress towards CMake on Mac.
+ https://bugs.webkit.org/show_bug.cgi?id=149123
+
+ Reviewed by Chris Dumez.
+
+ * CMakeLists.txt:
+ * PlatformMac.cmake:
+ Added more sources, make non-c99 sources compile as objc++
+ * PlatformWin.cmake:
+ Moved WebCoreTestSupport sources and includes to CMakeLists.txt to share.
+
</ins><span class="cx"> 2015-09-13 Gyuyoung Kim <gyuyoung.kim@webkit.org>
</span><span class="cx">
</span><span class="cx"> Remove all uses of PassRefPtr in crypto, storage, and history
</span></span></pre></div>
<a id="trunkSourceWebKitPlatformMaccmake"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/PlatformMac.cmake (189748 => 189749)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/PlatformMac.cmake 2015-09-14 21:16:31 UTC (rev 189748)
+++ trunk/Source/WebKit/PlatformMac.cmake 2015-09-14 21:22:46 UTC (rev 189749)
</span><span class="lines">@@ -12,11 +12,13 @@
</span><span class="cx"> find_library(QUARTZCORE_LIBRARY QuartzCore)
</span><span class="cx"> find_library(SECURITY_LIBRARY Security)
</span><span class="cx"> find_library(SQLITE3_LIBRARY sqlite3)
</span><ins>+find_library(SYSTEM_CONFIGURATION_LIBRARY SystemConfiguration)
</ins><span class="cx"> find_library(XML2_LIBRARY XML2)
</span><span class="cx"> find_package(ZLIB REQUIRED)
</span><span class="cx">
</span><del>-find_library(PDFKIT_FRAMEWORK PDFKit HINTS ${QUARTZ_LIBRARY}/Versions/*/Frameworks)
-find_path(PDFKIT_INCLUDE_DIRECTORY PDFKit.h HINTS ${PDFKIT_FRAMEWORK}/Versions/*/Headers)
</del><ins>+add_definitions(-iframework ${QUARTZ_LIBRARY}/Frameworks)
+find_library(PDFKIT_LIBRARY PDFKit HINTS ${QUARTZ_LIBRARY}/Frameworks)
+find_library(QUICKLOOKUI_LIBRARY QuickLookUI HINTS ${QUARTZ_LIBRARY}/Frameworks)
</ins><span class="cx">
</span><span class="cx"> if ("${CURRENT_OSX_VERSION}" MATCHES "10.9")
</span><span class="cx"> set(WEBKITSYSTEMINTERFACE_LIBRARY libWebKitSystemInterfaceMavericks.a)
</span><span class="lines">@@ -38,11 +40,12 @@
</span><span class="cx"> PRIVATE ${IOKIT_LIBRARY}
</span><span class="cx"> PRIVATE ${IOSURFACE_LIBRARY}
</span><span class="cx"> PRIVATE ${OPENGL_LIBRARY}
</span><del>- PRIVATE ${PDFKIT_FRAMEWORK}/PDFKit
</del><ins>+ PRIVATE ${PDFKIT_LIBRARY}
</ins><span class="cx"> PRIVATE ${QUARTZ_LIBRARY}
</span><span class="cx"> PRIVATE ${QUARTZCORE_LIBRARY}
</span><span class="cx"> PRIVATE ${SECURITY_LIBRARY}
</span><span class="cx"> PRIVATE ${SQLITE3_LIBRARY}
</span><ins>+ PRIVATE ${SYSTEM_CONFIGURATION_LIBRARY}
</ins><span class="cx"> PRIVATE ${WEBKITSYSTEMINTERFACE_LIBRARY}
</span><span class="cx"> PRIVATE ${XML2_LIBRARY}
</span><span class="cx"> PRIVATE ${ZLIB_LIBRARIES}
</span><span class="lines">@@ -50,8 +53,10 @@
</span><span class="cx">
</span><span class="cx"> list(APPEND WebKit_INCLUDE_DIRECTORIES
</span><span class="cx"> "${DERIVED_SOURCES_DIR}"
</span><ins>+ "${DERIVED_SOURCES_JAVASCRIPTCORE_DIR}"
</ins><span class="cx"> "${DERIVED_SOURCES_WEBCORE_DIR}"
</span><span class="cx"> "${DERIVED_SOURCES_WEBKITLEGACY_DIR}"
</span><ins>+ "${JAVASCRIPTCORE_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">@@ -82,11 +87,11 @@
</span><span class="cx"> "${WEBCORE_DIR}/platform/text/cf"
</span><span class="cx"> "${WEBCORE_DIR}/platform/text/mac"
</span><span class="cx"> "${WEBCORE_DIR}/plugins/mac"
</span><ins>+ "${WTF_DIR}"
</ins><span class="cx"> ../../WebKitLibraries
</span><span class="cx"> )
</span><span class="cx">
</span><span class="cx"> list(APPEND WebKit_SYSTEM_INCLUDE_DIRECTORIES
</span><del>- "${PDFKIT_INCLUDE_DIRECTORY}"
</del><span class="cx"> mac
</span><span class="cx"> mac/Carbon
</span><span class="cx"> mac/DefaultDelegates
</span><span class="lines">@@ -105,6 +110,8 @@
</span><span class="cx"> )
</span><span class="cx">
</span><span class="cx"> list(APPEND WebKit_SOURCES
</span><ins>+ cf/WebCoreSupport/WebInspectorClientCF.cpp
+
</ins><span class="cx"> Storage/StorageAreaImpl.cpp
</span><span class="cx"> Storage/StorageAreaSync.cpp
</span><span class="cx"> Storage/StorageNamespaceImpl.cpp
</span><span class="lines">@@ -121,6 +128,11 @@
</span><span class="cx"> mac/Carbon/HIViewAdapter.m
</span><span class="cx"> mac/Carbon/HIWebView.mm
</span><span class="cx">
</span><ins>+ mac/DefaultDelegates/WebDefaultContextMenuDelegate.mm
+ mac/DefaultDelegates/WebDefaultEditingDelegate.m
+ mac/DefaultDelegates/WebDefaultPolicyDelegate.m
+ mac/DefaultDelegates/WebDefaultUIDelegate.m
+
</ins><span class="cx"> mac/History/BinaryPropertyList.cpp
</span><span class="cx"> mac/History/HistoryPropertyList.mm
</span><span class="cx"> mac/History/WebBackForwardList.mm
</span><span class="lines">@@ -225,6 +237,7 @@
</span><span class="cx"> mac/WebCoreSupport/WebSecurityOrigin.mm
</span><span class="cx"> mac/WebCoreSupport/WebSystemInterface.mm
</span><span class="cx"> mac/WebCoreSupport/WebUserMediaClient.mm
</span><ins>+ mac/WebCoreSupport/WebVisitedLinkStore.mm
</ins><span class="cx">
</span><span class="cx"> mac/WebInspector/WebInspector.mm
</span><span class="cx"> mac/WebInspector/WebInspectorFrontend.mm
</span><span class="lines">@@ -248,6 +261,7 @@
</span><span class="cx"> mac/WebView/WebGeolocationPosition.mm
</span><span class="cx"> mac/WebView/WebHTMLRepresentation.mm
</span><span class="cx"> mac/WebView/WebHTMLView.mm
</span><ins>+ mac/WebView/WebImmediateActionController.mm
</ins><span class="cx"> mac/WebView/WebIndicateLayer.mm
</span><span class="cx"> mac/WebView/WebJSPDFDoc.mm
</span><span class="cx"> mac/WebView/WebNavigationData.mm
</span><span class="lines">@@ -271,6 +285,7 @@
</span><span class="cx">
</span><span class="cx"> set(WebKitLegacy_FORWARDING_HEADERS_DIRECTORIES
</span><span class="cx"> mac/DOM
</span><ins>+ mac/DefaultDelegates
</ins><span class="cx"> mac/History
</span><span class="cx"> mac/Misc
</span><span class="cx"> mac/Panels
</span><span class="lines">@@ -312,11 +327,16 @@
</span><span class="cx">
</span><span class="cx"> add_definitions("-include WebKitPrefix.h")
</span><span class="cx">
</span><del>-set_source_files_properties(
</del><ins>+set(C99_FILES
</ins><span class="cx"> ${WEBKIT_DIR}/mac/Carbon/CarbonUtils.m
</span><span class="cx"> ${WEBKIT_DIR}/mac/Carbon/CarbonWindowContentView.m
</span><span class="cx"> ${WEBKIT_DIR}/mac/Carbon/CarbonWindowFrame.m
</span><span class="cx"> ${WEBKIT_DIR}/mac/Carbon/HIViewAdapter.m
</span><ins>+
+ mac/DefaultDelegates/WebDefaultEditingDelegate.m
+ mac/DefaultDelegates/WebDefaultPolicyDelegate.m
+ mac/DefaultDelegates/WebDefaultUIDelegate.m
+
</ins><span class="cx"> mac/History/WebURLsWithTitles.m
</span><span class="cx">
</span><span class="cx"> mac/Misc/OldWebAssertions.c
</span><span class="lines">@@ -348,8 +368,17 @@
</span><span class="cx"> mac/WebCoreSupport/WebJavaScriptTextInputPanel.m
</span><span class="cx">
</span><span class="cx"> mac/WebView/WebFormDelegate.m
</span><del>-PROPERTIES COMPILE_FLAGS -std=c99)
</del><ins>+)
</ins><span class="cx">
</span><ins>+foreach (_file ${WebKit_SOURCES})
+ list(FIND C99_FILES ${_file} _c99_index)
+ if (${_c99_index} EQUAL -1)
+ set_source_files_properties(${_file} PROPERTIES COMPILE_FLAGS -ObjC++)
+ else ()
+ set_source_files_properties(${_file} PROPERTIES COMPILE_FLAGS -std=c99)
+ endif ()
+endforeach ()
+
</ins><span class="cx"> file(COPY
</span><span class="cx"> mac/Plugins/Hosted/WebKitPluginAgent.defs
</span><span class="cx"> mac/Plugins/Hosted/WebKitPluginAgentReply.defs
</span></span></pre></div>
<a id="trunkSourceWebKitPlatformWincmake"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/PlatformWin.cmake (189748 => 189749)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/PlatformWin.cmake 2015-09-14 21:16:31 UTC (rev 189748)
+++ trunk/Source/WebKit/PlatformWin.cmake 2015-09-14 21:22:46 UTC (rev 189749)
</span><span class="lines">@@ -62,7 +62,6 @@
</span><span class="cx"> win
</span><span class="cx"> win/plugins
</span><span class="cx"> win/WebCoreSupport
</span><del>- WebCoreSupport
</del><span class="cx"> WebKit.vcxproj/WebKit
</span><span class="cx"> "${WEBKIT_DIR}/.."
</span><span class="cx"> "${DERIVED_SOURCES_WEBKIT_DIR}/include"
</span><span class="lines">@@ -237,9 +236,6 @@
</span><span class="cx"> )
</span><span class="cx">
</span><span class="cx"> list(APPEND WebKit_SOURCES_WebCoreSupport
</span><del>- WebCoreSupport/WebViewGroup.cpp
- WebCoreSupport/WebViewGroup.h
-
</del><span class="cx"> win/WebCoreSupport/AcceleratedCompositingContext.cpp
</span><span class="cx"> win/WebCoreSupport/EmbeddedWidget.cpp
</span><span class="cx"> win/WebCoreSupport/EmbeddedWidget.h
</span></span></pre></div>
<a id="trunkSourceWebKitmacChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/mac/ChangeLog (189748 => 189749)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/mac/ChangeLog 2015-09-14 21:16:31 UTC (rev 189748)
+++ trunk/Source/WebKit/mac/ChangeLog 2015-09-14 21:22:46 UTC (rev 189749)
</span><span class="lines">@@ -1,3 +1,15 @@
</span><ins>+2015-09-14 Alex Christensen <achristensen@webkit.org>
+
+ Progress towards CMake on Mac.
+ https://bugs.webkit.org/show_bug.cgi?id=149123
+
+ Reviewed by Chris Dumez.
+
+ * WebView/WebPDFDocumentExtras.mm:
+ (appendValuesInPDFNameSubtreeToVector):
+ * WebView/WebPDFView.mm:
+ Removed cmake include quirks that are not needed when we include things correctly from Quartz.framework/Frameworks.
+
</ins><span class="cx"> 2015-09-12 Brian Burg <bburg@apple.com>
</span><span class="cx">
</span><span class="cx"> Web Inspector: disambiguate inspected/frontend controllers and pages in backend code
</span></span></pre></div>
<a id="trunkSourceWebKitmacWebViewWebPDFDocumentExtrasmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/mac/WebView/WebPDFDocumentExtras.mm (189748 => 189749)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/mac/WebView/WebPDFDocumentExtras.mm 2015-09-14 21:16:31 UTC (rev 189748)
+++ trunk/Source/WebKit/mac/WebView/WebPDFDocumentExtras.mm 2015-09-14 21:22:46 UTC (rev 189749)
</span><span class="lines">@@ -30,12 +30,8 @@
</span><span class="cx"> #import <wtf/RetainPtr.h>
</span><span class="cx">
</span><span class="cx"> #if !PLATFORM(IOS)
</span><del>-#ifdef BUILDING_WITH_CMAKE
-#import <PDFDocument.h>
-#else
</del><span class="cx"> #import <PDFKit/PDFDocument.h>
</span><span class="cx"> #endif
</span><del>-#endif
</del><span class="cx">
</span><span class="cx"> static void appendValuesInPDFNameSubtreeToVector(CGPDFDictionaryRef subtree, Vector<CGPDFObjectRef>& values)
</span><span class="cx"> {
</span></span></pre></div>
<a id="trunkSourceWebKitmacWebViewWebPDFViewmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/mac/WebView/WebPDFView.mm (189748 => 189749)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/mac/WebView/WebPDFView.mm 2015-09-14 21:16:31 UTC (rev 189748)
+++ trunk/Source/WebKit/mac/WebView/WebPDFView.mm 2015-09-14 21:22:46 UTC (rev 189749)
</span><span class="lines">@@ -65,11 +65,7 @@
</span><span class="cx"> #import <wtf/Assertions.h>
</span><span class="cx"> #import <wtf/CurrentTime.h>
</span><span class="cx">
</span><del>-#ifdef BUILDING_WITH_CMAKE
-#import <PDFKit.h>
-#else
</del><span class="cx"> #import <PDFKit/PDFKit.h>
</span><del>-#endif
</del><span class="cx">
</span><span class="cx"> #ifdef __has_include
</span><span class="cx"> #if __has_include(<ApplicationServices/ApplicationServicesPriv.h>)
</span></span></pre></div>
<a id="trunkSourceWebKit2ChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/ChangeLog (189748 => 189749)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/ChangeLog 2015-09-14 21:16:31 UTC (rev 189748)
+++ trunk/Source/WebKit2/ChangeLog 2015-09-14 21:22:46 UTC (rev 189749)
</span><span class="lines">@@ -1,3 +1,13 @@
</span><ins>+2015-09-14 Alex Christensen <achristensen@webkit.org>
+
+ Progress towards CMake on Mac.
+ https://bugs.webkit.org/show_bug.cgi?id=149123
+
+ Reviewed by Chris Dumez.
+
+ * PlatformMac.cmake:
+ Added some more sources.
+
</ins><span class="cx"> 2015-09-14 Dan Bernstein <mitz@apple.com>
</span><span class="cx">
</span><span class="cx"> [iOS] Stop importing WebKitAdditions/WKContentViewInteraction.mm
</span></span></pre></div>
<a id="trunkSourceWebKit2PlatformMaccmake"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/PlatformMac.cmake (189748 => 189749)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/PlatformMac.cmake 2015-09-14 21:16:31 UTC (rev 189748)
+++ trunk/Source/WebKit2/PlatformMac.cmake 2015-09-14 21:22:46 UTC (rev 189749)
</span><span class="lines">@@ -1,11 +1,140 @@
</span><del>-#FIXME: Add Mac-specific sources here.
</del><ins>+add_definitions(-ObjC++)
</ins><span class="cx">
</span><ins>+find_library(PDFKIT_FRAMEWORK PDFKit HINTS ${QUARTZ_LIBRARY}/Versions/*/Frameworks)
+
+find_library(ACCELERATE_LIBRARY accelerate)
+find_library(AUDIOTOOLBOX_LIBRARY AudioToolbox)
+find_library(AUDIOUNIT_LIBRARY AudioUnit)
+find_library(CARBON_LIBRARY Carbon)
+find_library(COCOA_LIBRARY Cocoa)
+find_library(COREAUDIO_LIBRARY CoreAudio)
+find_library(DISKARBITRATION_LIBRARY DiskArbitration)
+find_library(IOKIT_LIBRARY IOKit)
+find_library(IOSURFACE_LIBRARY IOSurface)
+find_library(OPENGL_LIBRARY OpenGL)
+find_library(QUARTZ_LIBRARY Quartz)
+find_library(QUARTZCORE_LIBRARY QuartzCore)
+find_library(SECURITY_LIBRARY Security)
+find_library(SQLITE3_LIBRARY sqlite3)
+find_library(XML2_LIBRARY XML2)
+find_package(ZLIB REQUIRED)
+
+list(APPEND WebKit2_LIBRARIES
+ ${ACCELERATE_LIBRARY}
+ ${AUDIOTOOLBOX_LIBRARY}
+ ${AUDIOUNIT_LIBRARY}
+ ${CARBON_LIBRARY}
+ ${COCOA_LIBRARY}
+ ${COREAUDIO_LIBRARY}
+ ${DISKARBITRATION_LIBRARY}
+ ${IOKIT_LIBRARY}
+ ${IOSURFACE_LIBRARY}
+ ${OPENGL_LIBRARY}
+ ${PDFKIT_FRAMEWORK}/PDFKit
+ ${QUARTZ_LIBRARY}
+ ${QUARTZCORE_LIBRARY}
+ ${SECURITY_LIBRARY}
+ ${SQLITE3_LIBRARY}
+ ${WEBKITSYSTEMINTERFACE_LIBRARY}
+ ${XML2_LIBRARY}
+ ${ZLIB_LIBRARIES}
+)
+
+list(APPEND WebKit2_SOURCES
+ NetworkProcess/cocoa/NetworkProcessCocoa.mm
+
+ NetworkProcess/mac/NetworkDiskCacheMonitor.mm
+ NetworkProcess/mac/NetworkProcessMac.mm
+ NetworkProcess/mac/NetworkResourceLoaderMac.mm
+ NetworkProcess/mac/RemoteNetworkingContext.mm
+
+ UIProcess/API/Cocoa/APISerializedScriptValueCocoa.mm
+ UIProcess/API/Cocoa/APIUserContentExtensionStoreCocoa.mm
+ UIProcess/API/Cocoa/APIWebsiteDataStoreCocoa.mm
+ UIProcess/API/Cocoa/LegacyBundleForClass.mm
+ UIProcess/API/Cocoa/WKBackForwardList.mm
+ UIProcess/API/Cocoa/WKBackForwardListItem.mm
+ UIProcess/API/Cocoa/WKError.mm
+ UIProcess/API/Cocoa/WKFrameInfo.mm
+ UIProcess/API/Cocoa/WKNavigation.mm
+ UIProcess/API/Cocoa/WKNavigationAction.mm
+ UIProcess/API/Cocoa/WKNavigationResponse.mm
+ UIProcess/API/Cocoa/WKPreferences.mm
+ UIProcess/API/Cocoa/WKProcessPool.mm
+ UIProcess/API/Cocoa/WKScriptMessage.mm
+ UIProcess/API/Cocoa/WKSecurityOrigin.mm
+ UIProcess/API/Cocoa/WKUserContentController.mm
+ UIProcess/API/Cocoa/WKUserScript.mm
+ UIProcess/API/Cocoa/WKWebView.mm
+ UIProcess/API/Cocoa/WKWebViewConfiguration.mm
+ UIProcess/API/Cocoa/WKWebsiteDataRecord.mm
+ UIProcess/API/Cocoa/WKWebsiteDataStore.mm
+ UIProcess/API/Cocoa/WKWindowFeatures.mm
+ UIProcess/API/Cocoa/_WKActivatedElementInfo.mm
+ UIProcess/API/Cocoa/_WKDownload.mm
+ UIProcess/API/Cocoa/_WKElementAction.mm
+ UIProcess/API/Cocoa/_WKErrorRecoveryAttempting.mm
+ UIProcess/API/Cocoa/_WKProcessPoolConfiguration.mm
+ UIProcess/API/Cocoa/_WKSessionState.mm
+ UIProcess/API/Cocoa/_WKThumbnailView.mm
+ UIProcess/API/Cocoa/_WKUserContentExtensionStore.mm
+ UIProcess/API/Cocoa/_WKUserContentFilter.mm
+ UIProcess/API/Cocoa/_WKVisitedLinkStore.mm
+
+ UIProcess/API/mac/WKView.mm
+
+ UIProcess/Cocoa/DiagnosticLoggingClient.mm
+ UIProcess/Cocoa/DownloadClient.mm
+ UIProcess/Cocoa/FindClient.mm
+ UIProcess/Cocoa/NavigationState.mm
+ UIProcess/Cocoa/RemoteLayerTreeScrollingPerformanceData.mm
+ UIProcess/Cocoa/SessionStateCoding.mm
+ UIProcess/Cocoa/UIDelegate.mm
+ UIProcess/Cocoa/VersionChecks.mm
+ UIProcess/Cocoa/WKReloadFrameErrorRecoveryAttempter.mm
+ UIProcess/Cocoa/WKWebViewContentProviderRegistry.mm
+ UIProcess/Cocoa/WebPageProxyCocoa.mm
+ UIProcess/Cocoa/WebPasteboardProxyCocoa.mm
+ UIProcess/Cocoa/WebProcessPoolCocoa.mm
+ UIProcess/Cocoa/WebProcessProxyCocoa.mm
+
+ UIProcess/mac/CorrectionPanel.mm
+ UIProcess/mac/LegacySessionStateCoding.cpp
+ UIProcess/mac/PageClientImpl.mm
+ UIProcess/mac/RemoteLayerTreeDrawingAreaProxy.mm
+ UIProcess/mac/RemoteLayerTreeHost.mm
+ UIProcess/mac/SecItemShimProxy.cpp
+ UIProcess/mac/ServicesController.mm
+ UIProcess/mac/TextCheckerMac.mm
+ UIProcess/mac/TiledCoreAnimationDrawingAreaProxy.mm
+ UIProcess/mac/ViewGestureControllerMac.mm
+ UIProcess/mac/ViewSnapshotStore.mm
+ UIProcess/mac/WKFullKeyboardAccessWatcher.mm
+ UIProcess/mac/WKFullScreenWindowController.mm
+ UIProcess/mac/WKImmediateActionController.mm
+ UIProcess/mac/WKPrintingView.mm
+ UIProcess/mac/WKSharingServicePickerDelegate.mm
+ UIProcess/mac/WKTextInputWindowController.mm
+ UIProcess/mac/WKViewLayoutStrategy.mm
+ UIProcess/mac/WebColorPickerMac.mm
+ UIProcess/mac/WebContextMenuProxyMac.mm
+ UIProcess/mac/WebCookieManagerProxyMac.mm
+ UIProcess/mac/WebInspectorProxyMac.mm
+ UIProcess/mac/WebPageProxyMac.mm
+ UIProcess/mac/WebPopupMenuProxyMac.mm
+ UIProcess/mac/WebPreferencesMac.mm
+ UIProcess/mac/WebProcessProxyMac.mm
+ UIProcess/mac/WindowServerConnection.mm
+)
+
</ins><span class="cx"> file(MAKE_DIRECTORY ${DERIVED_SOURCES_WEBKIT2_DIR})
</span><span class="cx">
</span><span class="cx"> list(APPEND WebKit2_INCLUDE_DIRECTORIES
</span><span class="cx"> "${WEBCORE_DIR}/platform/mac"
</span><span class="cx"> "${WEBCORE_DIR}/platform/network/cf"
</span><span class="cx"> "${WEBCORE_DIR}/platform/graphics/opentype"
</span><ins>+ "${WEBKIT2_DIR}/NetworkProcess/cocoa"
+ "${WEBKIT2_DIR}/NetworkProcess/mac"
</ins><span class="cx"> "${WEBKIT2_DIR}/UIProcess/mac"
</span><span class="cx"> "${WEBKIT2_DIR}/UIProcess/API/C/mac"
</span><span class="cx"> "${WEBKIT2_DIR}/UIProcess/Cocoa"
</span><span class="lines">@@ -15,6 +144,7 @@
</span><span class="cx"> "${WEBKIT2_DIR}/Shared/API/Cocoa"
</span><span class="cx"> "${WEBKIT2_DIR}/Shared/API/c/cf"
</span><span class="cx"> "${WEBKIT2_DIR}/Shared/cf"
</span><ins>+ "${WEBKIT2_DIR}/Shared/Cocoa"
</ins><span class="cx"> "${WEBKIT2_DIR}/Shared/mac"
</span><span class="cx"> "${WEBKIT2_DIR}/Shared/Plugins/mac"
</span><span class="cx"> "${WEBKIT2_DIR}/WebProcess/Plugins/PDF"
</span></span></pre></div>
<a id="trunkSourcecmakeOptionsMaccmake"></a>
<div class="modfile"><h4>Modified: trunk/Source/cmake/OptionsMac.cmake (189748 => 189749)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/cmake/OptionsMac.cmake 2015-09-14 21:16:31 UTC (rev 189748)
+++ trunk/Source/cmake/OptionsMac.cmake 2015-09-14 21:22:46 UTC (rev 189749)
</span><span class="lines">@@ -5,6 +5,7 @@
</span><span class="cx"> WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_ACCELERATED_OVERFLOW_SCROLLING_iphoneos PRIVATE ON)
</span><span class="cx"> WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_ACCELERATED_OVERFLOW_SCROLLING_iphonesimulator PRIVATE ON)
</span><span class="cx"> WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_API_TESTS PRIVATE ON)
</span><ins>+WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_ASYNC_SCROLLING PRIVATE ON)
</ins><span class="cx"> WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_AVF_CAPTIONS PRIVATE ON)
</span><span class="cx"> WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_AVF_CAPTIONS_macosx PRIVATE ON)
</span><span class="cx"> WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_AVF_CAPTIONS_macosx_1080 PRIVATE OFF)
</span><span class="lines">@@ -26,6 +27,7 @@
</span><span class="cx"> WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_CSS_IMAGE_RESOLUTION PRIVATE OFF)
</span><span class="cx"> WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_CSS_IMAGE_SET PRIVATE ON)
</span><span class="cx"> WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_CSS_REGIONS PRIVATE ON)
</span><ins>+WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_CSS_SCROLL_SNAP PRIVATE ON)
</ins><span class="cx"> WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_CSS_SHAPES PRIVATE ON)
</span><span class="cx"> WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_CSS3_TEXT PRIVATE OFF)
</span><span class="cx"> WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_CSS3_TEXT_LINE_BREAK PRIVATE OFF)
</span><span class="lines">@@ -33,6 +35,7 @@
</span><span class="cx"> WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_CUSTOM_SCHEME_HANDLER PRIVATE OFF)
</span><span class="cx"> WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_DASHBOARD_SUPPORT PRIVATE ON)
</span><span class="cx"> WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_DASHBOARD_SUPPORT_macosx PRIVATE ON)
</span><ins>+WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_DRAG_SUPPORT PRIVATE ON)
</ins><span class="cx"> WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_DATALIST_ELEMENT PRIVATE OFF)
</span><span class="cx"> WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_DATA_TRANSFER_ITEMS PRIVATE OFF)
</span><span class="cx"> WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_DETAILS_ELEMENT PRIVATE ON)
</span><span class="lines">@@ -60,6 +63,7 @@
</span><span class="cx"> WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_FULLSCREEN_API_macosx PRIVATE ON)
</span><span class="cx"> WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_GAMEPAD_DEPRECATED PRIVATE OFF)
</span><span class="cx"> WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_GEOLOCATION PRIVATE ON)
</span><ins>+WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_GRAPHICS_CONTEXT_3D PRIVATE ON)
</ins><span class="cx"> WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_HIDDEN_PAGE_DOM_TIMER_THROTTLING PRIVATE ON)
</span><span class="cx"> WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_HIDDEN_PAGE_DOM_TIMER_THROTTLING_macosx PRIVATE ON)
</span><span class="cx"> WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_ICONDATABASE PRIVATE ON)
</span><span class="lines">@@ -145,9 +149,11 @@
</span><span class="cx"> WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_REMOTE_INSPECTOR_macosx_1090 PRIVATE OFF)
</span><span class="cx"> WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_REMOTE_INSPECTOR_macosx_101000 PRIVATE ON)
</span><span class="cx"> WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_RESOLUTION_MEDIA_QUERY PRIVATE OFF)
</span><ins>+WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_RUBBER_BANDING PRIVATE ON)
</ins><span class="cx"> WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_SATURATED_LAYOUT_ARITHMETIC PRIVATE ON)
</span><span class="cx"> WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_SPEECH_SYNTHESIS PRIVATE ON)
</span><span class="cx"> WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_SPEECH_SYNTHESIS PRIVATE ON)
</span><ins>+WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_SUBPIXEL_LAYOUT PRIVATE ON)
</ins><span class="cx"> WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_SUBTLE_CRYPTO PRIVATE ON)
</span><span class="cx"> WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_SUBTLE_CRYPTO_macosx PRIVATE ON)
</span><span class="cx"> WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_SUBTLE_CRYPTO_macosx_1080 PRIVATE OFF)
</span></span></pre></div>
<a id="trunkSourcecmakeWebKitFeaturescmake"></a>
<div class="modfile"><h4>Modified: trunk/Source/cmake/WebKitFeatures.cmake (189748 => 189749)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/cmake/WebKitFeatures.cmake 2015-09-14 21:16:31 UTC (rev 189748)
+++ trunk/Source/cmake/WebKitFeatures.cmake 2015-09-14 21:22:46 UTC (rev 189749)
</span><span class="lines">@@ -33,6 +33,7 @@
</span><span class="cx"> WEBKIT_OPTION_DEFINE(ENABLE_ACCESSIBILITY "Toggle accessibility support" PRIVATE OFF)
</span><span class="cx"> WEBKIT_OPTION_DEFINE(ENABLE_ALLINONE_BUILD "Toggle all-in-one build" PRIVATE OFF)
</span><span class="cx"> WEBKIT_OPTION_DEFINE(ENABLE_API_TESTS "Enable public API unit tests" PRIVATE OFF)
</span><ins>+ WEBKIT_OPTION_DEFINE(ENABLE_ASYNC_SCROLLING "Enable asynchronouse scrolling" PRIVATE OFF)
</ins><span class="cx"> WEBKIT_OPTION_DEFINE(ENABLE_ATTACHMENT_ELEMENT "Toggle attachment element support" PRIVATE OFF)
</span><span class="cx"> WEBKIT_OPTION_DEFINE(ENABLE_AVF_CAPTIONS "Toggle AVFoundation caption support" PRIVATE OFF)
</span><span class="cx"> WEBKIT_OPTION_DEFINE(ENABLE_ASSEMBLER_WX_EXCLUSIVE "Toggle Assembler WX Exclusive support" PRIVATE OFF)
</span><span class="lines">@@ -139,6 +140,7 @@
</span><span class="cx"> WEBKIT_OPTION_DEFINE(ENABLE_REQUEST_ANIMATION_FRAME "Toggle requestAnimationFrame support" PRIVATE OFF)
</span><span class="cx"> WEBKIT_OPTION_DEFINE(ENABLE_RESOLUTION_MEDIA_QUERY "Toggle resolution media query support" PRIVATE OFF)
</span><span class="cx"> WEBKIT_OPTION_DEFINE(ENABLE_RESOURCE_TIMING "Toggle Resource Timing support" PRIVATE OFF)
</span><ins>+ WEBKIT_OPTION_DEFINE(ENABLE_RUBBER_BANDING "Toggle rubber banding support" PRIVATE OFF)
</ins><span class="cx"> WEBKIT_OPTION_DEFINE(ENABLE_SATURATED_LAYOUT_ARITHMETIC "Toggle saturated layout arithmetic support" PRIVATE ON)
</span><span class="cx"> WEBKIT_OPTION_DEFINE(ENABLE_SECCOMP_FILTERS "Toggle Linux seccomp filters for the WebProcess support" PRIVATE OFF)
</span><span class="cx"> WEBKIT_OPTION_DEFINE(ENABLE_SERVICE_CONTROLS "Toggle service controls support" PRIVATE OFF)
</span><span class="lines">@@ -146,6 +148,7 @@
</span><span class="cx"> WEBKIT_OPTION_DEFINE(ENABLE_SPEECH_SYNTHESIS "Toggle Speech Synthesis API support)" PRIVATE OFF)
</span><span class="cx"> WEBKIT_OPTION_DEFINE(ENABLE_SPELLCHECK "Toggle Spellchecking support (requires Enchant)" PRIVATE OFF)
</span><span class="cx"> WEBKIT_OPTION_DEFINE(ENABLE_STREAMS_API "Toggle Streams API support" PRIVATE ON)
</span><ins>+ WEBKIT_OPTION_DEFINE(ENABLE_SUBPIXEL_LAYOUT "Toggle subpixel layout support" PRIVATE OFF)
</ins><span class="cx"> WEBKIT_OPTION_DEFINE(ENABLE_SUBTLE_CRYPTO "Toggle subtle crypto support" PRIVATE OFF)
</span><span class="cx"> WEBKIT_OPTION_DEFINE(ENABLE_SVG_FONTS "Toggle SVG fonts support (imples SVG support)" PRIVATE ON)
</span><span class="cx"> WEBKIT_OPTION_DEFINE(ENABLE_TELEPHONE_NUMBER_DETECTION "Toggle telephone number detection support" PRIVATE OFF)
</span></span></pre></div>
<a id="trunkSourcecmakeWebKitMacroscmake"></a>
<div class="modfile"><h4>Modified: trunk/Source/cmake/WebKitMacros.cmake (189748 => 189749)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/cmake/WebKitMacros.cmake 2015-09-14 21:16:31 UTC (rev 189748)
+++ trunk/Source/cmake/WebKitMacros.cmake 2015-09-14 21:22:46 UTC (rev 189749)
</span><span class="lines">@@ -78,19 +78,45 @@
</span><span class="cx"> foreach (_file ${_input_files})
</span><span class="cx"> get_filename_component(_name ${_file} NAME_WE)
</span><span class="cx">
</span><del>- add_custom_command(
- OUTPUT ${_destination}/${_prefix}${_name}.${_extension} ${_destination}/${_prefix}${_name}.h
- MAIN_DEPENDENCY ${_file}
- DEPENDS ${COMMON_GENERATOR_DEPENDENCIES}
- COMMAND ${PERL_EXECUTABLE} -I${WEBCORE_DIR}/bindings/scripts ${BINDING_GENERATOR} --defines "${_features}" --generator ${_generator} ${_idl_includes} --outputDir "${_destination}" --preprocessor "${CODE_GENERATOR_PREPROCESSOR}" --idlAttributesFile ${_idl_attributes_file} ${_supplemental_dependency} ${_file}
- WORKING_DIRECTORY ${_base_dir}
- VERBATIM)
</del><ins>+ # Not all ObjC bindings generate a .mm file, and not all .mm files generated should be compiled.
+ if (${_generator} STREQUAL "ObjC")
+ list(FIND ObjC_BINDINGS_NO_MM ${_name} _no_mm_index)
+ if (${_no_mm_index} EQUAL -1)
+ set(_no_mm 0)
+ else ()
+ set(_no_mm 1)
+ endif ()
+ else ()
+ set(_no_mm 0)
+ endif ()
</ins><span class="cx">
</span><del>- list(APPEND ${_output_source} ${_destination}/${_prefix}${_name}.${_extension})
</del><ins>+ if (${_no_mm})
+ add_custom_command(
+ OUTPUT ${_destination}/${_prefix}${_name}.h
+ MAIN_DEPENDENCY ${_file}
+ DEPENDS ${COMMON_GENERATOR_DEPENDENCIES}
+ COMMAND ${PERL_EXECUTABLE} -I${WEBCORE_DIR}/bindings/scripts ${BINDING_GENERATOR} --defines "${_features}" --generator ${_generator} ${_idl_includes} --outputDir "${_destination}" --preprocessor "${CODE_GENERATOR_PREPROCESSOR}" --idlAttributesFile ${_idl_attributes_file} ${_supplemental_dependency} ${_file}
+ WORKING_DIRECTORY ${_base_dir}
+ VERBATIM)
+
+ list(APPEND ${_output_source} ${_destination}/${_prefix}${_name}.h)
+ else ()
+ add_custom_command(
+ OUTPUT ${_destination}/${_prefix}${_name}.${_extension} ${_destination}/${_prefix}${_name}.h
+ MAIN_DEPENDENCY ${_file}
+ DEPENDS ${COMMON_GENERATOR_DEPENDENCIES}
+ COMMAND ${PERL_EXECUTABLE} -I${WEBCORE_DIR}/bindings/scripts ${BINDING_GENERATOR} --defines "${_features}" --generator ${_generator} ${_idl_includes} --outputDir "${_destination}" --preprocessor "${CODE_GENERATOR_PREPROCESSOR}" --idlAttributesFile ${_idl_attributes_file} ${_supplemental_dependency} ${_file}
+ WORKING_DIRECTORY ${_base_dir}
+ VERBATIM)
+ if (${_generator} STREQUAL "ObjC")
+ list(APPEND ${_output_source} ${_destination}/${_prefix}${_name}.h)
+ else ()
+ list(APPEND ${_output_source} ${_destination}/${_prefix}${_name}.${_extension})
+ endif ()
+ endif ()
</ins><span class="cx"> endforeach ()
</span><span class="cx"> endmacro()
</span><span class="cx">
</span><del>-
</del><span class="cx"> macro(GENERATE_FONT_NAMES _infile)
</span><span class="cx"> set(NAMES_GENERATOR ${WEBCORE_DIR}/dom/make_names.pl)
</span><span class="cx"> set(_arguments --fonts ${_infile})
</span></span></pre>
</div>
</div>
</body>
</html>