<!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>[182865] 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/182865">182865</a></dd>
<dt>Author</dt> <dd>achristensen@apple.com</dd>
<dt>Date</dt> <dd>2015-04-15 15:45:51 -0700 (Wed, 15 Apr 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>Progress towards CMake on Mac.
https://bugs.webkit.org/show_bug.cgi?id=143785
Reviewed by Csaba Osztrogonác.
.:
* CMakeLists.txt:
* Source/cmake/OptionsMac.cmake:
* Source/cmake/WebKitFS.cmake:
Source/WebCore:
* CMakeLists.txt:
* PlatformMac.cmake:
Source/WebKit:
* PlatformMac.cmake:
Source/WebKit/mac:
* WebView/WebPDFDocumentExtras.mm:
* WebView/WebPDFView.mm:
Source/WebKit2:
* CMakeLists.txt:
* PlatformEfl.cmake:
* PlatformGTK.cmake:</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkCMakeListstxt">trunk/CMakeLists.txt</a></li>
<li><a href="#trunkChangeLog">trunk/ChangeLog</a></li>
<li><a href="#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="#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="#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="#trunkSourceWebKit2CMakeListstxt">trunk/Source/WebKit2/CMakeLists.txt</a></li>
<li><a href="#trunkSourceWebKit2ChangeLog">trunk/Source/WebKit2/ChangeLog</a></li>
<li><a href="#trunkSourceWebKit2PlatformEflcmake">trunk/Source/WebKit2/PlatformEfl.cmake</a></li>
<li><a href="#trunkSourceWebKit2PlatformGTKcmake">trunk/Source/WebKit2/PlatformGTK.cmake</a></li>
<li><a href="#trunkSourcecmakeOptionsMaccmake">trunk/Source/cmake/OptionsMac.cmake</a></li>
<li><a href="#trunkSourcecmakeWebKitFScmake">trunk/Source/cmake/WebKitFS.cmake</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkCMakeListstxt"></a>
<div class="modfile"><h4>Modified: trunk/CMakeLists.txt (182864 => 182865)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/CMakeLists.txt 2015-04-15 22:35:42 UTC (rev 182864)
+++ trunk/CMakeLists.txt 2015-04-15 22:45:51 UTC (rev 182865)
</span><span class="lines">@@ -17,7 +17,7 @@
</span><span class="cx"> set(DERIVED_SOURCES_DIR "${CMAKE_BINARY_DIR}/DerivedSources")
</span><span class="cx"> set(DERIVED_SOURCES_JAVASCRIPTCORE_DIR "${CMAKE_BINARY_DIR}/DerivedSources/JavaScriptCore")
</span><span class="cx"> set(DERIVED_SOURCES_WEBCORE_DIR "${CMAKE_BINARY_DIR}/DerivedSources/WebCore")
</span><del>-set(DERIVED_SOURCES_WEBKIT_DIR "${CMAKE_BINARY_DIR}/DerivedSources/WebKit")
</del><ins>+set(DERIVED_SOURCES_WEBKITLEGACY_DIR "${CMAKE_BINARY_DIR}/DerivedSources/WebKitLegacy")
</ins><span class="cx"> set(DERIVED_SOURCES_WEBKIT2_DIR "${CMAKE_BINARY_DIR}/DerivedSources/WebKit2")
</span><span class="cx"> set(DERIVED_SOURCES_WEBINSPECTORUI_DIR "${CMAKE_BINARY_DIR}/DerivedSources/WebInspectorUI")
</span><span class="cx"> set(DERIVED_SOURCES_WTF_DIR "${CMAKE_BINARY_DIR}/DerivedSources/WTF")
</span></span></pre></div>
<a id="trunkChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/ChangeLog (182864 => 182865)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/ChangeLog 2015-04-15 22:35:42 UTC (rev 182864)
+++ trunk/ChangeLog 2015-04-15 22:45:51 UTC (rev 182865)
</span><span class="lines">@@ -1,3 +1,14 @@
</span><ins>+2015-04-15 Alex Christensen <achristensen@webkit.org>
+
+ Progress towards CMake on Mac.
+ https://bugs.webkit.org/show_bug.cgi?id=143785
+
+ Reviewed by Csaba Osztrogonác.
+
+ * CMakeLists.txt:
+ * Source/cmake/OptionsMac.cmake:
+ * Source/cmake/WebKitFS.cmake:
+
</ins><span class="cx"> 2015-04-10 Jon Honeycutt <jhoneycutt@apple.com>
</span><span class="cx">
</span><span class="cx"> Cannot click "Next" button on Google two-factor auth setup page
</span></span></pre></div>
<a id="trunkSourceWebCoreCMakeListstxt"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/CMakeLists.txt (182864 => 182865)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/CMakeLists.txt 2015-04-15 22:35:42 UTC (rev 182864)
+++ trunk/Source/WebCore/CMakeLists.txt 2015-04-15 22:45:51 UTC (rev 182865)
</span><span class="lines">@@ -1214,6 +1214,21 @@
</span><span class="cx">
</span><span class="cx"> bridge/jsc/BridgeJSC.cpp
</span><span class="cx">
</span><ins>+ contentextensions/CombinedURLFilters.cpp
+ contentextensions/CompiledContentExtension.cpp
+ contentextensions/ContentExtension.cpp
+ contentextensions/ContentExtensionCompiler.cpp
+ contentextensions/ContentExtensionError.cpp
+ contentextensions/ContentExtensionParser.cpp
+ contentextensions/ContentExtensionRule.cpp
+ contentextensions/ContentExtensionsBackend.cpp
+ contentextensions/DFA.cpp
+ contentextensions/DFABytecodeCompiler.cpp
+ contentextensions/DFABytecodeInterpreter.cpp
+ contentextensions/NFA.cpp
+ contentextensions/NFAToDFA.cpp
+ contentextensions/URLFilterParser.cpp
+
</ins><span class="cx"> css/BasicShapeFunctions.cpp
</span><span class="cx"> css/CSSAspectRatioValue.cpp
</span><span class="cx"> css/CSSBasicShapes.cpp
</span><span class="lines">@@ -1822,6 +1837,7 @@
</span><span class="cx"> inspector/WorkerRuntimeAgent.cpp
</span><span class="cx">
</span><span class="cx"> loader/CookieJar.cpp
</span><ins>+ loader/ContentFilter.cpp
</ins><span class="cx"> loader/CrossOriginAccessControl.cpp
</span><span class="cx"> loader/CrossOriginPreflightResultCache.cpp
</span><span class="cx"> loader/DocumentLoadTiming.cpp
</span><span class="lines">@@ -2035,6 +2051,7 @@
</span><span class="cx"> platform/ScrollbarThemeComposite.cpp
</span><span class="cx"> platform/SharedBuffer.cpp
</span><span class="cx"> platform/SharedBufferChunkReader.cpp
</span><ins>+ platform/Theme.cpp
</ins><span class="cx"> platform/ThreadGlobalData.cpp
</span><span class="cx"> platform/ThreadTimers.cpp
</span><span class="cx"> platform/Timer.cpp
</span><span class="lines">@@ -2086,6 +2103,7 @@
</span><span class="cx"> platform/graphics/BitmapImage.cpp
</span><span class="cx"> platform/graphics/Color.cpp
</span><span class="cx"> platform/graphics/CrossfadeGeneratedImage.cpp
</span><ins>+ platform/graphics/DisplayRefreshMonitorClient.cpp
</ins><span class="cx"> platform/graphics/FloatPoint.cpp
</span><span class="cx"> platform/graphics/FloatPoint3D.cpp
</span><span class="cx"> platform/graphics/FloatPolygon.cpp
</span><span class="lines">@@ -2929,6 +2947,8 @@
</span><span class="cx"> html/track/VideoTrack.cpp
</span><span class="cx"> html/track/VideoTrackList.cpp
</span><span class="cx"> html/track/VTTCue.cpp
</span><ins>+ html/track/VTTRegion.cpp
+ html/track/VTTRegionList.cpp
</ins><span class="cx"> html/track/VTTScanner.cpp
</span><span class="cx"> html/track/WebVTTElement.cpp
</span><span class="cx"> html/track/WebVTTParser.cpp
</span></span></pre></div>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (182864 => 182865)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2015-04-15 22:35:42 UTC (rev 182864)
+++ trunk/Source/WebCore/ChangeLog 2015-04-15 22:45:51 UTC (rev 182865)
</span><span class="lines">@@ -1,3 +1,13 @@
</span><ins>+2015-04-15 Alex Christensen <achristensen@webkit.org>
+
+ Progress towards CMake on Mac.
+ https://bugs.webkit.org/show_bug.cgi?id=143785
+
+ Reviewed by Csaba Osztrogonác.
+
+ * CMakeLists.txt:
+ * PlatformMac.cmake:
+
</ins><span class="cx"> 2015-04-15 Daniel Bates <dabates@apple.com>
</span><span class="cx">
</span><span class="cx"> Clean up: Have SVGTextLayoutEngine::beginTextPathLayout() take a reference to a
</span></span></pre></div>
<a id="trunkSourceWebCorePlatformMaccmake"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/PlatformMac.cmake (182864 => 182865)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/PlatformMac.cmake 2015-04-15 22:35:42 UTC (rev 182864)
+++ trunk/Source/WebCore/PlatformMac.cmake 2015-04-15 22:45:51 UTC (rev 182865)
</span><span class="lines">@@ -2,6 +2,7 @@
</span><span class="cx"> "${WEBCORE_DIR}/accessibility/mac"
</span><span class="cx"> "${WEBCORE_DIR}/bindings/objc"
</span><span class="cx"> "${WEBCORE_DIR}/bridge/objc"
</span><ins>+ "${WEBCORE_DIR}/editing/cocoa"
</ins><span class="cx"> "${WEBCORE_DIR}/editing/mac"
</span><span class="cx"> "${WEBCORE_DIR}/icu"
</span><span class="cx"> "${WEBCORE_DIR}/loader/archive/cf"
</span><span class="lines">@@ -44,6 +45,22 @@
</span><span class="cx"> accessibility/mac/WebAccessibilityObjectWrapperBase.mm
</span><span class="cx"> accessibility/mac/WebAccessibilityObjectWrapperMac.mm
</span><span class="cx">
</span><ins>+ bindings/objc/DOM.mm
+ bindings/objc/DOMAbstractView.mm
+ bindings/objc/DOMCSS.mm
+ bindings/objc/DOMCustomXPathNSResolver.mm
+ bindings/objc/DOMEvents.mm
+ bindings/objc/DOMHTML.mm
+ bindings/objc/DOMInternal.mm
+ bindings/objc/DOMObject.mm
+ bindings/objc/DOMUIKitExtensions.mm
+ bindings/objc/DOMUtility.mm
+ bindings/objc/DOMXPath.mm
+ bindings/objc/ExceptionHandlers.mm
+ bindings/objc/ObjCEventListener.mm
+ bindings/objc/ObjCNodeFilterCondition.mm
+ bindings/objc/WebScriptObject.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">@@ -52,6 +69,48 @@
</span><span class="cx"> crypto/CryptoKeyPair.cpp
</span><span class="cx"> crypto/SubtleCrypto.cpp
</span><span class="cx">
</span><ins>+ crypto/algorithms/CryptoAlgorithmAES_CBC.cpp
+ crypto/algorithms/CryptoAlgorithmAES_KW.cpp
+ crypto/algorithms/CryptoAlgorithmHMAC.cpp
+ crypto/algorithms/CryptoAlgorithmRSAES_PKCS1_v1_5.cpp
+ crypto/algorithms/CryptoAlgorithmRSASSA_PKCS1_v1_5.cpp
+ crypto/algorithms/CryptoAlgorithmRSA_OAEP.cpp
+ crypto/algorithms/CryptoAlgorithmSHA1.cpp
+ crypto/algorithms/CryptoAlgorithmSHA224.cpp
+ crypto/algorithms/CryptoAlgorithmSHA256.cpp
+ crypto/algorithms/CryptoAlgorithmSHA384.cpp
+ crypto/algorithms/CryptoAlgorithmSHA512.cpp
+
+ crypto/keys/CryptoKeyAES.cpp
+ crypto/keys/CryptoKeyDataOctetSequence.cpp
+ crypto/keys/CryptoKeyDataRSAComponents.cpp
+ crypto/keys/CryptoKeyHMAC.cpp
+ crypto/keys/CryptoKeySerializationRaw.cpp
+
+ crypto/mac/CryptoAlgorithmAES_CBCMac.cpp
+ crypto/mac/CryptoAlgorithmAES_KWMac.cpp
+ crypto/mac/CryptoAlgorithmHMACMac.cpp
+ crypto/mac/CryptoAlgorithmRSAES_PKCS1_v1_5Mac.cpp
+ crypto/mac/CryptoAlgorithmRSASSA_PKCS1_v1_5Mac.cpp
+ crypto/mac/CryptoAlgorithmRSA_OAEPMac.cpp
+ crypto/mac/CryptoAlgorithmRegistryMac.cpp
+ crypto/mac/CryptoDigestMac.cpp
+ crypto/mac/CryptoKeyMac.cpp
+ crypto/mac/CryptoKeyRSAMac.cpp
+ crypto/mac/SerializedCryptoKeyWrapMac.mm
+
+ editing/cocoa/HTMLConverter.mm
+
+ editing/mac/AlternativeTextUIController.mm
+ editing/mac/DataDetection.mm
+ editing/mac/DictionaryLookup.mm
+ editing/mac/EditorMac.mm
+ editing/mac/FrameSelectionMac.mm
+ editing/mac/TextAlternativeWithRange.mm
+ editing/mac/TextUndoInsertionMarkupMac.mm
+
+ history/mac/HistoryItemMac.mm
+
</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">@@ -87,6 +146,7 @@
</span><span class="cx"> platform/cf/SharedTimerCF.cpp
</span><span class="cx"> platform/cf/URLCF.cpp
</span><span class="cx">
</span><ins>+ platform/cocoa/ContentFilterUnblockHandlerCocoa.mm
</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="lines">@@ -132,6 +192,14 @@
</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/cocoa/FontCascadeCocoa.mm
+ platform/graphics/cocoa/FontCocoa.mm
+ platform/graphics/cocoa/FontPlatformDataCocoa.mm
+ platform/graphics/cocoa/IOSurface.mm
+ platform/graphics/cocoa/IOSurfacePoolCocoa.mm
+ platform/graphics/cocoa/WebActionDisablingCALayerDelegate.mm
+ platform/graphics/cocoa/WebCoreCALayerExtras.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">@@ -315,6 +383,7 @@
</span><span class="cx"> inspector
</span><span class="cx"> loader
</span><span class="cx">
</span><ins>+ bridge/jsc
</ins><span class="cx"> loader/appcache
</span><span class="cx"> loader/archive
</span><span class="cx"> loader/archive/cf
</span><span class="lines">@@ -336,6 +405,8 @@
</span><span class="cx"> page/mac
</span><span class="cx"> page/scrolling
</span><span class="cx">
</span><ins>+ page/cocoa
+
</ins><span class="cx"> platform/animation
</span><span class="cx"> platform/audio
</span><span class="cx"> platform/graphics
</span><span class="lines">@@ -438,7 +509,7 @@
</span><span class="cx"> ${WORKERGLOBALSCOPE_CONSTRUCTORS_FILE}
</span><span class="cx"> ${DEDICATEDWORKERGLOBALSCOPE_CONSTRUCTORS_FILE}
</span><span class="cx"> )
</span><del>-GENERATE_BINDINGS(OBJC_BINDINGS
</del><ins>+GENERATE_BINDINGS(WebCore_SOURCES
</ins><span class="cx"> "${OBJC_BINDINGS_IDL_FILES}"
</span><span class="cx"> "${WEBCORE_DIR}"
</span><span class="cx"> "${IDL_INCLUDES}"
</span><span class="lines">@@ -447,4 +518,135 @@
</span><span class="cx"> ${IDL_ATTRIBUTES_FILE}
</span><span class="cx"> ${SUPPLEMENTAL_DEPENDENCY_FILE}
</span><span class="cx"> ${ADDITIONAL_BINDINGS_DEPENDENCIES})
</span><del>-# FIXME: Add the needed ObjC bindings to WebCore_SOURCES.
</del><ins>+
+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}/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}/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
+)
</ins></span></pre></div>
<a id="trunkSourceWebKitChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/ChangeLog (182864 => 182865)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/ChangeLog 2015-04-15 22:35:42 UTC (rev 182864)
+++ trunk/Source/WebKit/ChangeLog 2015-04-15 22:45:51 UTC (rev 182865)
</span><span class="lines">@@ -1,3 +1,12 @@
</span><ins>+2015-04-15 Alex Christensen <achristensen@webkit.org>
+
+ Progress towards CMake on Mac.
+ https://bugs.webkit.org/show_bug.cgi?id=143785
+
+ Reviewed by Csaba Osztrogonác.
+
+ * PlatformMac.cmake:
+
</ins><span class="cx"> 2015-04-08 Alex Christensen <achristensen@webkit.org> and Patrick Gansterer <paroga@webkit.org>
</span><span class="cx">
</span><span class="cx"> Add CMake build system for WinCairo port.
</span></span></pre></div>
<a id="trunkSourceWebKitPlatformMaccmake"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/PlatformMac.cmake (182864 => 182865)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/PlatformMac.cmake 2015-04-15 22:35:42 UTC (rev 182864)
+++ trunk/Source/WebKit/PlatformMac.cmake 2015-04-15 22:45:51 UTC (rev 182865)
</span><span class="lines">@@ -1,15 +1,23 @@
</span><span class="cx"> find_library(ACCELERATE_LIBRARY accelerate)
</span><ins>+find_library(AUDIOTOOLBOX_LIBRARY AudioToolbox)
</ins><span class="cx"> find_library(AUDIOUNIT_LIBRARY AudioUnit)
</span><span class="cx"> find_library(CARBON_LIBRARY Carbon)
</span><span class="cx"> find_library(COCOA_LIBRARY Cocoa)
</span><ins>+find_library(COREAUDIO_LIBRARY CoreAudio)
</ins><span class="cx"> find_library(DISKARBITRATION_LIBRARY DiskArbitration)
</span><span class="cx"> find_library(IOKIT_LIBRARY IOKit)
</span><ins>+find_library(IOSURFACE_LIBRARY IOSurface)
</ins><span class="cx"> find_library(OPENGL_LIBRARY OpenGL)
</span><ins>+find_library(QUARTZ_LIBRARY Quartz)
</ins><span class="cx"> find_library(QUARTZCORE_LIBRARY QuartzCore)
</span><ins>+find_library(SECURITY_LIBRARY Security)
</ins><span class="cx"> find_library(SQLITE3_LIBRARY sqlite3)
</span><span class="cx"> find_library(XML2_LIBRARY XML2)
</span><span class="cx"> find_package(ZLIB REQUIRED)
</span><span class="cx">
</span><ins>+find_library(PDFKIT_FRAMEWORK PDFKit HINTS ${QUARTZ_LIBRARY}/Versions/*/Frameworks)
+find_path(PDFKIT_INCLUDE_DIRECTORY PDFKit.h HINTS ${PDFKIT_FRAMEWORK}/Versions/*/Headers)
+
</ins><span class="cx"> if ("${CURRENT_OSX_VERSION}" MATCHES "10.9")
</span><span class="cx"> set(WEBKITSYSTEMINTERFACE_LIBRARY libWebKitSystemInterfaceMavericks.a)
</span><span class="cx"> else ()
</span><span class="lines">@@ -19,26 +27,37 @@
</span><span class="cx">
</span><span class="cx"> list(APPEND WebKit_LIBRARIES
</span><span class="cx"> ${ACCELERATE_LIBRARY}
</span><ins>+ ${AUDIOTOOLBOX_LIBRARY}
</ins><span class="cx"> ${AUDIOUNIT_LIBRARY}
</span><span class="cx"> ${CARBON_LIBRARY}
</span><span class="cx"> ${COCOA_LIBRARY}
</span><ins>+ ${COREAUDIO_LIBRARY}
</ins><span class="cx"> ${DISKARBITRATION_LIBRARY}
</span><span class="cx"> ${IOKIT_LIBRARY}
</span><ins>+ ${IOSURFACE_LIBRARY}
</ins><span class="cx"> ${OPENGL_LIBRARY}
</span><ins>+ ${PDFKIT_FRAMEWORK}/PDFKit
+ ${QUARTZ_LIBRARY}
</ins><span class="cx"> ${QUARTZCORE_LIBRARY}
</span><ins>+ ${SECURITY_LIBRARY}
</ins><span class="cx"> ${SQLITE3_LIBRARY}
</span><span class="cx"> ${WEBKITSYSTEMINTERFACE_LIBRARY}
</span><span class="cx"> ${XML2_LIBRARY}
</span><ins>+ ${ZLIB_LIBRARIES}
</ins><span class="cx"> )
</span><span class="cx">
</span><span class="cx"> list(APPEND WebKit_INCLUDE_DIRECTORIES
</span><ins>+ "${DERIVED_SOURCES_DIR}"
</ins><span class="cx"> "${DERIVED_SOURCES_WEBCORE_DIR}"
</span><ins>+ "${DERIVED_SOURCES_WEBKITLEGACY_DIR}"
</ins><span class="cx"> "${JAVASCRIPTCORE_DIR}/dfg"
</span><ins>+ "${PDFKIT_INCLUDE_DIRECTORY}"
</ins><span class="cx"> "${WEBCORE_DIR}/accessibility/mac"
</span><span class="cx"> "${WEBCORE_DIR}/bindings/objc"
</span><span class="cx"> "${WEBCORE_DIR}/bridge"
</span><span class="cx"> "${WEBCORE_DIR}/bridge/jsc"
</span><span class="cx"> "${WEBCORE_DIR}/bridge/objc"
</span><ins>+ "${WEBCORE_DIR}/ForwardingHeaders/inspector"
</ins><span class="cx"> "${WEBCORE_DIR}/loader/archive/cf"
</span><span class="cx"> "${WEBCORE_DIR}/loader/cf"
</span><span class="cx"> "${WEBCORE_DIR}/loader/mac"
</span><span class="lines">@@ -78,6 +97,7 @@
</span><span class="cx"> mac/WebInspector
</span><span class="cx"> mac/WebView
</span><span class="cx"> Storage
</span><ins>+ ../../WebKitLibraries
</ins><span class="cx"> )
</span><span class="cx">
</span><span class="cx"> list(APPEND WebKit_SOURCES
</span><span class="lines">@@ -236,6 +256,15 @@
</span><span class="cx"> mac/WebView/WebTextIterator.mm
</span><span class="cx"> mac/WebView/WebView.mm
</span><span class="cx"> mac/WebView/WebViewData.mm
</span><ins>+
+ Storage/StorageAreaImpl.cpp
+ Storage/StorageAreaSync.cpp
+ Storage/StorageNamespaceImpl.cpp
+ Storage/StorageSyncManager.cpp
+ Storage/StorageThread.cpp
+ Storage/StorageTracker.cpp
+ Storage/WebDatabaseProvider.cpp
+ Storage/WebStorageNamespaceProvider.cpp
</ins><span class="cx"> )
</span><span class="cx">
</span><span class="cx"> set(WebKit_LIBRARY_TYPE SHARED)
</span><span class="lines">@@ -321,4 +350,43 @@
</span><span class="cx"> mac/WebView/WebFormDelegate.m
</span><span class="cx"> PROPERTIES COMPILE_FLAGS -std=c99)
</span><span class="cx">
</span><ins>+file(COPY
+ mac/Plugins/Hosted/WebKitPluginAgent.defs
+ mac/Plugins/Hosted/WebKitPluginAgentReply.defs
+ mac/Plugins/Hosted/WebKitPluginClient.defs
+ mac/Plugins/Hosted/WebKitPluginHost.defs
+ mac/Plugins/Hosted/WebKitPluginHostTypes.defs
+ mac/Plugins/Hosted/WebKitPluginHostTypes.h
+DESTINATION ${DERIVED_SOURCES_WEBKITLEGACY_DIR})
+add_custom_command(
+ OUTPUT
+ ${DERIVED_SOURCES_WEBKITLEGACY_DIR}/WebKitPluginAgentReplyServer.c
+ ${DERIVED_SOURCES_WEBKITLEGACY_DIR}/WebKitPluginAgentReplyUser.c
+ ${DERIVED_SOURCES_WEBKITLEGACY_DIR}/WebKitPluginAgentServer.c
+ ${DERIVED_SOURCES_WEBKITLEGACY_DIR}/WebKitPluginAgentUser.c
+ ${DERIVED_SOURCES_WEBKITLEGACY_DIR}/WebKitPluginHostServer.c
+ ${DERIVED_SOURCES_WEBKITLEGACY_DIR}/WebKitPluginHostUser.c
+ MAIN_DEPENDENCY mac/Plugins/Hosted/WebKitPluginAgent.defs
+ WORKING_DIRECTORY ${DERIVED_SOURCES_WEBKITLEGACY_DIR}
+ COMMAND mig -I.. WebKitPluginAgent.defs WebKitPluginAgentReply.defs WebKitPluginHost.defs
+ VERBATIM)
+add_custom_command(
+ OUTPUT
+ ${DERIVED_SOURCES_WEBKITLEGACY_DIR}/WebKitPluginClientServer.c
+ ${DERIVED_SOURCES_WEBKITLEGACY_DIR}/WebKitPluginClientUser.c
+ MAIN_DEPENDENCY mac/Plugins/Hosted/WebKitPluginAgent.defs
+ WORKING_DIRECTORY ${DERIVED_SOURCES_WEBKITLEGACY_DIR}
+ COMMAND mig -I.. -sheader WebKitPluginClientServer.h WebKitPluginClient.defs
+ VERBATIM)
+list(APPEND WebKit_SOURCES
+ ${DERIVED_SOURCES_WEBKITLEGACY_DIR}/WebKitPluginAgentReplyServer.c
+ ${DERIVED_SOURCES_WEBKITLEGACY_DIR}/WebKitPluginAgentReplyUser.c
+ ${DERIVED_SOURCES_WEBKITLEGACY_DIR}/WebKitPluginAgentServer.c
+ ${DERIVED_SOURCES_WEBKITLEGACY_DIR}/WebKitPluginAgentUser.c
+ ${DERIVED_SOURCES_WEBKITLEGACY_DIR}/WebKitPluginClientServer.c
+ ${DERIVED_SOURCES_WEBKITLEGACY_DIR}/WebKitPluginClientUser.c
+ ${DERIVED_SOURCES_WEBKITLEGACY_DIR}/WebKitPluginHostServer.c
+ ${DERIVED_SOURCES_WEBKITLEGACY_DIR}/WebKitPluginHostUser.c
+)
+
</ins><span class="cx"> WEBKIT_CREATE_FORWARDING_HEADERS(WebKitLegacy DIRECTORIES ${WebKitLegacy_FORWARDING_HEADERS_DIRECTORIES} FILES ${WebKitLegacy_FORWARDING_HEADERS_FILES})
</span></span></pre></div>
<a id="trunkSourceWebKitmacChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/mac/ChangeLog (182864 => 182865)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/mac/ChangeLog 2015-04-15 22:35:42 UTC (rev 182864)
+++ trunk/Source/WebKit/mac/ChangeLog 2015-04-15 22:45:51 UTC (rev 182865)
</span><span class="lines">@@ -1,3 +1,13 @@
</span><ins>+2015-04-15 Alex Christensen <achristensen@webkit.org>
+
+ Progress towards CMake on Mac.
+ https://bugs.webkit.org/show_bug.cgi?id=143785
+
+ Reviewed by Csaba Osztrogonác.
+
+ * WebView/WebPDFDocumentExtras.mm:
+ * WebView/WebPDFView.mm:
+
</ins><span class="cx"> 2015-04-13 Jer Noble <jer.noble@apple.com>
</span><span class="cx">
</span><span class="cx"> [Fullscreen] ChromeClient::exitVideoFullscreen() should take a pointer to a HTMLVideoElement.
</span></span></pre></div>
<a id="trunkSourceWebKitmacWebViewWebPDFDocumentExtrasmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/mac/WebView/WebPDFDocumentExtras.mm (182864 => 182865)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/mac/WebView/WebPDFDocumentExtras.mm 2015-04-15 22:35:42 UTC (rev 182864)
+++ trunk/Source/WebKit/mac/WebView/WebPDFDocumentExtras.mm 2015-04-15 22:45:51 UTC (rev 182865)
</span><span class="lines">@@ -30,8 +30,12 @@
</span><span class="cx"> #import <wtf/RetainPtr.h>
</span><span class="cx">
</span><span class="cx"> #if !PLATFORM(IOS)
</span><ins>+#ifdef BUILDING_WITH_CMAKE
+#import <PDFDocument.h>
+#else
</ins><span class="cx"> #import <PDFKit/PDFDocument.h>
</span><span class="cx"> #endif
</span><ins>+#endif
</ins><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 (182864 => 182865)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/mac/WebView/WebPDFView.mm 2015-04-15 22:35:42 UTC (rev 182864)
+++ trunk/Source/WebKit/mac/WebView/WebPDFView.mm 2015-04-15 22:45:51 UTC (rev 182865)
</span><span class="lines">@@ -49,7 +49,6 @@
</span><span class="cx"> #import "WebUIDelegatePrivate.h"
</span><span class="cx"> #import "WebView.h"
</span><span class="cx"> #import "WebViewInternal.h"
</span><del>-#import <PDFKit/PDFKit.h>
</del><span class="cx"> #import <WebCore/DataTransfer.h>
</span><span class="cx"> #import <WebCore/EventNames.h>
</span><span class="cx"> #import <WebCore/FormState.h>
</span><span class="lines">@@ -67,6 +66,12 @@
</span><span class="cx"> #import <wtf/Assertions.h>
</span><span class="cx"> #import <wtf/CurrentTime.h>
</span><span class="cx">
</span><ins>+#ifdef BUILDING_WITH_CMAKE
+#import <PDFKit.h>
+#else
+#import <PDFKit/PDFKit.h>
+#endif
+
</ins><span class="cx"> #ifdef __has_include
</span><span class="cx"> #if __has_include(<ApplicationServices/ApplicationServicesPriv.h>)
</span><span class="cx"> #import <ApplicationServices/ApplicationServicesPriv.h>
</span></span></pre></div>
<a id="trunkSourceWebKit2CMakeListstxt"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/CMakeLists.txt (182864 => 182865)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/CMakeLists.txt 2015-04-15 22:35:42 UTC (rev 182864)
+++ trunk/Source/WebKit2/CMakeLists.txt 2015-04-15 22:45:51 UTC (rev 182865)
</span><span class="lines">@@ -320,7 +320,6 @@
</span><span class="cx">
</span><span class="cx"> Shared/WebsiteData/WebsiteData.cpp
</span><span class="cx">
</span><del>- UIProcess/BackingStore.cpp
</del><span class="cx"> UIProcess/DrawingAreaProxy.cpp
</span><span class="cx"> UIProcess/FrameLoadState.cpp
</span><span class="cx"> UIProcess/GeolocationPermissionRequestManagerProxy.cpp
</span></span></pre></div>
<a id="trunkSourceWebKit2ChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/ChangeLog (182864 => 182865)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/ChangeLog 2015-04-15 22:35:42 UTC (rev 182864)
+++ trunk/Source/WebKit2/ChangeLog 2015-04-15 22:45:51 UTC (rev 182865)
</span><span class="lines">@@ -1,3 +1,14 @@
</span><ins>+2015-04-15 Alex Christensen <achristensen@webkit.org>
+
+ Progress towards CMake on Mac.
+ https://bugs.webkit.org/show_bug.cgi?id=143785
+
+ Reviewed by Csaba Osztrogonác.
+
+ * CMakeLists.txt:
+ * PlatformEfl.cmake:
+ * PlatformGTK.cmake:
+
</ins><span class="cx"> 2015-04-15 Anders Carlsson <andersca@apple.com>
</span><span class="cx">
</span><span class="cx"> Make WKWebsiteDataRecord public
</span></span></pre></div>
<a id="trunkSourceWebKit2PlatformEflcmake"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/PlatformEfl.cmake (182864 => 182865)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/PlatformEfl.cmake 2015-04-15 22:35:42 UTC (rev 182864)
+++ trunk/Source/WebKit2/PlatformEfl.cmake 2015-04-15 22:45:51 UTC (rev 182865)
</span><span class="lines">@@ -58,6 +58,7 @@
</span><span class="cx">
</span><span class="cx"> Shared/unix/ChildProcessMain.cpp
</span><span class="cx">
</span><ins>+ UIProcess/BackingStore.cpp
</ins><span class="cx"> UIProcess/DefaultUndoController.cpp
</span><span class="cx">
</span><span class="cx"> UIProcess/API/C/CoordinatedGraphics/WKView.cpp
</span></span></pre></div>
<a id="trunkSourceWebKit2PlatformGTKcmake"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/PlatformGTK.cmake (182864 => 182865)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/PlatformGTK.cmake 2015-04-15 22:35:42 UTC (rev 182864)
+++ trunk/Source/WebKit2/PlatformGTK.cmake 2015-04-15 22:45:51 UTC (rev 182865)
</span><span class="lines">@@ -77,6 +77,8 @@
</span><span class="cx">
</span><span class="cx"> Shared/unix/ChildProcessMain.cpp
</span><span class="cx">
</span><ins>+ UIProcess/BackingStore.cpp
+
</ins><span class="cx"> UIProcess/Databases/gtk/DatabaseProcessProxyGtk.cpp
</span><span class="cx">
</span><span class="cx"> UIProcess/DefaultUndoController.cpp
</span></span></pre></div>
<a id="trunkSourcecmakeOptionsMaccmake"></a>
<div class="modfile"><h4>Modified: trunk/Source/cmake/OptionsMac.cmake (182864 => 182865)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/cmake/OptionsMac.cmake 2015-04-15 22:35:42 UTC (rev 182864)
+++ trunk/Source/cmake/OptionsMac.cmake 2015-04-15 22:45:51 UTC (rev 182865)
</span><span class="lines">@@ -167,9 +167,6 @@
</span><span class="cx">
</span><span class="cx"> WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_TEMPLATE_ELEMENT ON)
</span><span class="cx"> WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_TEXT_AUTOSIZING OFF)
</span><del>-WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_TOUCH_EVENTS ON)
-WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_TOUCH_EVENTS_iphoneos ON)
-WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_TOUCH_EVENTS_iphonesimulator ON)
</del><span class="cx"> WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_TOUCH_ICON_LOADING OFF)
</span><span class="cx"> WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_USERSELECT_ALL ON)
</span><span class="cx"> WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_USER_MESSAGE_HANDLERS ON)
</span><span class="lines">@@ -194,6 +191,10 @@
</span><span class="cx">
</span><span class="cx"> # FIXME: These are turned off temporarily to get CMake working easier.
</span><span class="cx"> # https://bugs.webkit.org/show_bug.cgi?id=135856
</span><ins>+WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_TOUCH_EVENTS OFF)
+WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_TOUCH_EVENTS_iphoneos OFF)
+WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_TOUCH_EVENTS_iphonesimulator OFF)
+
</ins><span class="cx"> WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_DEVICE_ORIENTATION OFF)
</span><span class="cx"> WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_FTL_JIT OFF)
</span><span class="cx"> WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_FTL_JIT_macosx OFF)
</span></span></pre></div>
<a id="trunkSourcecmakeWebKitFScmake"></a>
<div class="modfile"><h4>Modified: trunk/Source/cmake/WebKitFS.cmake (182864 => 182865)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/cmake/WebKitFS.cmake 2015-04-15 22:35:42 UTC (rev 182864)
+++ trunk/Source/cmake/WebKitFS.cmake 2015-04-15 22:45:51 UTC (rev 182865)
</span><span class="lines">@@ -10,3 +10,7 @@
</span><span class="cx"> if (ENABLE_WEBKIT2)
</span><span class="cx"> file(MAKE_DIRECTORY ${DERIVED_SOURCES_WEBKIT2_DIR})
</span><span class="cx"> endif ()
</span><ins>+
+if (ENABLE_WEBKIT)
+ file(MAKE_DIRECTORY ${DERIVED_SOURCES_WEBKITLEGACY_DIR})
+endif ()
</ins></span></pre>
</div>
</div>
</body>
</html>