<!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>[181601] 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/181601">181601</a></dd>
<dt>Author</dt> <dd>achristensen@apple.com</dd>
<dt>Date</dt> <dd>2015-03-16 17:29:55 -0700 (Mon, 16 Mar 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>Progress towards CMake on Mac
https://bugs.webkit.org/show_bug.cgi?id=142747
Reviewed by Chris Dumez.
Source/JavaScriptCore:
* CMakeLists.txt:
Include AugmentableInspectorController.h in CMake build.
Source/WebCore:
* CMakeLists.txt:
* PlatformMac.cmake:
Added more directories, interfaces, and forwarding headers.
Temporarily disabled the generating of ObjC bindings in CMake builds.
* platform/mac/PasteboardMac.mm:
Removed unused include.
Source/WebKit2:
* PlatformMac.cmake:
Started adding Mac-specific directories and headers.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceJavaScriptCoreCMakeListstxt">trunk/Source/JavaScriptCore/CMakeLists.txt</a></li>
<li><a href="#trunkSourceJavaScriptCoreChangeLog">trunk/Source/JavaScriptCore/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="#trunkSourceWebCoreplatformmacPasteboardMacmm">trunk/Source/WebCore/platform/mac/PasteboardMac.mm</a></li>
<li><a href="#trunkSourceWebKit2ChangeLog">trunk/Source/WebKit2/ChangeLog</a></li>
<li><a href="#trunkSourceWebKit2PlatformMaccmake">trunk/Source/WebKit2/PlatformMac.cmake</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceJavaScriptCoreCMakeListstxt"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/CMakeLists.txt (181600 => 181601)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/CMakeLists.txt 2015-03-17 00:12:06 UTC (rev 181600)
+++ trunk/Source/JavaScriptCore/CMakeLists.txt 2015-03-17 00:29:55 UTC (rev 181601)
</span><span class="lines">@@ -15,6 +15,7 @@
</span><span class="cx"> "${JAVASCRIPTCORE_DIR}/debugger"
</span><span class="cx"> "${JAVASCRIPTCORE_DIR}/inspector"
</span><span class="cx"> "${JAVASCRIPTCORE_DIR}/inspector/agents"
</span><ins>+ "${JAVASCRIPTCORE_DIR}/inspector/augmentable"
</ins><span class="cx"> "${JAVASCRIPTCORE_DIR}/inspector/remote"
</span><span class="cx"> "${JAVASCRIPTCORE_DIR}/interpreter"
</span><span class="cx"> "${JAVASCRIPTCORE_DIR}/jit"
</span><span class="lines">@@ -902,6 +903,7 @@
</span><span class="cx"> heap
</span><span class="cx"> inspector
</span><span class="cx"> inspector/agents
</span><ins>+ inspector/augmentable
</ins><span class="cx"> inspector/remote
</span><span class="cx"> interpreter
</span><span class="cx"> jit
</span><span class="lines">@@ -964,6 +966,8 @@
</span><span class="cx"> assembler/MacroAssemblerCodeRef.h
</span><span class="cx"> assembler/MacroAssemblerCodeRef.h
</span><span class="cx">
</span><ins>+ inspector/augmentable/AugmentableInspectorController.h
+
</ins><span class="cx"> inspector/remote/RemoteInspector.h
</span><span class="cx"> inspector/remote/RemoteInspectorConstants.h
</span><span class="cx"> inspector/remote/RemoteInspectorDebuggable.h
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/ChangeLog (181600 => 181601)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/ChangeLog 2015-03-17 00:12:06 UTC (rev 181600)
+++ trunk/Source/JavaScriptCore/ChangeLog 2015-03-17 00:29:55 UTC (rev 181601)
</span><span class="lines">@@ -1,3 +1,13 @@
</span><ins>+2015-03-16 Alex Christensen <achristensen@webkit.org>
+
+ Progress towards CMake on Mac
+ https://bugs.webkit.org/show_bug.cgi?id=142747
+
+ Reviewed by Chris Dumez.
+
+ * CMakeLists.txt:
+ Include AugmentableInspectorController.h in CMake build.
+
</ins><span class="cx"> 2015-03-16 Csaba Osztrogonác <ossy@webkit.org>
</span><span class="cx">
</span><span class="cx"> [ARM] Enable generating idiv instructions if it is supported
</span></span></pre></div>
<a id="trunkSourceWebCoreCMakeListstxt"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/CMakeLists.txt (181600 => 181601)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/CMakeLists.txt 2015-03-17 00:12:06 UTC (rev 181600)
+++ trunk/Source/WebCore/CMakeLists.txt 2015-03-17 00:29:55 UTC (rev 181601)
</span><span class="lines">@@ -80,6 +80,7 @@
</span><span class="cx"> "${WEBCORE_DIR}/platform/image-decoders/webp"
</span><span class="cx"> "${WEBCORE_DIR}/platform/mediastream"
</span><span class="cx"> "${WEBCORE_DIR}/platform/mock"
</span><ins>+ "${WEBCORE_DIR}/platform/mock/mediasource"
</ins><span class="cx"> "${WEBCORE_DIR}/platform/network"
</span><span class="cx"> "${WEBCORE_DIR}/platform/sql"
</span><span class="cx"> "${WEBCORE_DIR}/platform/text"
</span><span class="lines">@@ -575,6 +576,20 @@
</span><span class="cx"> html/canvas/WebGLVertexArrayObject.idl
</span><span class="cx"> html/canvas/WebGLVertexArrayObjectOES.idl
</span><span class="cx">
</span><ins>+ html/track/AudioTrack.idl
+ html/track/AudioTrackList.idl
+ html/track/DataCue.idl
+ html/track/TextTrack.idl
+ html/track/TextTrackCue.idl
+ html/track/TextTrackCueList.idl
+ html/track/TextTrackList.idl
+ html/track/TrackEvent.idl
+ html/track/VTTCue.idl
+ html/track/VTTRegion.idl
+ html/track/VTTRegionList.idl
+ html/track/VideoTrack.idl
+ html/track/VideoTrackList.idl
+
</ins><span class="cx"> inspector/CommandLineAPIHost.idl
</span><span class="cx"> inspector/InspectorFrontendHost.idl
</span><span class="cx"> inspector/ScriptProfile.idl
</span><span class="lines">@@ -3142,6 +3157,7 @@
</span><span class="cx"> testing/Internals.idl
</span><span class="cx"> testing/MallocStatistics.idl
</span><span class="cx"> testing/MemoryInfo.idl
</span><ins>+ testing/MockContentFilterSettings.idl
</ins><span class="cx"> testing/TypeConversions.idl
</span><span class="cx"> )
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (181600 => 181601)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2015-03-17 00:12:06 UTC (rev 181600)
+++ trunk/Source/WebCore/ChangeLog 2015-03-17 00:29:55 UTC (rev 181601)
</span><span class="lines">@@ -1,3 +1,17 @@
</span><ins>+2015-03-16 Alex Christensen <achristensen@webkit.org>
+
+ Progress towards CMake on Mac
+ https://bugs.webkit.org/show_bug.cgi?id=142747
+
+ Reviewed by Chris Dumez.
+
+ * CMakeLists.txt:
+ * PlatformMac.cmake:
+ Added more directories, interfaces, and forwarding headers.
+ Temporarily disabled the generating of ObjC bindings in CMake builds.
+ * platform/mac/PasteboardMac.mm:
+ Removed unused include.
+
</ins><span class="cx"> 2015-03-16 Joanmarie Diggs <jdiggs@igalia.com>
</span><span class="cx">
</span><span class="cx"> AX: Crash viewing http://www.last.fm/
</span></span></pre></div>
<a id="trunkSourceWebCorePlatformMaccmake"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/PlatformMac.cmake (181600 => 181601)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/PlatformMac.cmake 2015-03-17 00:12:06 UTC (rev 181600)
+++ trunk/Source/WebCore/PlatformMac.cmake 2015-03-17 00:29:55 UTC (rev 181601)
</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/mac"
</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">@@ -144,7 +145,6 @@
</span><span class="cx"> platform/mac/WebCoreNSURLExtras.mm
</span><span class="cx"> platform/mac/WebCoreObjCExtras.mm
</span><span class="cx"> platform/mac/WebCoreSystemInterface.mm
</span><del>- platform/mac/WebCoreView.m
</del><span class="cx"> platform/mac/WebNSAttributedStringExtras.mm
</span><span class="cx"> platform/mac/WebVideoFullscreenController.mm
</span><span class="cx"> platform/mac/WebVideoFullscreenHUDWindowController.mm
</span><span class="lines">@@ -209,28 +209,88 @@
</span><span class="cx"> )
</span><span class="cx">
</span><span class="cx"> set(WebCore_FORWARDING_HEADERS_FILES
</span><ins>+ bindings/js/SerializedScriptValue.h
+ bindings/objc/WebKitAvailability.h
+
+ bridge/IdentifierRep.h
+ bridge/npruntime_internal.h
+
+ contentextensions/CompiledContentExtension.h
+
+ editing/FindOptions.h
+
</ins><span class="cx"> html/HTMLMediaElement.h
</span><del>- bindings/objc/WebKitAvailability.h
</del><ins>+
+ loader/FrameLoaderTypes.h
+ loader/LoaderStrategy.h
+ loader/ResourceLoaderOptions.h
+
+ Modules/indexeddb/IDBKeyData.h
+ Modules/indexeddb/IDBKeyPath.h
+ Modules/webdatabase/DatabaseDetails.h
+
+ page/ContextMenuContext.h
+ page/SecurityOrigin.h
+ page/SessionID.h
+ page/TextIndicator.h
+ page/UserScript.h
+ page/UserStyleSheet.h
+
+ platform/PlatformExportMacros.h
</ins><span class="cx"> platform/DisplaySleepDisabler.h
</span><ins>+
+ platform/audio/AudioHardwareListener.h
+
+ platform/cocoa/MachSendRight.h
+
+ 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
+
+ platform/graphics/cocoa/IOSurface.h
+
+ platform/graphics/transforms/AffineTransform.h
+
</ins><span class="cx"> platform/mac/SoftLinking.h
</span><ins>+ platform/mac/WebCoreSystemInterface.h
+
+ platform/network/BlobDataFileReference.h
+ platform/network/BlobRegistryImpl.h
+ platform/network/HTTPHeaderMap.h
+ platform/network/NetworkStorageSession.h
+ platform/network/ResourceHandle.h
+
+ platform/network/cf/CertificateInfo.h
</ins><span class="cx"> platform/network/cf/ResourceResponse.h
</span><ins>+
</ins><span class="cx"> platform/spi/cg/CoreGraphicsSPI.h
</span><ins>+
+ plugins/PluginData.h
+ plugins/npruntime.h
</ins><span class="cx"> )
</span><span class="cx">
</span><span class="cx"> WEBKIT_CREATE_FORWARDING_HEADERS(WebCore DIRECTORIES ${WebCore_FORWARDING_HEADERS_DIRECTORIES} FILES ${WebCore_FORWARDING_HEADERS_FILES})
</span><span class="cx">
</span><del>-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>+# 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})
</ins></span></pre></div>
<a id="trunkSourceWebCoreplatformmacPasteboardMacmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/mac/PasteboardMac.mm (181600 => 181601)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/mac/PasteboardMac.mm 2015-03-17 00:12:06 UTC (rev 181600)
+++ trunk/Source/WebCore/platform/mac/PasteboardMac.mm 2015-03-17 00:29:55 UTC (rev 181601)
</span><span class="lines">@@ -27,7 +27,6 @@
</span><span class="cx"> #import "Pasteboard.h"
</span><span class="cx">
</span><span class="cx"> #import "CachedImage.h"
</span><del>-#import "DOMRangeInternal.h"
</del><span class="cx"> #import "Document.h"
</span><span class="cx"> #import "DocumentFragment.h"
</span><span class="cx"> #import "DocumentLoader.h"
</span></span></pre></div>
<a id="trunkSourceWebKit2ChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/ChangeLog (181600 => 181601)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/ChangeLog 2015-03-17 00:12:06 UTC (rev 181600)
+++ trunk/Source/WebKit2/ChangeLog 2015-03-17 00:29:55 UTC (rev 181601)
</span><span class="lines">@@ -1,3 +1,13 @@
</span><ins>+2015-03-16 Alex Christensen <achristensen@webkit.org>
+
+ Progress towards CMake on Mac
+ https://bugs.webkit.org/show_bug.cgi?id=142747
+
+ Reviewed by Chris Dumez.
+
+ * PlatformMac.cmake:
+ Started adding Mac-specific directories and headers.
+
</ins><span class="cx"> 2015-03-16 Alexey Proskuryakov <ap@apple.com>
</span><span class="cx">
</span><span class="cx"> ASSERT(m_plugin) on plugins/snapshotting/snapshot-plugin-not-quite-blocked-by-image.html
</span></span></pre></div>
<a id="trunkSourceWebKit2PlatformMaccmake"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/PlatformMac.cmake (181600 => 181601)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/PlatformMac.cmake 2015-03-17 00:12:06 UTC (rev 181600)
+++ trunk/Source/WebKit2/PlatformMac.cmake 2015-03-17 00:29:55 UTC (rev 181601)
</span><span class="lines">@@ -1,5 +1,21 @@
</span><span class="cx"> #FIXME: Add Mac-specific sources here.
</span><span class="cx">
</span><ins>+file(MAKE_DIRECTORY ${DERIVED_SOURCES_WEBKIT2_DIR})
+
+list(APPEND WebKit2_INCLUDE_DIRECTORIES
+ "${WEBCORE_DIR}/platform/mac"
+ "${WEBCORE_DIR}/platform/network/cf"
+ "${WEBCORE_DIR}/platform/graphics/opentype"
+ "${WEBKIT2_DIR}/UIProcess/mac"
+ "${WEBKIT2_DIR}/Platform/mac"
+ "${WEBKIT2_DIR}/Platform/IPC/mac"
+ "${WEBKIT2_DIR}/Shared/API/Cocoa"
+ "${WEBKIT2_DIR}/Shared/cf"
+ "${WEBKIT2_DIR}/Shared/mac"
+ "${WEBKIT2_DIR}/Shared/Plugins/mac"
+ "${DERIVED_SOURCES_DIR}/ForwardingHeaders"
+)
+
</ins><span class="cx"> set(WEBKIT2_EXTRA_DEPENDENCIES
</span><span class="cx"> WebKit2-forwarding-headers
</span><span class="cx"> )
</span></span></pre>
</div>
</div>
</body>
</html>