<!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>[182032] 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/182032">182032</a></dd>
<dt>Author</dt> <dd>commit-queue@webkit.org</dd>
<dt>Date</dt> <dd>2015-03-26 15:53:46 -0700 (Thu, 26 Mar 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>Progress towards CMake on Mac.
https://bugs.webkit.org/show_bug.cgi?id=143112
Patch by Alex Christensen <achristensen@webkit.org> on 2015-03-26
Reviewed by Chris Dumez.
.:
* Source/cmake/OptionsMac.cmake:
Source/WebCore:
* CMakeLists.txt:
* PlatformEfl.cmake:
* PlatformGTK.cmake:
* PlatformMac.cmake:
* platform/graphics/mac/IconMac.mm:
Source/WebKit:
* PlatformMac.cmake:
Source/WebKit/mac:
* WebCoreSupport/WebFrameLoaderClient.h:
Source/WebKit2:
* CMakeLists.txt:
* PlatformMac.cmake:
* UIProcess/Cocoa/WebPageProxyCocoa.mm:
Source/WTF:
* wtf/PlatformMac.cmake:</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkChangeLog">trunk/ChangeLog</a></li>
<li><a href="#trunkSourceWTFChangeLog">trunk/Source/WTF/ChangeLog</a></li>
<li><a href="#trunkSourceWTFwtfPlatformMaccmake">trunk/Source/WTF/wtf/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="#trunkSourceWebCorePlatformEflcmake">trunk/Source/WebCore/PlatformEfl.cmake</a></li>
<li><a href="#trunkSourceWebCorePlatformGTKcmake">trunk/Source/WebCore/PlatformGTK.cmake</a></li>
<li><a href="#trunkSourceWebCorePlatformMaccmake">trunk/Source/WebCore/PlatformMac.cmake</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicsmacIconMacmm">trunk/Source/WebCore/platform/graphics/mac/IconMac.mm</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="#trunkSourceWebKitmacChangeLog">trunk/Source/WebKit/mac/ChangeLog</a></li>
<li><a href="#trunkSourceWebKitmacWebCoreSupportWebFrameLoaderClienth">trunk/Source/WebKit/mac/WebCoreSupport/WebFrameLoaderClient.h</a></li>
<li><a href="#trunkSourceWebKit2CMakeListstxt">trunk/Source/WebKit2/CMakeLists.txt</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="#trunkSourceWebKit2UIProcessCocoaWebPageProxyCocoamm">trunk/Source/WebKit2/UIProcess/Cocoa/WebPageProxyCocoa.mm</a></li>
<li><a href="#trunkSourcecmakeOptionsMaccmake">trunk/Source/cmake/OptionsMac.cmake</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/ChangeLog (182031 => 182032)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/ChangeLog 2015-03-26 22:52:14 UTC (rev 182031)
+++ trunk/ChangeLog 2015-03-26 22:53:46 UTC (rev 182032)
</span><span class="lines">@@ -1,3 +1,12 @@
</span><ins>+2015-03-26 Alex Christensen <achristensen@webkit.org>
+
+ Progress towards CMake on Mac.
+ https://bugs.webkit.org/show_bug.cgi?id=143112
+
+ Reviewed by Chris Dumez.
+
+ * Source/cmake/OptionsMac.cmake:
+
</ins><span class="cx"> 2015-03-24 Csaba Osztrogonác <ossy@webkit.org>
</span><span class="cx">
</span><span class="cx"> [EFL] Add OpenWebRTC in jhbuild
</span></span></pre></div>
<a id="trunkSourceWTFChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WTF/ChangeLog (182031 => 182032)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WTF/ChangeLog 2015-03-26 22:52:14 UTC (rev 182031)
+++ trunk/Source/WTF/ChangeLog 2015-03-26 22:53:46 UTC (rev 182032)
</span><span class="lines">@@ -1,3 +1,12 @@
</span><ins>+2015-03-26 Alex Christensen <achristensen@webkit.org>
+
+ Progress towards CMake on Mac.
+ https://bugs.webkit.org/show_bug.cgi?id=143112
+
+ Reviewed by Chris Dumez.
+
+ * wtf/PlatformMac.cmake:
+
</ins><span class="cx"> 2015-03-25 Filip Pizlo <fpizlo@apple.com>
</span><span class="cx">
</span><span class="cx"> Unreviewed, we have edited this file in 2015.
</span></span></pre></div>
<a id="trunkSourceWTFwtfPlatformMaccmake"></a>
<div class="modfile"><h4>Modified: trunk/Source/WTF/wtf/PlatformMac.cmake (182031 => 182032)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WTF/wtf/PlatformMac.cmake 2015-03-26 22:52:14 UTC (rev 182031)
+++ trunk/Source/WTF/wtf/PlatformMac.cmake 2015-03-26 22:53:46 UTC (rev 182032)
</span><span class="lines">@@ -1,4 +1,13 @@
</span><span class="cx"> list(APPEND WTF_SOURCES
</span><ins>+ AutodrainedPoolMac.mm
+ RunLoopTimerCF.cpp
+ SchedulePairCF.cpp
+ SchedulePairMac.mm
+
+ cf/RunLoopCF.cpp
+
+ cocoa/WorkQueueCocoa.cpp
+
</ins><span class="cx"> mac/DeprecatedSymbolsUsedBySafari.mm
</span><span class="cx"> mac/MainThreadMac.mm
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCoreCMakeListstxt"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/CMakeLists.txt (182031 => 182032)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/CMakeLists.txt 2015-03-26 22:52:14 UTC (rev 182031)
+++ trunk/Source/WebCore/CMakeLists.txt 2015-03-26 22:53:46 UTC (rev 182032)
</span><span class="lines">@@ -1998,6 +1998,7 @@
</span><span class="cx"> platform/ContextMenu.cpp
</span><span class="cx"> platform/ContextMenuItem.cpp
</span><span class="cx"> platform/CrossThreadCopier.cpp
</span><ins>+ platform/Cursor.cpp
</ins><span class="cx"> platform/DateComponents.cpp
</span><span class="cx"> platform/Decimal.cpp
</span><span class="cx"> platform/DisplaySleepDisabler.cpp
</span><span class="lines">@@ -3146,6 +3147,7 @@
</span><span class="cx"> set(WebCoreTestSupport_INCLUDE_DIRECTORIES
</span><span class="cx"> "${WEBCORE_DIR}/platform/mock"
</span><span class="cx"> "${WEBCORE_DIR}/testing"
</span><ins>+ "${DERIVED_SOURCES_WEBCORE_DIR}"
</ins><span class="cx"> )
</span><span class="cx">
</span><span class="cx"> set(WebCoreTestSupport_IDL_INCLUDES
</span></span></pre></div>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (182031 => 182032)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2015-03-26 22:52:14 UTC (rev 182031)
+++ trunk/Source/WebCore/ChangeLog 2015-03-26 22:53:46 UTC (rev 182032)
</span><span class="lines">@@ -1,3 +1,16 @@
</span><ins>+2015-03-26 Alex Christensen <achristensen@webkit.org>
+
+ Progress towards CMake on Mac.
+ https://bugs.webkit.org/show_bug.cgi?id=143112
+
+ Reviewed by Chris Dumez.
+
+ * CMakeLists.txt:
+ * PlatformEfl.cmake:
+ * PlatformGTK.cmake:
+ * PlatformMac.cmake:
+ * platform/graphics/mac/IconMac.mm:
+
</ins><span class="cx"> 2015-03-26 Jer Noble <jer.noble@apple.com>
</span><span class="cx">
</span><span class="cx"> [iOS] Accessibility crashing because MediaPlayer is laying out UI off the main thread
</span></span></pre></div>
<a id="trunkSourceWebCorePlatformEflcmake"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/PlatformEfl.cmake (182031 => 182032)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/PlatformEfl.cmake 2015-03-26 22:52:14 UTC (rev 182031)
+++ trunk/Source/WebCore/PlatformEfl.cmake 2015-03-26 22:53:46 UTC (rev 182032)
</span><span class="lines">@@ -66,7 +66,6 @@
</span><span class="cx">
</span><span class="cx"> platform/ContextMenuItemNone.cpp
</span><span class="cx"> platform/ContextMenuNone.cpp
</span><del>- platform/Cursor.cpp
</del><span class="cx">
</span><span class="cx"> platform/audio/efl/AudioBusEfl.cpp
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCorePlatformGTKcmake"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/PlatformGTK.cmake (182031 => 182032)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/PlatformGTK.cmake 2015-03-26 22:52:14 UTC (rev 182031)
+++ trunk/Source/WebCore/PlatformGTK.cmake 2015-03-26 22:53:46 UTC (rev 182032)
</span><span class="lines">@@ -49,7 +49,6 @@
</span><span class="cx"> loader/soup/CachedRawResourceSoup.cpp
</span><span class="cx"> loader/soup/SubresourceLoaderSoup.cpp
</span><span class="cx">
</span><del>- platform/Cursor.cpp
</del><span class="cx"> platform/PlatformStrategies.cpp
</span><span class="cx">
</span><span class="cx"> platform/audio/gtk/AudioBusGtk.cpp
</span></span></pre></div>
<a id="trunkSourceWebCorePlatformMaccmake"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/PlatformMac.cmake (182031 => 182032)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/PlatformMac.cmake 2015-03-26 22:52:14 UTC (rev 182031)
+++ trunk/Source/WebCore/PlatformMac.cmake 2015-03-26 22:53:46 UTC (rev 182032)
</span><span class="lines">@@ -8,6 +8,7 @@
</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}/platform/audio/mac"
</ins><span class="cx"> "${WEBCORE_DIR}/platform/cf"
</span><span class="cx"> "${WEBCORE_DIR}/platform/cocoa"
</span><span class="cx"> "${WEBCORE_DIR}/platform/graphics/avfoundation"
</span><span class="lines">@@ -18,6 +19,7 @@
</span><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><ins>+ "${WEBCORE_DIR}/platform/graphics/opengl"
</ins><span class="cx"> "${WEBCORE_DIR}/platform/graphics/mac"
</span><span class="cx"> "${WEBCORE_DIR}/platform/mac"
</span><span class="cx"> "${WEBCORE_DIR}/platform/network/cocoa"
</span><span class="lines">@@ -41,6 +43,14 @@
</span><span class="cx"> accessibility/mac/WebAccessibilityObjectWrapperBase.mm
</span><span class="cx"> accessibility/mac/WebAccessibilityObjectWrapperMac.mm
</span><span class="cx">
</span><ins>+ crypto/CommonCryptoUtilities.cpp
+ crypto/CryptoAlgorithm.cpp
+ crypto/CryptoAlgorithmDescriptionBuilder.cpp
+ crypto/CryptoAlgorithmRegistry.cpp
+ crypto/CryptoKey.cpp
+ crypto/CryptoKeyPair.cpp
+ crypto/SubtleCrypto.cpp
+
</ins><span class="cx"> loader/archive/cf/LegacyWebArchive.cpp
</span><span class="cx"> loader/archive/cf/LegacyWebArchiveMac.mm
</span><span class="cx">
</span><span class="lines">@@ -56,16 +66,41 @@
</span><span class="cx"> page/mac/SettingsMac.mm
</span><span class="cx"> page/mac/UserAgentMac.mm
</span><span class="cx">
</span><ins>+ platform/LocalizedStrings.cpp
+
+ platform/audio/mac/AudioBusMac.mm
+ platform/audio/mac/AudioDestinationMac.cpp
+ platform/audio/mac/AudioFileReaderMac.cpp
+ platform/audio/mac/AudioHardwareListenerMac.cpp
+ platform/audio/mac/AudioSessionMac.cpp
+ platform/audio/mac/CARingBuffer.cpp
+ platform/audio/mac/FFTFrameMac.cpp
+ platform/audio/mac/MediaSessionManagerMac.cpp
+
+ platform/cf/CFURLExtras.cpp
+ platform/cf/CoreMediaSoftLink.cpp
+ platform/cf/FileSystemCF.cpp
+ platform/cf/MediaAccessibilitySoftLink.cpp
+ platform/cf/RunLoopObserver.cpp
+ platform/cf/SharedBufferCF.cpp
+ platform/cf/SharedTimerCF.mm
+ platform/cf/URLCF.cpp
+
</ins><span class="cx"> platform/cocoa/DisplaySleepDisablerCocoa.cpp
</span><span class="cx"> platform/cocoa/KeyEventCocoa.mm
</span><span class="cx"> platform/cocoa/MemoryPressureHandlerCocoa.mm
</span><span class="cx"> platform/cocoa/SystemVersion.mm
</span><span class="cx"> platform/cocoa/TelephoneNumberDetectorCocoa.cpp
</span><span class="cx">
</span><ins>+ platform/graphics/avfoundation/AudioSourceProviderAVFObjC.mm
</ins><span class="cx"> platform/graphics/avfoundation/AVTrackPrivateAVFObjCImpl.mm
</span><ins>+ platform/graphics/avfoundation/CDMPrivateMediaSourceAVFObjC.mm
</ins><span class="cx"> platform/graphics/avfoundation/InbandMetadataTextTrackPrivateAVF.cpp
</span><span class="cx"> platform/graphics/avfoundation/InbandTextTrackPrivateAVF.cpp
</span><ins>+ platform/graphics/avfoundation/MediaPlaybackTargetMac.mm
</ins><span class="cx"> platform/graphics/avfoundation/MediaPlayerPrivateAVFoundation.cpp
</span><ins>+ platform/graphics/avfoundation/MediaSelectionGroupAVFObjC.mm
+ platform/graphics/avfoundation/MediaTimeAVFoundation.cpp
</ins><span class="cx">
</span><span class="cx"> platform/graphics/avfoundation/objc/AudioTrackPrivateAVFObjC.mm
</span><span class="cx"> platform/graphics/avfoundation/objc/AudioTrackPrivateMediaSourceAVFObjC.cpp
</span><span class="lines">@@ -96,6 +131,59 @@
</span><span class="cx"> platform/graphics/ca/mac/PlatformCALayerMac.mm
</span><span class="cx"> platform/graphics/ca/mac/WebTiledBackingLayer.mm
</span><span class="cx">
</span><ins>+ platform/graphics/cg/BitmapImageCG.cpp
+ platform/graphics/cg/ColorCG.cpp
+ platform/graphics/cg/FloatPointCG.cpp
+ platform/graphics/cg/FloatRectCG.cpp
+ platform/graphics/cg/FloatSizeCG.cpp
+ platform/graphics/cg/GradientCG.cpp
+ platform/graphics/cg/GraphicsContext3DCG.cpp
+ platform/graphics/cg/GraphicsContextCG.cpp
+ platform/graphics/cg/IOSurfacePool.cpp
+ platform/graphics/cg/ImageBufferCG.cpp
+ platform/graphics/cg/ImageBufferDataCG.cpp
+ platform/graphics/cg/ImageCG.cpp
+ platform/graphics/cg/ImageSourceCG.cpp
+ platform/graphics/cg/ImageSourceCGMac.mm
+ platform/graphics/cg/ImageSourceCGWin.cpp
+ platform/graphics/cg/IntPointCG.cpp
+ platform/graphics/cg/IntRectCG.cpp
+ platform/graphics/cg/IntSizeCG.cpp
+ platform/graphics/cg/PDFDocumentImage.cpp
+ platform/graphics/cg/PathCG.cpp
+ platform/graphics/cg/PatternCG.cpp
+ platform/graphics/cg/SubimageCacheWithTimer.cpp
+ platform/graphics/cg/TransformationMatrixCG.cpp
+
+ platform/graphics/mac/ColorMac.mm
+ platform/graphics/mac/ComplexTextController.cpp
+ platform/graphics/mac/ComplexTextControllerCoreText.mm
+ platform/graphics/mac/DisplayRefreshMonitorMac.cpp
+ platform/graphics/mac/FloatPointMac.mm
+ platform/graphics/mac/FloatRectMac.mm
+ platform/graphics/mac/FloatSizeMac.mm
+ platform/graphics/mac/FontCacheMac.mm
+ platform/graphics/mac/FontCustomPlatformData.cpp
+ platform/graphics/mac/GlyphPageMac.cpp
+ platform/graphics/mac/GraphicsContext3DMac.mm
+ platform/graphics/mac/GraphicsContextMac.mm
+ platform/graphics/mac/IconMac.mm
+ platform/graphics/mac/ImageMac.mm
+ platform/graphics/mac/IntPointMac.mm
+ platform/graphics/mac/IntRectMac.mm
+ platform/graphics/mac/IntSizeMac.mm
+ platform/graphics/mac/MediaTimeQTKit.mm
+ platform/graphics/mac/PDFDocumentImageMac.mm
+ platform/graphics/mac/SimpleFontDataCoreText.cpp
+ platform/graphics/mac/WebGLLayer.mm
+ platform/graphics/mac/WebLayer.mm
+
+ platform/graphics/opengl/Extensions3DOpenGL.cpp
+ platform/graphics/opengl/Extensions3DOpenGLCommon.cpp
+ platform/graphics/opengl/GraphicsContext3DOpenGL.cpp
+ platform/graphics/opengl/GraphicsContext3DOpenGLCommon.cpp
+ platform/graphics/opengl/TemporaryOpenGLSetting.cpp
+
</ins><span class="cx"> platform/graphics/opentype/OpenTypeMathData.cpp
</span><span class="cx">
</span><span class="cx"> platform/mac/BlockExceptions.mm
</span><span class="lines">@@ -191,6 +279,9 @@
</span><span class="cx"> platform/network/mac/WebCoreResourceHandleAsOperationQueueDelegate.mm
</span><span class="cx"> platform/network/mac/WebCoreURLResponse.mm
</span><span class="cx">
</span><ins>+ platform/posix/FileSystemPOSIX.cpp
+ platform/posix/SharedBufferPOSIX.cpp
+
</ins><span class="cx"> platform/text/cf/HyphenationCF.cpp
</span><span class="cx">
</span><span class="cx"> platform/text/mac/LocaleMac.mm
</span><span class="lines">@@ -214,6 +305,7 @@
</span><span class="cx"> editing
</span><span class="cx"> editing/cocoa
</span><span class="cx"> editing/mac
</span><ins>+ fileapi
</ins><span class="cx"> history
</span><span class="cx"> html
</span><span class="cx"> html/forms
</span><span class="lines">@@ -221,6 +313,7 @@
</span><span class="cx"> html/shadow
</span><span class="cx"> inspector
</span><span class="cx"> loader
</span><ins>+
</ins><span class="cx"> loader/appcache
</span><span class="cx"> loader/archive
</span><span class="cx"> loader/archive/cf
</span><span class="lines">@@ -233,6 +326,7 @@
</span><span class="cx"> platform
</span><span class="cx"> plugins
</span><span class="cx"> rendering
</span><ins>+ replay
</ins><span class="cx"> storage
</span><span class="cx"> style
</span><span class="cx"> svg
</span><span class="lines">@@ -242,6 +336,7 @@
</span><span class="cx"> page/scrolling
</span><span class="cx">
</span><span class="cx"> platform/animation
</span><ins>+ platform/audio
</ins><span class="cx"> platform/graphics
</span><span class="cx"> platform/mac
</span><span class="cx"> platform/mock
</span><span class="lines">@@ -250,6 +345,7 @@
</span><span class="cx"> platform/text
</span><span class="cx">
</span><span class="cx"> platform/graphics/ca
</span><ins>+ platform/graphics/cg
</ins><span class="cx"> platform/graphics/filters
</span><span class="cx"> platform/graphics/mac
</span><span class="cx"> platform/graphics/transforms
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicsmacIconMacmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/mac/IconMac.mm (182031 => 182032)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/mac/IconMac.mm 2015-03-26 22:52:14 UTC (rev 182031)
+++ trunk/Source/WebCore/platform/graphics/mac/IconMac.mm 2015-03-26 22:53:46 UTC (rev 182032)
</span><span class="lines">@@ -18,11 +18,11 @@
</span><span class="cx"> *
</span><span class="cx"> */
</span><span class="cx">
</span><del>-#if !PLATFORM(IOS)
-
</del><span class="cx"> #import "config.h"
</span><span class="cx"> #import "Icon.h"
</span><span class="cx">
</span><ins>+#if !PLATFORM(IOS)
+
</ins><span class="cx"> #import "GraphicsContext.h"
</span><span class="cx"> #import "IntRect.h"
</span><span class="cx"> #import "LocalCurrentGraphicsContext.h"
</span></span></pre></div>
<a id="trunkSourceWebKitChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/ChangeLog (182031 => 182032)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/ChangeLog 2015-03-26 22:52:14 UTC (rev 182031)
+++ trunk/Source/WebKit/ChangeLog 2015-03-26 22:53:46 UTC (rev 182032)
</span><span class="lines">@@ -1,3 +1,12 @@
</span><ins>+2015-03-26 Alex Christensen <achristensen@webkit.org>
+
+ Progress towards CMake on Mac.
+ https://bugs.webkit.org/show_bug.cgi?id=143112
+
+ Reviewed by Chris Dumez.
+
+ * PlatformMac.cmake:
+
</ins><span class="cx"> 2015-03-20 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 (182031 => 182032)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/PlatformMac.cmake 2015-03-26 22:52:14 UTC (rev 182031)
+++ trunk/Source/WebKit/PlatformMac.cmake 2015-03-26 22:53:46 UTC (rev 182032)
</span><span class="lines">@@ -1,3 +1,36 @@
</span><ins>+find_library(ACCELERATE_LIBRARY accelerate)
+find_library(AUDIOUNIT_LIBRARY AudioUnit)
+find_library(CARBON_LIBRARY Carbon)
+find_library(COCOA_LIBRARY Cocoa)
+find_library(DISKARBITRATION_LIBRARY DiskArbitration)
+find_library(IOKIT_LIBRARY IOKit)
+find_library(OPENGL_LIBRARY OpenGL)
+find_library(QUARTZCORE_LIBRARY QuartzCore)
+find_library(SQLITE3_LIBRARY sqlite3)
+find_library(XML2_LIBRARY XML2)
+find_package(ZLIB REQUIRED)
+
+if ("${CURRENT_OSX_VERSION}" MATCHES "10.9")
+set(WEBKITSYSTEMINTERFACE_LIBRARY libWebKitSystemInterfaceMavericks.a)
+else ()
+set(WEBKITSYSTEMINTERFACE_LIBRARY libWebKitSystemInterfaceYosemite.a)
+endif ()
+link_directories(../../WebKitLibraries)
+
+list(APPEND WebKit_LIBRARIES
+ ${ACCELERATE_LIBRARY}
+ ${AUDIOUNIT_LIBRARY}
+ ${CARBON_LIBRARY}
+ ${COCOA_LIBRARY}
+ ${DISKARBITRATION_LIBRARY}
+ ${IOKIT_LIBRARY}
+ ${OPENGL_LIBRARY}
+ ${QUARTZCORE_LIBRARY}
+ ${SQLITE3_LIBRARY}
+ ${WEBKITSYSTEMINTERFACE_LIBRARY}
+ ${XML2_LIBRARY}
+)
+
</ins><span class="cx"> list(APPEND WebKit_INCLUDE_DIRECTORIES
</span><span class="cx"> "${JAVASCRIPTCORE_DIR}/dfg"
</span><span class="cx"> "${WEBCORE_DIR}/accessibility/mac"
</span></span></pre></div>
<a id="trunkSourceWebKitmacChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/mac/ChangeLog (182031 => 182032)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/mac/ChangeLog 2015-03-26 22:52:14 UTC (rev 182031)
+++ trunk/Source/WebKit/mac/ChangeLog 2015-03-26 22:53:46 UTC (rev 182032)
</span><span class="lines">@@ -1,3 +1,12 @@
</span><ins>+2015-03-26 Alex Christensen <achristensen@webkit.org>
+
+ Progress towards CMake on Mac.
+ https://bugs.webkit.org/show_bug.cgi?id=143112
+
+ Reviewed by Chris Dumez.
+
+ * WebCoreSupport/WebFrameLoaderClient.h:
+
</ins><span class="cx"> 2015-03-26 Ryosuke Niwa <rniwa@webkit.org>
</span><span class="cx">
</span><span class="cx"> Cursor doesn't change back to pointer when leaving Mail
</span></span></pre></div>
<a id="trunkSourceWebKitmacWebCoreSupportWebFrameLoaderClienth"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/mac/WebCoreSupport/WebFrameLoaderClient.h (182031 => 182032)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/mac/WebCoreSupport/WebFrameLoaderClient.h 2015-03-26 22:52:14 UTC (rev 182031)
+++ trunk/Source/WebKit/mac/WebCoreSupport/WebFrameLoaderClient.h 2015-03-26 22:53:46 UTC (rev 182032)
</span><span class="lines">@@ -239,7 +239,9 @@
</span><span class="cx"> virtual void didCreateQuickLookHandle(WebCore::QuickLookHandle&) override;
</span><span class="cx"> #endif
</span><span class="cx">
</span><ins>+#if ENABLE(CONTENT_FILTERING)
</ins><span class="cx"> void contentFilterDidBlockLoad(WebCore::ContentFilterUnblockHandler) override;
</span><ins>+#endif
</ins><span class="cx">
</span><span class="cx"> RetainPtr<WebFrame> m_webFrame;
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebKit2CMakeListstxt"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/CMakeLists.txt (182031 => 182032)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/CMakeLists.txt 2015-03-26 22:52:14 UTC (rev 182031)
+++ trunk/Source/WebKit2/CMakeLists.txt 2015-03-26 22:53:46 UTC (rev 182032)
</span><span class="lines">@@ -154,17 +154,7 @@
</span><span class="cx"> )
</span><span class="cx"> endif ()
</span><span class="cx">
</span><del>-set(WebKit2_SOURCES
- DatabaseProcess/DatabaseToWebProcessConnection.cpp
- DatabaseProcess/DatabaseProcess.cpp
- DatabaseProcess/IndexedDB/DatabaseProcessIDBConnection.cpp
- DatabaseProcess/IndexedDB/IDBSerialization.cpp
- DatabaseProcess/IndexedDB/UniqueIDBDatabase.cpp
- DatabaseProcess/IndexedDB/UniqueIDBDatabaseIdentifier.cpp
- DatabaseProcess/IndexedDB/sqlite/SQLiteIDBCursor.cpp
- DatabaseProcess/IndexedDB/sqlite/SQLiteIDBTransaction.cpp
- DatabaseProcess/IndexedDB/sqlite/UniqueIDBDatabaseBackingStoreSQLite.cpp
-
</del><ins>+set(NetworkProcess_SOURCES
</ins><span class="cx"> NetworkProcess/NetworkConnectionToWebProcess.cpp
</span><span class="cx"> NetworkProcess/NetworkProcess.cpp
</span><span class="cx"> NetworkProcess/NetworkProcessPlatformStrategies.cpp
</span><span class="lines">@@ -178,7 +168,19 @@
</span><span class="cx"> NetworkProcess/cache/NetworkCacheEncoder.cpp
</span><span class="cx"> NetworkProcess/cache/NetworkCacheDecoder.cpp
</span><span class="cx"> NetworkProcess/cache/NetworkCacheKey.cpp
</span><ins>+)
</ins><span class="cx">
</span><ins>+set(WebKit2_SOURCES
+ DatabaseProcess/DatabaseToWebProcessConnection.cpp
+ DatabaseProcess/DatabaseProcess.cpp
+ DatabaseProcess/IndexedDB/DatabaseProcessIDBConnection.cpp
+ DatabaseProcess/IndexedDB/IDBSerialization.cpp
+ DatabaseProcess/IndexedDB/UniqueIDBDatabase.cpp
+ DatabaseProcess/IndexedDB/UniqueIDBDatabaseIdentifier.cpp
+ DatabaseProcess/IndexedDB/sqlite/SQLiteIDBCursor.cpp
+ DatabaseProcess/IndexedDB/sqlite/SQLiteIDBTransaction.cpp
+ DatabaseProcess/IndexedDB/sqlite/UniqueIDBDatabaseBackingStoreSQLite.cpp
+
</ins><span class="cx"> Platform/Logging.cpp
</span><span class="cx"> Platform/Module.cpp
</span><span class="cx">
</span><span class="lines">@@ -319,9 +321,6 @@
</span><span class="cx">
</span><span class="cx"> Shared/WebsiteData/WebsiteData.cpp
</span><span class="cx">
</span><del>- UIProcess/API/APINavigationData.cpp
- UIProcess/API/APIProcessPoolConfiguration.cpp
- UIProcess/API/APISession.cpp
</del><span class="cx"> UIProcess/BackingStore.cpp
</span><span class="cx"> UIProcess/DrawingAreaProxy.cpp
</span><span class="cx"> UIProcess/FrameLoadState.cpp
</span><span class="lines">@@ -389,6 +388,9 @@
</span><span class="cx">
</span><span class="cx"> UIProcess/API/APIFrameInfo.cpp
</span><span class="cx"> UIProcess/API/APINavigation.cpp
</span><ins>+ UIProcess/API/APINavigationData.cpp
+ UIProcess/API/APIProcessPoolConfiguration.cpp
+ UIProcess/API/APISession.cpp
</ins><span class="cx"> UIProcess/API/APISessionState.cpp
</span><span class="cx"> UIProcess/API/APIWebsiteDataStore.cpp
</span><span class="cx"> UIProcess/API/APIUserContentExtension.cpp
</span><span class="lines">@@ -620,6 +622,8 @@
</span><span class="cx"> WebProcess/WebPage/WebPageOverlay.cpp
</span><span class="cx"> WebProcess/WebPage/VisitedLinkTableController.cpp
</span><span class="cx"> WebProcess/WebPage/WebUndoStep.cpp
</span><ins>+
+ ${NetworkProcess_SOURCES}
</ins><span class="cx"> )
</span><span class="cx">
</span><span class="cx"> set(WebKit2_MESSAGES_IN_FILES
</span></span></pre></div>
<a id="trunkSourceWebKit2ChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/ChangeLog (182031 => 182032)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/ChangeLog 2015-03-26 22:52:14 UTC (rev 182031)
+++ trunk/Source/WebKit2/ChangeLog 2015-03-26 22:53:46 UTC (rev 182032)
</span><span class="lines">@@ -1,3 +1,14 @@
</span><ins>+2015-03-26 Alex Christensen <achristensen@webkit.org>
+
+ Progress towards CMake on Mac.
+ https://bugs.webkit.org/show_bug.cgi?id=143112
+
+ Reviewed by Chris Dumez.
+
+ * CMakeLists.txt:
+ * PlatformMac.cmake:
+ * UIProcess/Cocoa/WebPageProxyCocoa.mm:
+
</ins><span class="cx"> 2015-03-26 Chris Dumez <cdumez@apple.com>
</span><span class="cx">
</span><span class="cx"> [WK2][Cocoa] Add private API to override the network disk cache size
</span></span></pre></div>
<a id="trunkSourceWebKit2PlatformMaccmake"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/PlatformMac.cmake (182031 => 182032)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/PlatformMac.cmake 2015-03-26 22:52:14 UTC (rev 182031)
+++ trunk/Source/WebKit2/PlatformMac.cmake 2015-03-26 22:53:46 UTC (rev 182032)
</span><span class="lines">@@ -13,6 +13,7 @@
</span><span class="cx"> "${WEBKIT2_DIR}/Platform/mac"
</span><span class="cx"> "${WEBKIT2_DIR}/Platform/IPC/mac"
</span><span class="cx"> "${WEBKIT2_DIR}/Shared/API/Cocoa"
</span><ins>+ "${WEBKIT2_DIR}/Shared/API/c/cf"
</ins><span class="cx"> "${WEBKIT2_DIR}/Shared/cf"
</span><span class="cx"> "${WEBKIT2_DIR}/Shared/mac"
</span><span class="cx"> "${WEBKIT2_DIR}/Shared/Plugins/mac"
</span><span class="lines">@@ -42,9 +43,12 @@
</span><span class="cx"> )
</span><span class="cx">
</span><span class="cx"> set(WebKit2_FORWARDING_HEADERS_DIRECTORIES
</span><ins>+ Shared/API/c
+ Shared/API/c/mac
</ins><span class="cx"> UIProcess/API/C
</span><del>- Shared/API/c
</del><span class="cx"> UIProcess/Cocoa
</span><ins>+ WebProcess/InjectedBundle/API/c
+ WebProcess/WebPage
</ins><span class="cx"> )
</span><span class="cx">
</span><span class="cx"> WEBKIT_CREATE_FORWARDING_HEADERS(WebKit FILES ${WebKit2_FORWARDING_HEADERS_FILES} DIRECTORIES ${WebKit2_FORWARDING_HEADERS_DIRECTORIES})
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessCocoaWebPageProxyCocoamm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/Cocoa/WebPageProxyCocoa.mm (182031 => 182032)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/Cocoa/WebPageProxyCocoa.mm 2015-03-26 22:52:14 UTC (rev 182031)
+++ trunk/Source/WebKit2/UIProcess/Cocoa/WebPageProxyCocoa.mm 2015-03-26 22:53:46 UTC (rev 182032)
</span><span class="lines">@@ -72,10 +72,12 @@
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+#if ENABLE(CONTENT_FILTERING)
</ins><span class="cx"> void WebPageProxy::contentFilterDidBlockLoadForFrame(const WebCore::ContentFilterUnblockHandler& unblockHandler, uint64_t frameID)
</span><span class="cx"> {
</span><span class="cx"> if (WebFrameProxy* frame = m_process->webFrame(frameID))
</span><span class="cx"> frame->contentFilterDidBlockLoad(unblockHandler);
</span><span class="cx"> }
</span><ins>+#endif
</ins><span class="cx">
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourcecmakeOptionsMaccmake"></a>
<div class="modfile"><h4>Modified: trunk/Source/cmake/OptionsMac.cmake (182031 => 182032)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/cmake/OptionsMac.cmake 2015-03-26 22:52:14 UTC (rev 182031)
+++ trunk/Source/cmake/OptionsMac.cmake 2015-03-26 22:53:46 UTC (rev 182032)
</span><span class="lines">@@ -214,6 +214,13 @@
</span><span class="cx">
</span><span class="cx"> WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_LLINT_C_LOOP OFF)
</span><span class="cx">
</span><ins>+WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_SANDBOX_EXTENSIONS ON)
+WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_WEB_PROCESS_SANDBOX ON)
+WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_NETWORK_PROCESS ON)
+WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_DATABASE_PROCESS ON)
+WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_MEMORY_SAMPLER ON)
+WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_SHAREABLE_RESOURCE ON)
+
</ins><span class="cx"> WEBKIT_OPTION_END()
</span><span class="cx">
</span><span class="cx"> set(ENABLE_WEBKIT ON)
</span></span></pre>
</div>
</div>
</body>
</html>