<!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>[181808] trunk/Source</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/181808">181808</a></dd>
<dt>Author</dt> <dd>achristensen@apple.com</dd>
<dt>Date</dt> <dd>2015-03-20 11:18:41 -0700 (Fri, 20 Mar 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>Progress towards CMake on Mac.
https://bugs.webkit.org/show_bug.cgi?id=136003
Reviewed by Chris Dumez.
Source/WebCore:
* PlatformMac.cmake:
Added some directories to create forwarding headers from.
Generate ObjC bindings.
Source/WebKit:
* CMakeLists.txt:
* PlatformMac.cmake: Added.
Source/WebKit2:
* PlatformMac.cmake:
Add include directories and forwarding headers.
* Shared/API/APIObject.h:
(API::ObjectImpl::operator new):
* UIProcess/DrawingAreaProxy.h:
(WebKit::DrawingAreaProxy::intrinsicContentSizeDidChange):
* UIProcess/mac/TiledCoreAnimationDrawingAreaProxy.h:
Fix some unused parameter warnings.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCorePlatformMaccmake">trunk/Source/WebCore/PlatformMac.cmake</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="#trunkSourceWebKit2ChangeLog">trunk/Source/WebKit2/ChangeLog</a></li>
<li><a href="#trunkSourceWebKit2PlatformMaccmake">trunk/Source/WebKit2/PlatformMac.cmake</a></li>
<li><a href="#trunkSourceWebKit2SharedAPIAPIObjecth">trunk/Source/WebKit2/Shared/API/APIObject.h</a></li>
<li><a href="#trunkSourceWebKit2UIProcessDrawingAreaProxyh">trunk/Source/WebKit2/UIProcess/DrawingAreaProxy.h</a></li>
<li><a href="#trunkSourceWebKit2UIProcessmacTiledCoreAnimationDrawingAreaProxyh">trunk/Source/WebKit2/UIProcess/mac/TiledCoreAnimationDrawingAreaProxy.h</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#trunkSourceWebKitPlatformMaccmake">trunk/Source/WebKit/PlatformMac.cmake</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (181807 => 181808)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2015-03-20 18:10:17 UTC (rev 181807)
+++ trunk/Source/WebCore/ChangeLog 2015-03-20 18:18:41 UTC (rev 181808)
</span><span class="lines">@@ -1,3 +1,14 @@
</span><ins>+2015-03-20 Alex Christensen <achristensen@webkit.org>
+
+ Progress towards CMake on Mac.
+ https://bugs.webkit.org/show_bug.cgi?id=136003
+
+ Reviewed by Chris Dumez.
+
+ * PlatformMac.cmake:
+ Added some directories to create forwarding headers from.
+ Generate ObjC bindings.
+
</ins><span class="cx"> 2015-03-20 Per Arne Vollan <peavo@outlook.com>
</span><span class="cx">
</span><span class="cx"> [WinCairo] Crash when leaving page while video is playing.
</span></span></pre></div>
<a id="trunkSourceWebCorePlatformMaccmake"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/PlatformMac.cmake (181807 => 181808)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/PlatformMac.cmake 2015-03-20 18:10:17 UTC (rev 181807)
+++ trunk/Source/WebCore/PlatformMac.cmake 2015-03-20 18:18:41 UTC (rev 181808)
</span><span class="lines">@@ -130,7 +130,6 @@
</span><span class="cx"> platform/mac/ScrollbarThemeMac.mm
</span><span class="cx"> platform/mac/SerializedPlatformRepresentationMac.mm
</span><span class="cx"> platform/mac/SharedBufferMac.mm
</span><del>- platform/mac/SharedTimerMac.mm
</del><span class="cx"> platform/mac/SoundMac.mm
</span><span class="cx"> platform/mac/SuddenTermination.mm
</span><span class="cx"> platform/mac/SystemSleepListenerMac.mm
</span><span class="lines">@@ -200,60 +199,118 @@
</span><span class="cx"> platform/text/mac/TextCodecMac.cpp
</span><span class="cx"> )
</span><span class="cx">
</span><ins>+# FIXME: We do not need everything from all of these directories.
+# Move some to WebCore_FORWARDING_HEADERS_FILES once people start actually maintaining this.
</ins><span class="cx"> set(WebCore_FORWARDING_HEADERS_DIRECTORIES
</span><ins>+ accessibility
+ bindings/js
+ bindings/objc
+ bindings/generic
+ bridge
+ contentextensions
+ crypto
+ css
+ dom
+ editing
+ editing/cocoa
+ editing/mac
+ history
</ins><span class="cx"> html
</span><del>- bindings/objc
</del><ins>+ html/forms
+ html/parser
+ html/shadow
+ inspector
+ loader
+ loader/appcache
+ loader/archive
+ loader/archive/cf
+ loader/cache
+ Modules/indexeddb
+ Modules/geolocation
+ Modules/notifications
+ Modules/webdatabase
+ page
</ins><span class="cx"> platform
</span><ins>+ plugins
+ rendering
+ storage
+ style
+ svg
+
+ page/animation
+ page/mac
+ page/scrolling
+
+ platform/animation
+ platform/graphics
</ins><span class="cx"> platform/mac
</span><ins>+ platform/mock
+ platform/network
+ platform/sql
+ platform/text
+
+ platform/graphics/ca
+ platform/graphics/filters
+ platform/graphics/mac
+ platform/graphics/transforms
+
</ins><span class="cx"> platform/network/cf
</span><ins>+ platform/network/cocoa
+ platform/network/mac
+
+ platform/spi/cf
+ platform/spi/cg
+ platform/spi/cocoa
+ platform/spi/mac
+
+ rendering/line
+ rendering/style
+
+ svg/graphics
+ svg/properties
</ins><span class="cx"> )
</span><span class="cx">
</span><span class="cx"> set(WebCore_FORWARDING_HEADERS_FILES
</span><del>- bindings/js/SerializedScriptValue.h
- bindings/objc/WebKitAvailability.h
-
</del><span class="cx"> bridge/IdentifierRep.h
</span><ins>+ bridge/npruntime_impl.h
</ins><span class="cx"> bridge/npruntime_internal.h
</span><span class="cx">
</span><span class="cx"> contentextensions/CompiledContentExtension.h
</span><span class="cx">
</span><ins>+ editing/EditAction.h
+ editing/EditingBehaviorTypes.h
+ editing/EditingBoundary.h
</ins><span class="cx"> editing/FindOptions.h
</span><ins>+ editing/FrameSelection.h
+ editing/TextAffinity.h
</ins><span class="cx">
</span><ins>+ editing/mac/TextAlternativeWithRange.h
+
+ history/BackForwardList.h
+ history/HistoryItem.h
+ history/PageCache.h
+
</ins><span class="cx"> html/HTMLMediaElement.h
</span><span class="cx">
</span><del>- loader/FrameLoaderTypes.h
- loader/LoaderStrategy.h
- loader/ResourceLoaderOptions.h
</del><ins>+ loader/appcache/ApplicationCacheStorage.h
</ins><span class="cx">
</span><del>- Modules/indexeddb/IDBKeyData.h
- Modules/indexeddb/IDBKeyPath.h
</del><ins>+ loader/icon/IconDatabase.h
+ loader/icon/IconDatabaseBase.h
+ loader/icon/IconDatabaseClient.h
+
+ loader/mac/LoaderNSURLExtras.h
+
</ins><span class="cx"> Modules/webdatabase/DatabaseDetails.h
</span><span class="cx">
</span><del>- page/ContextMenuContext.h
- page/SecurityOrigin.h
- page/SessionID.h
- page/TextIndicator.h
- page/UserScript.h
- page/UserStyleSheet.h
-
</del><ins>+ platform/DisplaySleepDisabler.h
</ins><span class="cx"> platform/PlatformExportMacros.h
</span><del>- platform/DisplaySleepDisabler.h
</del><span class="cx">
</span><span class="cx"> platform/audio/AudioHardwareListener.h
</span><span class="cx">
</span><ins>+ platform/cf/RunLoopObserver.h
+
</ins><span class="cx"> platform/cocoa/MachSendRight.h
</span><span class="cx">
</span><del>- platform/graphics/Color.h
- platform/graphics/FloatPoint.h
- platform/graphics/FloatRect.h
- platform/graphics/FloatSize.h
- platform/graphics/GraphicsContext.h
- platform/graphics/GraphicsLayer.h
- platform/graphics/IntPoint.h
- platform/graphics/IntRect.h
- platform/graphics/IntSize.h
- platform/graphics/NativeImagePtr.h
-
</del><span class="cx"> platform/graphics/cocoa/IOSurface.h
</span><span class="cx">
</span><span class="cx"> platform/graphics/transforms/AffineTransform.h
</span><span class="lines">@@ -261,36 +318,36 @@
</span><span class="cx"> platform/mac/SoftLinking.h
</span><span class="cx"> platform/mac/WebCoreSystemInterface.h
</span><span class="cx">
</span><del>- platform/network/BlobDataFileReference.h
- platform/network/BlobRegistryImpl.h
- platform/network/HTTPHeaderMap.h
- platform/network/NetworkStorageSession.h
- platform/network/ResourceHandle.h
</del><ins>+ platform/network/mac/AuthenticationMac.h
</ins><span class="cx">
</span><span class="cx"> platform/network/cf/CertificateInfo.h
</span><span class="cx"> platform/network/cf/ResourceResponse.h
</span><span class="cx">
</span><del>- platform/spi/cg/CoreGraphicsSPI.h
</del><ins>+ platform/sql/SQLiteDatabase.h
</ins><span class="cx">
</span><del>- plugins/PluginData.h
- plugins/npruntime.h
</del><ins>+ rendering/style/RenderStyleConstants.h
</ins><span class="cx"> )
</span><span class="cx">
</span><ins>+set(OBJC_BINDINGS_IDL_FILES
+ dom/EventListener.idl
+ ${WebCore_NON_SVG_IDL_FILES}
+)
+
</ins><span class="cx"> WEBKIT_CREATE_FORWARDING_HEADERS(WebCore DIRECTORIES ${WebCore_FORWARDING_HEADERS_DIRECTORIES} FILES ${WebCore_FORWARDING_HEADERS_FILES})
</span><span class="cx">
</span><del>-# FIXME: Get Objective C bindings working.
-#set(FEATURE_DEFINES_OBJECTIVE_C "LANGUAGE_OBJECTIVE_C=1 ${FEATURE_DEFINES_WITH_SPACE_SEPARATOR}")
-#set(ADDITIONAL_BINDINGS_DEPENDENCIES
-# ${WINDOW_CONSTRUCTORS_FILE}
-# ${WORKERGLOBALSCOPE_CONSTRUCTORS_FILE}
-# ${DEDICATEDWORKERGLOBALSCOPE_CONSTRUCTORS_FILE}
-#)
-#GENERATE_BINDINGS(WebCore_SOURCES
-# "${WebCore_NON_SVG_IDL_FILES}"
-# "${WEBCORE_DIR}"
-# "${IDL_INCLUDES}"
-# "${FEATURE_DEFINES_OBJECTIVE_C}"
-# ${DERIVED_SOURCES_WEBCORE_DIR} DOM ObjC mm
-# ${IDL_ATTRIBUTES_FILE}
-# ${SUPPLEMENTAL_DEPENDENCY_FILE}
-# ${ADDITIONAL_BINDINGS_DEPENDENCIES})
</del><ins>+set(FEATURE_DEFINES_OBJECTIVE_C "LANGUAGE_OBJECTIVE_C=1 ${FEATURE_DEFINES_WITH_SPACE_SEPARATOR}")
+set(ADDITIONAL_BINDINGS_DEPENDENCIES
+ ${WINDOW_CONSTRUCTORS_FILE}
+ ${WORKERGLOBALSCOPE_CONSTRUCTORS_FILE}
+ ${DEDICATEDWORKERGLOBALSCOPE_CONSTRUCTORS_FILE}
+)
+GENERATE_BINDINGS(OBJC_BINDINGS
+ "${OBJC_BINDINGS_IDL_FILES}"
+ "${WEBCORE_DIR}"
+ "${IDL_INCLUDES}"
+ "${FEATURE_DEFINES_OBJECTIVE_C}"
+ ${DERIVED_SOURCES_WEBCORE_DIR} DOM ObjC mm
+ ${IDL_ATTRIBUTES_FILE}
+ ${SUPPLEMENTAL_DEPENDENCY_FILE}
+ ${ADDITIONAL_BINDINGS_DEPENDENCIES})
+# FIXME: Add the needed ObjC bindings to WebCore_SOURCES.
</ins></span></pre></div>
<a id="trunkSourceWebKitCMakeListstxt"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/CMakeLists.txt (181807 => 181808)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/CMakeLists.txt 2015-03-20 18:10:17 UTC (rev 181807)
+++ trunk/Source/WebKit/CMakeLists.txt 2015-03-20 18:18:41 UTC (rev 181808)
</span><span class="lines">@@ -1,9 +1,16 @@
</span><del>-# FIXME: Put Windows and Mac build files here.
-
</del><span class="cx"> set(WebKit_SOURCES
</span><span class="cx"> )
</span><span class="cx">
</span><span class="cx"> set(WebKit_INCLUDE_DIRECTORIES
</span><ins>+ "${DERIVED_SOURCES_DIR}"
+ "${DERIVED_SOURCES_DIR}/ForwardingHeaders"
+ "${DERIVED_SOURCES_DIR}/ForwardingHeaders/JavaScriptCore"
+ "${DERIVED_SOURCES_DIR}/ForwardingHeaders/WebCore"
+ "${DERIVED_SOURCES_DIR}/ForwardingHeaders/WebKitLegacy"
+ "${JAVASCRIPTCORE_DIR}"
+ "${JAVASCRIPTCORE_DIR}/disassembler"
+ "${CMAKE_SOURCE_DIR}/Source"
+ "${WTF_DIR}"
</ins><span class="cx"> )
</span><span class="cx">
</span><span class="cx"> set(WebKit_LIBRARIES
</span></span></pre></div>
<a id="trunkSourceWebKitChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/ChangeLog (181807 => 181808)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/ChangeLog 2015-03-20 18:10:17 UTC (rev 181807)
+++ trunk/Source/WebKit/ChangeLog 2015-03-20 18:18:41 UTC (rev 181808)
</span><span class="lines">@@ -1,3 +1,13 @@
</span><ins>+2015-03-20 Alex Christensen <achristensen@webkit.org>
+
+ Progress towards CMake on Mac.
+ https://bugs.webkit.org/show_bug.cgi?id=136003
+
+ Reviewed by Chris Dumez.
+
+ * CMakeLists.txt:
+ * PlatformMac.cmake: Added.
+
</ins><span class="cx"> 2015-03-13 Alex Christensen <achristensen@webkit.org>
</span><span class="cx">
</span><span class="cx"> Progress towards CMake on Mac.
</span></span></pre></div>
<a id="trunkSourceWebKitPlatformMaccmake"></a>
<div class="addfile"><h4>Added: trunk/Source/WebKit/PlatformMac.cmake (0 => 181808)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/PlatformMac.cmake (rev 0)
+++ trunk/Source/WebKit/PlatformMac.cmake 2015-03-20 18:18:41 UTC (rev 181808)
</span><span class="lines">@@ -0,0 +1,290 @@
</span><ins>+list(APPEND WebKit_INCLUDE_DIRECTORIES
+ "${JAVASCRIPTCORE_DIR}/dfg"
+ "${WEBCORE_DIR}/accessibility/mac"
+ "${WEBCORE_DIR}/bindings/objc"
+ "${WEBCORE_DIR}/bridge"
+ "${WEBCORE_DIR}/bridge/jsc"
+ "${WEBCORE_DIR}/bridge/objc"
+ "${WEBCORE_DIR}/loader/archive/cf"
+ "${WEBCORE_DIR}/loader/cf"
+ "${WEBCORE_DIR}/loader/mac"
+ "${WEBCORE_DIR}/page/cocoa"
+ "${WEBCORE_DIR}/page/mac"
+ "${WEBCORE_DIR}/platform/cf"
+ "${WEBCORE_DIR}/platform/cocoa"
+ "${WEBCORE_DIR}/platform/graphics/avfoundation"
+ "${WEBCORE_DIR}/platform/graphics/avfoundation/cf"
+ "${WEBCORE_DIR}/platform/graphics/avfoundation/objc"
+ "${WEBCORE_DIR}/platform/graphics/ca"
+ "${WEBCORE_DIR}/platform/graphics/ca/mac"
+ "${WEBCORE_DIR}/platform/graphics/cocoa"
+ "${WEBCORE_DIR}/platform/graphics/cg"
+ "${WEBCORE_DIR}/platform/graphics/opentype"
+ "${WEBCORE_DIR}/platform/graphics/mac"
+ "${WEBCORE_DIR}/platform/mac"
+ "${WEBCORE_DIR}/platform/network/cocoa"
+ "${WEBCORE_DIR}/platform/network/cf"
+ "${WEBCORE_DIR}/platform/network/mac"
+ "${WEBCORE_DIR}/platform/text/cf"
+ "${WEBCORE_DIR}/platform/text/mac"
+ "${WEBCORE_DIR}/plugins/mac"
+
+ mac
+ mac/Carbon
+ mac/DefaultDelegates
+ mac/DOM
+ mac/History
+ mac/icu/unicode
+ mac/Misc
+ mac/Panels
+ mac/Plugins
+ mac/Plugins/Hosted
+ mac/Storage
+ mac/WebCoreSupport
+ mac/WebInspector
+ mac/WebView
+ Storage
+)
+
+list(APPEND WebKit_SOURCES
+ mac/Carbon/CarbonUtils.m
+ mac/Carbon/CarbonWindowAdapter.mm
+ mac/Carbon/CarbonWindowContentView.m
+ mac/Carbon/CarbonWindowFrame.m
+ mac/Carbon/HIViewAdapter.m
+ mac/Carbon/HIWebView.mm
+
+ mac/History/BinaryPropertyList.cpp
+ mac/History/HistoryPropertyList.mm
+ mac/History/WebBackForwardList.mm
+ mac/History/WebHistory.mm
+ mac/History/WebHistoryItem.mm
+ mac/History/WebURLsWithTitles.m
+
+ mac/Misc/OldWebAssertions.c
+ mac/Misc/WebCache.mm
+ mac/Misc/WebCoreStatistics.mm
+ mac/Misc/WebDownload.mm
+ mac/Misc/WebElementDictionary.mm
+ mac/Misc/WebIconDatabase.mm
+ mac/Misc/WebKitErrors.m
+ mac/Misc/WebKitLogging.m
+ mac/Misc/WebKitNSStringExtras.mm
+ mac/Misc/WebKitStatistics.m
+ mac/Misc/WebKitSystemBits.m
+ mac/Misc/WebKitVersionChecks.m
+ mac/Misc/WebLocalizableStrings.mm
+ mac/Misc/WebLocalizableStringsInternal.mm
+ mac/Misc/WebNSArrayExtras.m
+ mac/Misc/WebNSControlExtras.m
+ mac/Misc/WebNSDataExtras.m
+ mac/Misc/WebNSDictionaryExtras.m
+ mac/Misc/WebNSEventExtras.m
+ mac/Misc/WebNSFileManagerExtras.mm
+ mac/Misc/WebNSImageExtras.m
+ mac/Misc/WebNSObjectExtras.mm
+ mac/Misc/WebNSPasteboardExtras.mm
+ mac/Misc/WebNSPrintOperationExtras.m
+ mac/Misc/WebNSURLExtras.mm
+ mac/Misc/WebNSURLRequestExtras.m
+ mac/Misc/WebNSUserDefaultsExtras.mm
+ mac/Misc/WebNSViewExtras.m
+ mac/Misc/WebNSWindowExtras.m
+ mac/Misc/WebSharingServicePickerController.mm
+ mac/Misc/WebStringTruncator.mm
+ mac/Misc/WebUserContentURLPattern.mm
+
+ mac/Panels/WebAuthenticationPanel.m
+ mac/Panels/WebPanelAuthenticationHandler.m
+
+ mac/Plugins/WebBaseNetscapePluginView.mm
+ mac/Plugins/WebBasePluginPackage.mm
+ mac/Plugins/WebNetscapeContainerCheckContextInfo.mm
+ mac/Plugins/WebNetscapeContainerCheckPrivate.mm
+ mac/Plugins/WebNetscapePluginEventHandler.mm
+ mac/Plugins/WebNetscapePluginEventHandlerCarbon.mm
+ mac/Plugins/WebNetscapePluginEventHandlerCocoa.mm
+ mac/Plugins/WebNetscapePluginPackage.mm
+ mac/Plugins/WebNetscapePluginStream.mm
+ mac/Plugins/WebNetscapePluginView.mm
+ mac/Plugins/WebPluginContainerCheck.mm
+ mac/Plugins/WebPluginController.mm
+ mac/Plugins/WebPluginDatabase.mm
+ mac/Plugins/WebPluginPackage.mm
+ mac/Plugins/WebPluginRequest.m
+ mac/Plugins/WebPluginsPrivate.m
+ mac/Plugins/npapi.mm
+
+ mac/Plugins/Hosted/HostedNetscapePluginStream.mm
+ mac/Plugins/Hosted/NetscapePluginHostManager.mm
+ mac/Plugins/Hosted/NetscapePluginHostProxy.mm
+ mac/Plugins/Hosted/NetscapePluginInstanceProxy.mm
+ mac/Plugins/Hosted/ProxyInstance.mm
+ mac/Plugins/Hosted/ProxyRuntimeObject.mm
+ mac/Plugins/Hosted/WebHostedNetscapePluginView.mm
+ 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/WebTextInputWindowController.m
+
+ mac/Storage/WebDatabaseManager.mm
+ mac/Storage/WebDatabaseManagerClient.mm
+ mac/Storage/WebDatabaseQuotaManager.mm
+ mac/Storage/WebStorageManager.mm
+ mac/Storage/WebStorageTrackerClient.mm
+
+ mac/WebCoreSupport/CorrectionPanel.mm
+ mac/WebCoreSupport/PopupMenuMac.mm
+ mac/WebCoreSupport/SearchPopupMenuMac.mm
+ mac/WebCoreSupport/WebAlternativeTextClient.mm
+ mac/WebCoreSupport/WebApplicationCache.mm
+ mac/WebCoreSupport/WebApplicationCacheQuotaManager.mm
+ mac/WebCoreSupport/WebChromeClient.mm
+ mac/WebCoreSupport/WebContextMenuClient.mm
+ mac/WebCoreSupport/WebDeviceOrientationClient.mm
+ mac/WebCoreSupport/WebDragClient.mm
+ mac/WebCoreSupport/WebEditorClient.mm
+ mac/WebCoreSupport/WebFrameLoaderClient.mm
+ mac/WebCoreSupport/WebFrameNetworkingContext.mm
+ mac/WebCoreSupport/WebGeolocationClient.mm
+ mac/WebCoreSupport/WebIconDatabaseClient.mm
+ mac/WebCoreSupport/WebInspectorClient.mm
+ mac/WebCoreSupport/WebJavaScriptTextInputPanel.m
+ mac/WebCoreSupport/WebKeyGenerator.mm
+ mac/WebCoreSupport/WebKitFullScreenListener.mm
+ mac/WebCoreSupport/WebNotificationClient.mm
+ mac/WebCoreSupport/WebOpenPanelResultListener.mm
+ mac/WebCoreSupport/WebPlatformStrategies.mm
+ mac/WebCoreSupport/WebProgressTrackerClient.mm
+ mac/WebCoreSupport/WebSecurityOrigin.mm
+ mac/WebCoreSupport/WebSystemInterface.mm
+ mac/WebCoreSupport/WebUserMediaClient.mm
+ mac/WebCoreSupport/WebViewGroup.mm
+
+ mac/WebInspector/WebInspector.mm
+ mac/WebInspector/WebInspectorFrontend.mm
+ mac/WebInspector/WebNodeHighlight.mm
+ mac/WebInspector/WebNodeHighlightView.mm
+ mac/WebInspector/WebNodeHighlighter.mm
+
+ mac/WebView/WebArchive.mm
+ mac/WebView/WebClipView.mm
+ mac/WebView/WebDashboardRegion.mm
+ mac/WebView/WebDataSource.mm
+ mac/WebView/WebDelegateImplementationCaching.mm
+ mac/WebView/WebDeviceOrientation.mm
+ mac/WebView/WebDeviceOrientationProviderMock.mm
+ mac/WebView/WebDocumentLoaderMac.mm
+ mac/WebView/WebDynamicScrollBarsView.mm
+ mac/WebView/WebFormDelegate.m
+ mac/WebView/WebFrame.mm
+ mac/WebView/WebFrameView.mm
+ mac/WebView/WebFullScreenController.mm
+ mac/WebView/WebGeolocationPosition.mm
+ mac/WebView/WebHTMLRepresentation.mm
+ mac/WebView/WebHTMLView.mm
+ mac/WebView/WebIndicateLayer.mm
+ mac/WebView/WebJSPDFDoc.mm
+ mac/WebView/WebNavigationData.mm
+ mac/WebView/WebNotification.mm
+ mac/WebView/WebPDFDocumentExtras.mm
+ mac/WebView/WebPDFRepresentation.mm
+ mac/WebView/WebPDFView.mm
+ mac/WebView/WebPolicyDelegate.mm
+ mac/WebView/WebPreferences.mm
+ mac/WebView/WebResource.mm
+ mac/WebView/WebScriptDebugDelegate.mm
+ mac/WebView/WebScriptDebugger.mm
+ mac/WebView/WebScriptWorld.mm
+ mac/WebView/WebTextCompletionController.mm
+ mac/WebView/WebTextIterator.mm
+ mac/WebView/WebView.mm
+ mac/WebView/WebViewData.mm
+)
+
+set(WebKit_LIBRARY_TYPE SHARED)
+
+set(WebKitLegacy_FORWARDING_HEADERS_DIRECTORIES
+ mac/DOM
+ mac/History
+ mac/Misc
+ mac/Panels
+ mac/Plugins
+ mac/WebCoreSupport
+ mac/WebInspector
+ mac/WebView
+ ${DERIVED_SOURCES_WEBCORE_DIR}
+ ${WEBCORE_DIR}/bindings/objc
+ ${WEBCORE_DIR}/plugins
+)
+
+set(WebKitLegacy_FORWARDING_HEADERS_FILES
+ mac/DOM/WebDOMOperations.h
+
+ mac/History/WebHistory.h
+ mac/History/WebHistoryItem.h
+
+ mac/Misc/WebNSURLExtras.h
+
+ mac/Panels/WebPanelAuthenticationHandler.h
+
+ mac/Plugins/WebBasePluginPackage.h
+
+ mac/WebCoreSupport/WebKeyGenerator.h
+
+ mac/WebInspector/WebInspector.h
+
+ mac/WebView/WebFrame.h
+ mac/WebView/WebView.h
+
+ ${DERIVED_SOURCES_WEBCORE_DIR}/DOMRange.h
+
+ ${WEBCORE_DIR}/bindings/objc/DOMCore.h
+ ${WEBCORE_DIR}/bindings/objc/DOMExtensions.h
+
+ ${WEBCORE_DIR}/plugins/npfunctions.h
+)
+
+add_definitions("-include WebKitPrefix.h")
+
+set_source_files_properties(
+ ${WEBKIT_DIR}/mac/Carbon/CarbonUtils.m
+ ${WEBKIT_DIR}/mac/Carbon/CarbonWindowContentView.m
+ ${WEBKIT_DIR}/mac/Carbon/CarbonWindowFrame.m
+ ${WEBKIT_DIR}/mac/Carbon/HIViewAdapter.m
+ mac/History/WebURLsWithTitles.m
+
+ mac/Misc/OldWebAssertions.c
+
+ mac/Misc/WebKitErrors.m
+ mac/Misc/WebKitLogging.m
+ mac/Misc/WebKitStatistics.m
+ mac/Misc/WebKitSystemBits.m
+ mac/Misc/WebKitVersionChecks.m
+ mac/Misc/WebNSArrayExtras.m
+ mac/Misc/WebNSControlExtras.m
+ mac/Misc/WebNSDataExtras.m
+ mac/Misc/WebNSDictionaryExtras.m
+ mac/Misc/WebNSEventExtras.m
+ mac/Misc/WebNSImageExtras.m
+ mac/Misc/WebNSPrintOperationExtras.m
+ mac/Misc/WebNSURLRequestExtras.m
+ mac/Misc/WebNSViewExtras.m
+ mac/Misc/WebNSWindowExtras.m
+
+ mac/Panels/WebAuthenticationPanel.m
+ mac/Panels/WebPanelAuthenticationHandler.m
+
+ mac/Plugins/WebPluginRequest.m
+ mac/Plugins/WebPluginsPrivate.m
+
+ mac/Plugins/Hosted/WebTextInputWindowController.m
+
+ mac/WebCoreSupport/WebJavaScriptTextInputPanel.m
+
+ mac/WebView/WebFormDelegate.m
+PROPERTIES COMPILE_FLAGS -std=c99)
+
+WEBKIT_CREATE_FORWARDING_HEADERS(WebKitLegacy DIRECTORIES ${WebKitLegacy_FORWARDING_HEADERS_DIRECTORIES} FILES ${WebKitLegacy_FORWARDING_HEADERS_FILES})
</ins></span></pre></div>
<a id="trunkSourceWebKit2ChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/ChangeLog (181807 => 181808)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/ChangeLog 2015-03-20 18:10:17 UTC (rev 181807)
+++ trunk/Source/WebKit2/ChangeLog 2015-03-20 18:18:41 UTC (rev 181808)
</span><span class="lines">@@ -1,3 +1,19 @@
</span><ins>+2015-03-20 Alex Christensen <achristensen@webkit.org>
+
+ Progress towards CMake on Mac.
+ https://bugs.webkit.org/show_bug.cgi?id=136003
+
+ Reviewed by Chris Dumez.
+
+ * PlatformMac.cmake:
+ Add include directories and forwarding headers.
+ * Shared/API/APIObject.h:
+ (API::ObjectImpl::operator new):
+ * UIProcess/DrawingAreaProxy.h:
+ (WebKit::DrawingAreaProxy::intrinsicContentSizeDidChange):
+ * UIProcess/mac/TiledCoreAnimationDrawingAreaProxy.h:
+ Fix some unused parameter warnings.
+
</ins><span class="cx"> 2015-03-20 Gyuyoung Kim <gyuyoung.kim@samsung.com>
</span><span class="cx">
</span><span class="cx"> [CMake] Remove duplicated cmake function calls in WebKit2/CMakeLists.txt
</span></span></pre></div>
<a id="trunkSourceWebKit2PlatformMaccmake"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/PlatformMac.cmake (181807 => 181808)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/PlatformMac.cmake 2015-03-20 18:10:17 UTC (rev 181807)
+++ trunk/Source/WebKit2/PlatformMac.cmake 2015-03-20 18:18:41 UTC (rev 181808)
</span><span class="lines">@@ -7,13 +7,21 @@
</span><span class="cx"> "${WEBCORE_DIR}/platform/network/cf"
</span><span class="cx"> "${WEBCORE_DIR}/platform/graphics/opentype"
</span><span class="cx"> "${WEBKIT2_DIR}/UIProcess/mac"
</span><ins>+ "${WEBKIT2_DIR}/UIProcess/API/C/mac"
+ "${WEBKIT2_DIR}/UIProcess/Cocoa"
+ "${WEBKIT2_DIR}/UIProcess/Scrolling"
</ins><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><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><ins>+ "${WEBKIT2_DIR}/WebProcess/Plugins/PDF"
+ "${WEBKIT2_DIR}/WebProcess/Scrolling"
+ "${WEBKIT2_DIR}/WebProcess/WebPage/mac"
+ "${WEBKIT2_DIR}/WebProcess/WebCoreSupport/mac"
</ins><span class="cx"> "${DERIVED_SOURCES_DIR}/ForwardingHeaders"
</span><ins>+ "${DERIVED_SOURCES_DIR}/ForwardingHeaders/WebCore"
</ins><span class="cx"> )
</span><span class="cx">
</span><span class="cx"> set(WEBKIT2_EXTRA_DEPENDENCIES
</span><span class="lines">@@ -22,3 +30,21 @@
</span><span class="cx"> set(WebProcess_SOURCES
</span><span class="cx"> WebProcess/mac/SecItemShimLibrary.mm
</span><span class="cx"> )
</span><ins>+
+add_definitions("-include WebKit2Prefix.h")
+
+set(WebKit2_FORWARDING_HEADERS_FILES
+ Shared/API/c/WKDiagnosticLoggingResultType.h
+
+ UIProcess/API/C/WKPageDiagnosticLoggingClient.h
+ UIProcess/API/C/WKPageNavigationClient.h
+ UIProcess/API/C/WKPageRenderingProgressEvents.h
+)
+
+set(WebKit2_FORWARDING_HEADERS_DIRECTORIES
+ UIProcess/API/C
+ Shared/API/c
+ UIProcess/Cocoa
+)
+
+WEBKIT_CREATE_FORWARDING_HEADERS(WebKit FILES ${WebKit2_FORWARDING_HEADERS_FILES} DIRECTORIES ${WebKit2_FORWARDING_HEADERS_DIRECTORIES})
</ins></span></pre></div>
<a id="trunkSourceWebKit2SharedAPIAPIObjecth"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/Shared/API/APIObject.h (181807 => 181808)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/Shared/API/APIObject.h 2015-03-20 18:10:17 UTC (rev 181807)
+++ trunk/Source/WebKit2/Shared/API/APIObject.h 2015-03-20 18:18:41 UTC (rev 181808)
</span><span class="lines">@@ -245,7 +245,7 @@
</span><span class="cx">
</span><span class="cx"> #if DELEGATE_REF_COUNTING_TO_COCOA
</span><span class="cx"> void* operator new(size_t size) { return newObject(size, APIType); }
</span><del>- void* operator new(size_t size, void* value) { return value; }
</del><ins>+ void* operator new(size_t, void* value) { return value; }
</ins><span class="cx"> #endif
</span><span class="cx"> };
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessDrawingAreaProxyh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/DrawingAreaProxy.h (181807 => 181808)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/DrawingAreaProxy.h 2015-03-20 18:10:17 UTC (rev 181807)
+++ trunk/Source/WebKit2/UIProcess/DrawingAreaProxy.h 2015-03-20 18:18:41 UTC (rev 181808)
</span><span class="lines">@@ -116,7 +116,7 @@
</span><span class="cx"> virtual void updateAcceleratedCompositingMode(uint64_t /* backingStoreStateID */, const LayerTreeContext&) { }
</span><span class="cx"> #if PLATFORM(COCOA)
</span><span class="cx"> virtual void didUpdateGeometry() { }
</span><del>- virtual void intrinsicContentSizeDidChange(const WebCore::IntSize& newIntrinsicContentSize) { }
</del><ins>+ virtual void intrinsicContentSizeDidChange(const WebCore::IntSize&) { }
</ins><span class="cx">
</span><span class="cx"> #if PLATFORM(MAC)
</span><span class="cx"> RunLoop::Timer<DrawingAreaProxy> m_exposedRectChangedTimer;
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessmacTiledCoreAnimationDrawingAreaProxyh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/mac/TiledCoreAnimationDrawingAreaProxy.h (181807 => 181808)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/mac/TiledCoreAnimationDrawingAreaProxy.h 2015-03-20 18:10:17 UTC (rev 181807)
+++ trunk/Source/WebKit2/UIProcess/mac/TiledCoreAnimationDrawingAreaProxy.h 2015-03-20 18:18:41 UTC (rev 181808)
</span><span class="lines">@@ -56,7 +56,7 @@
</span><span class="cx">
</span><span class="cx"> // Message handlers.
</span><span class="cx"> virtual void didUpdateGeometry() override;
</span><del>- virtual void intrinsicContentSizeDidChange(const WebCore::IntSize& newIntrinsicContentSize) override;
</del><ins>+ virtual void intrinsicContentSizeDidChange(const WebCore::IntSize&) override;
</ins><span class="cx">
</span><span class="cx"> void sendUpdateGeometry();
</span><span class="cx">
</span></span></pre>
</div>
</div>
</body>
</html>