[prev in list] [next in list] [prev in thread] [next in thread] 

List:       webkit-changes
Subject:    [webkit-changes] [239556] trunk
From:       achristensen () apple ! com
Date:       2018-12-27 16:13:47
Message-ID: 20181227161347.BD20610051CD () svn ! webkit ! org
[Download RAW message or body]

[Attachment #2 (text/html)]

<!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>[239556] 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/239556">239556</a></dd> \
<dt>Author</dt> <dd>achristensen@apple.com</dd> <dt>Date</dt> <dd>2018-12-27 08:13:47 \
-0800 (Thu, 27 Dec 2018)</dd> </dl>

<h3>Log Message</h3>
<pre>Resurrect Mac CMake build
https://bugs.webkit.org/show_bug.cgi?id=192658

Reviewed by Yusuke Suzuki.

.:

* Source/cmake/OptionsMac.cmake:

Source/JavaScriptCore:

* PlatformMac.cmake:

Source/WebCore:

This makes it so JSC and most of WebCore builds.
WebCore's use of ARC seems inconsistent, so I'll fix that later.

* PlatformMac.cmake:
* config.h:

Source/WebCore/PAL:

* pal/PlatformMac.cmake:

Source/WebKit:

* PlatformMac.cmake:

Source/WebKitLegacy:

* PlatformMac.cmake:

Source/WTF:

* wtf/PlatformMac.cmake:
* wtf/cf/CFURLExtras.cpp:
* wtf/cf/CFURLExtras.h:
* wtf/cf/URLCF.cpp:
* wtf/cocoa/NSURLExtras.h:
* wtf/cocoa/NSURLExtras.mm:
* wtf/cocoa/URLCocoa.mm:

Tools:

* DumpRenderTree/PlatformMac.cmake:
* MiniBrowser/mac/CMakeLists.txt:
* TestWebKitAPI/PlatformMac.cmake:</pre>

<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkChangeLog">trunk/ChangeLog</a></li>
<li><a href="#trunkSourceJavaScriptCoreChangeLog">trunk/Source/JavaScriptCore/ChangeLog</a></li>
 <li><a href="#trunkSourceJavaScriptCorePlatformMaccmake">trunk/Source/JavaScriptCore/PlatformMac.cmake</a></li>
 <li><a href="#trunkSourceWTFChangeLog">trunk/Source/WTF/ChangeLog</a></li>
<li><a href="#trunkSourceWTFwtfPlatformMaccmake">trunk/Source/WTF/wtf/PlatformMac.cmake</a></li>
 <li><a href="#trunkSourceWTFwtfcfCFURLExtrascpp">trunk/Source/WTF/wtf/cf/CFURLExtras.cpp</a></li>
 <li><a href="#trunkSourceWTFwtfcfCFURLExtrash">trunk/Source/WTF/wtf/cf/CFURLExtras.h</a></li>
 <li><a href="#trunkSourceWTFwtfcfURLCFcpp">trunk/Source/WTF/wtf/cf/URLCF.cpp</a></li>
 <li><a href="#trunkSourceWTFwtfcocoaNSURLExtrash">trunk/Source/WTF/wtf/cocoa/NSURLExtras.h</a></li>
 <li><a href="#trunkSourceWTFwtfcocoaNSURLExtrasmm">trunk/Source/WTF/wtf/cocoa/NSURLExtras.mm</a></li>
 <li><a href="#trunkSourceWTFwtfcocoaURLCocoamm">trunk/Source/WTF/wtf/cocoa/URLCocoa.mm</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="#trunkSourceWebCoreModuleswebgpuWHLSLWHLSLLexercpp">trunk/Source/WebCore/Modules/webgpu/WHLSL/WHLSLLexer.cpp</a></li>
 <li><a href="#trunkSourceWebCorePALChangeLog">trunk/Source/WebCore/PAL/ChangeLog</a></li>
 <li><a href="#trunkSourceWebCorePALpalPlatformMaccmake">trunk/Source/WebCore/PAL/pal/PlatformMac.cmake</a></li>
 <li><a href="#trunkSourceWebCorePlatformMaccmake">trunk/Source/WebCore/PlatformMac.cmake</a></li>
 <li><a href="#trunkSourceWebCoreSourcesCocoatxt">trunk/Source/WebCore/SourcesCocoa.txt</a></li>
 <li><a href="#trunkSourceWebCoreconfigh">trunk/Source/WebCore/config.h</a></li>
<li><a href="#trunkSourceWebCoreplatformmacWebCoreFullScreenPlaceholderViewh">trunk/Source/WebCore/platform/mac/WebCoreFullScreenPlaceholderView.h</a></li>
 <li><a href="#trunkSourceWebCoreplatformmacWebCoreFullScreenPlaceholderViewmm">trunk/Source/WebCore/platform/mac/WebCoreFullScreenPlaceholderView.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="#trunkSourceWebKitLegacyChangeLog">trunk/Source/WebKitLegacy/ChangeLog</a></li>
 <li><a href="#trunkSourceWebKitLegacyPlatformMaccmake">trunk/Source/WebKitLegacy/PlatformMac.cmake</a></li>
 <li><a href="#trunkSourcecmakeOptionsMaccmake">trunk/Source/cmake/OptionsMac.cmake</a></li>
 <li><a href="#trunkToolsChangeLog">trunk/Tools/ChangeLog</a></li>
<li><a href="#trunkToolsDumpRenderTreePlatformMaccmake">trunk/Tools/DumpRenderTree/PlatformMac.cmake</a></li>
 <li><a href="#trunkToolsMiniBrowsermacCMakeListstxt">trunk/Tools/MiniBrowser/mac/CMakeLists.txt</a></li>
 <li><a href="#trunkToolsTestWebKitAPIPlatformMaccmake">trunk/Tools/TestWebKitAPI/PlatformMac.cmake</a></li>
 </ul>

<h3>Removed Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreplatformmediastreammacAVMediaCaptureSourcemm">trunk/Source/WebCore/platform/mediastream/mac/AVMediaCaptureSource.mm</a></li>
 </ul>

</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/ChangeLog (239555 => 239556)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/ChangeLog	2018-12-27 04:01:23 UTC (rev 239555)
+++ trunk/ChangeLog	2018-12-27 16:13:47 UTC (rev 239556)
</span><span class="lines">@@ -1,3 +1,12 @@
</span><ins>+2018-12-27  Alex Christensen  &lt;achristensen@webkit.org&gt;
+
+        Resurrect Mac CMake build
+        https://bugs.webkit.org/show_bug.cgi?id=192658
+
+        Reviewed by Yusuke Suzuki.
+
+        * Source/cmake/OptionsMac.cmake:
+
</ins><span class="cx"> 2018-12-19  Adrian Perez de Castro  &lt;aperez@igalia.com&gt;
</span><span class="cx"> 
</span><span class="cx">         [GTK] Cannot build with CMake &lt;3.7
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/ChangeLog (239555 => \
239556)</h4> <pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/ChangeLog	2018-12-27 04:01:23 UTC \
                (rev 239555)
+++ trunk/Source/JavaScriptCore/ChangeLog	2018-12-27 16:13:47 UTC (rev 239556)
</span><span class="lines">@@ -1,3 +1,12 @@
</span><ins>+2018-12-27  Alex Christensen  &lt;achristensen@webkit.org&gt;
+
+        Resurrect Mac CMake build
+        https://bugs.webkit.org/show_bug.cgi?id=192658
+
+        Reviewed by Yusuke Suzuki.
+
+        * PlatformMac.cmake:
+
</ins><span class="cx"> 2018-12-25  Fujii Hironori  &lt;Hironori.Fujii@sony.com&gt;
</span><span class="cx"> 
</span><span class="cx">         [JSC][Win][Clang] warning: implicit conversion from \
'size_t' (aka 'unsigned long long') to 'int32_t' (aka 'int') changes value from \
18446744073709551552 to -64 [-Wconstant-conversion] </span></span></pre></div>
<a id="trunkSourceJavaScriptCorePlatformMaccmake"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/PlatformMac.cmake \
(239555 => 239556)</h4> <pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/PlatformMac.cmake	2018-12-27 \
                04:01:23 UTC (rev 239555)
+++ trunk/Source/JavaScriptCore/PlatformMac.cmake	2018-12-27 16:13:47 UTC (rev \
239556) </span><span class="lines">@@ -10,6 +10,7 @@
</span><span class="cx"> )
</span><span class="cx"> 
</span><span class="cx"> list(APPEND JavaScriptCore_PRIVATE_INCLUDE_DIRECTORIES
</span><ins>+    ${DERIVED_SOURCES_WTF_DIR}
</ins><span class="cx">     ${JAVASCRIPTCORE_DIR}/disassembler/udis86
</span><span class="cx">     ${JAVASCRIPTCORE_DIR}/inspector/cocoa
</span><span class="cx">     ${JAVASCRIPTCORE_DIR}/inspector/remote/cocoa
</span></span></pre></div>
<a id="trunkSourceWTFChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WTF/ChangeLog (239555 => 239556)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WTF/ChangeLog	2018-12-27 04:01:23 UTC (rev \
                239555)
+++ trunk/Source/WTF/ChangeLog	2018-12-27 16:13:47 UTC (rev 239556)
</span><span class="lines">@@ -1,3 +1,18 @@
</span><ins>+2018-12-27  Alex Christensen  &lt;achristensen@webkit.org&gt;
+
+        Resurrect Mac CMake build
+        https://bugs.webkit.org/show_bug.cgi?id=192658
+
+        Reviewed by Yusuke Suzuki.
+
+        * wtf/PlatformMac.cmake:
+        * wtf/cf/CFURLExtras.cpp:
+        * wtf/cf/CFURLExtras.h:
+        * wtf/cf/URLCF.cpp:
+        * wtf/cocoa/NSURLExtras.h:
+        * wtf/cocoa/NSURLExtras.mm:
+        * wtf/cocoa/URLCocoa.mm:
+
</ins><span class="cx"> 2018-12-21  Dan Bernstein  &lt;mitz@apple.com&gt;
</span><span class="cx"> 
</span><span class="cx">         Fixed building for macOS 10.13 using the macOS 10.14 \
SDK. </span></span></pre></div>
<a id="trunkSourceWTFwtfPlatformMaccmake"></a>
<div class="modfile"><h4>Modified: trunk/Source/WTF/wtf/PlatformMac.cmake (239555 => \
239556)</h4> <pre class="diff"><span>
<span class="info">--- trunk/Source/WTF/wtf/PlatformMac.cmake	2018-12-27 04:01:23 UTC \
                (rev 239555)
+++ trunk/Source/WTF/wtf/PlatformMac.cmake	2018-12-27 16:13:47 UTC (rev 239556)
</span><span class="lines">@@ -8,11 +8,12 @@
</span><span class="cx"> )
</span><span class="cx"> 
</span><span class="cx"> list(APPEND WTF_PUBLIC_HEADERS
</span><ins>+    WeakObjCPtr.h
+
</ins><span class="cx">     cf/CFURLExtras.h
</span><span class="cx">     cf/TypeCastsCF.h
</span><span class="cx"> 
</span><span class="cx">     cocoa/Entitlements.h
</span><del>-    cocoa/MachSendRight.h
</del><span class="cx">     cocoa/NSURLExtras.h
</span><span class="cx">     cocoa/SoftLinking.h
</span><span class="cx"> 
</span><span class="lines">@@ -23,6 +24,7 @@
</span><span class="cx">     spi/cf/CFBundleSPI.h
</span><span class="cx">     spi/cf/CFStringSPI.h
</span><span class="cx"> 
</span><ins>+    spi/cocoa/CFXPCBridgeSPI.h
</ins><span class="cx">     spi/cocoa/SecuritySPI.h
</span><span class="cx">     spi/cocoa/objcSPI.h
</span><span class="cx"> 
</span><span class="lines">@@ -46,7 +48,7 @@
</span><span class="cx"> 
</span><span class="cx">     cocoa/AutodrainedPool.cpp
</span><span class="cx">     cocoa/CPUTimeCocoa.cpp
</span><del>-    cocoa/Entitlements.cpp
</del><ins>+    cocoa/Entitlements.mm
</ins><span class="cx">     cocoa/MachSendRight.cpp
</span><span class="cx">     cocoa/MainThreadCocoa.mm
</span><span class="cx">     cocoa/MemoryFootprintCocoa.cpp
</span><span class="lines">@@ -69,11 +71,11 @@
</span><span class="cx"> )
</span><span class="cx"> 
</span><span class="cx"> list(APPEND WTF_PRIVATE_INCLUDE_DIRECTORIES
</span><del>-    &quot;${WTF_DIR}/icu&quot;
</del><span class="cx">     ${DERIVED_SOURCES_WTF_DIR}
</span><span class="cx"> )
</span><span class="cx"> 
</span><span class="cx"> file(COPY mac/MachExceptions.defs DESTINATION \
${DERIVED_SOURCES_WTF_DIR}) </span><ins>+file(COPY &quot;${WTF_DIR}/icu/unicode&quot; \
DESTINATION ${DERIVED_SOURCES_WTF_DIR}) </ins><span class="cx"> 
</span><span class="cx"> add_custom_command(
</span><span class="cx">     OUTPUT
</span></span></pre></div>
<a id="trunkSourceWTFwtfcfCFURLExtrascpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WTF/wtf/cf/CFURLExtras.cpp (239555 => \
239556)</h4> <pre class="diff"><span>
<span class="info">--- trunk/Source/WTF/wtf/cf/CFURLExtras.cpp	2018-12-27 04:01:23 \
                UTC (rev 239555)
+++ trunk/Source/WTF/wtf/cf/CFURLExtras.cpp	2018-12-27 16:13:47 UTC (rev 239556)
</span><span class="lines">@@ -24,7 +24,7 @@
</span><span class="cx">  */
</span><span class="cx"> 
</span><span class="cx"> #include &quot;config.h&quot;
</span><del>-#include &quot;CFURLExtras.h&quot;
</del><ins>+#include &lt;wtf/cf/CFURLExtras.h&gt;
</ins><span class="cx"> 
</span><span class="cx"> #include &lt;wtf/URL.h&gt;
</span><span class="cx"> #include &lt;wtf/text/CString.h&gt;
</span></span></pre></div>
<a id="trunkSourceWTFwtfcfCFURLExtrash"></a>
<div class="modfile"><h4>Modified: trunk/Source/WTF/wtf/cf/CFURLExtras.h (239555 => \
239556)</h4> <pre class="diff"><span>
<span class="info">--- trunk/Source/WTF/wtf/cf/CFURLExtras.h	2018-12-27 04:01:23 UTC \
                (rev 239555)
+++ trunk/Source/WTF/wtf/cf/CFURLExtras.h	2018-12-27 16:13:47 UTC (rev 239556)
</span><span class="lines">@@ -23,8 +23,7 @@
</span><span class="cx">  * THE POSSIBILITY OF SUCH DAMAGE.
</span><span class="cx">  */
</span><span class="cx"> 
</span><del>-#ifndef CFURLExtras_h
-#define CFURLExtras_h
</del><ins>+#pragma once
</ins><span class="cx"> 
</span><span class="cx"> #include &lt;wtf/Forward.h&gt;
</span><span class="cx"> #include &lt;wtf/RetainPtr.h&gt;
</span><span class="lines">@@ -42,5 +41,3 @@
</span><span class="cx"> bool isCFURLSameOrigin(CFURLRef, const URL&amp;);
</span><span class="cx"> 
</span><span class="cx"> }
</span><del>-
-#endif // CFURLExtras_h
</del></span></pre></div>
<a id="trunkSourceWTFwtfcfURLCFcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WTF/wtf/cf/URLCF.cpp (239555 => \
239556)</h4> <pre class="diff"><span>
<span class="info">--- trunk/Source/WTF/wtf/cf/URLCF.cpp	2018-12-27 04:01:23 UTC (rev \
                239555)
+++ trunk/Source/WTF/wtf/cf/URLCF.cpp	2018-12-27 16:13:47 UTC (rev 239556)
</span><span class="lines">@@ -26,9 +26,9 @@
</span><span class="cx"> #include &quot;config.h&quot;
</span><span class="cx"> #include &lt;wtf/URL.h&gt;
</span><span class="cx"> 
</span><del>-#include &quot;CFURLExtras.h&quot;
-#include &quot;URLParser.h&quot;
</del><span class="cx"> #include &lt;CoreFoundation/CFURL.h&gt;
</span><ins>+#include &lt;wtf/URLParser.h&gt;
+#include &lt;wtf/cf/CFURLExtras.h&gt;
</ins><span class="cx"> #include &lt;wtf/text/CString.h&gt;
</span><span class="cx"> 
</span><span class="cx"> namespace WTF {
</span></span></pre></div>
<a id="trunkSourceWTFwtfcocoaNSURLExtrash"></a>
<div class="modfile"><h4>Modified: trunk/Source/WTF/wtf/cocoa/NSURLExtras.h (239555 \
=> 239556)</h4> <pre class="diff"><span>
<span class="info">--- trunk/Source/WTF/wtf/cocoa/NSURLExtras.h	2018-12-27 04:01:23 \
                UTC (rev 239555)
+++ trunk/Source/WTF/wtf/cocoa/NSURLExtras.h	2018-12-27 16:13:47 UTC (rev 239556)
</span><span class="lines">@@ -26,6 +26,8 @@
</span><span class="cx">  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH \
DAMAGE. </span><span class="cx">  */
</span><span class="cx"> 
</span><ins>+#pragma once
+
</ins><span class="cx"> @class NSString;
</span><span class="cx"> @class NSURL;
</span><span class="cx"> 
</span></span></pre></div>
<a id="trunkSourceWTFwtfcocoaNSURLExtrasmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WTF/wtf/cocoa/NSURLExtras.mm (239555 \
=> 239556)</h4> <pre class="diff"><span>
<span class="info">--- trunk/Source/WTF/wtf/cocoa/NSURLExtras.mm	2018-12-27 04:01:23 \
                UTC (rev 239555)
+++ trunk/Source/WTF/wtf/cocoa/NSURLExtras.mm	2018-12-27 16:13:47 UTC (rev 239556)
</span><span class="lines">@@ -30,16 +30,16 @@
</span><span class="cx"> #import &lt;Foundation/Foundation.h&gt;
</span><span class="cx"> #import &quot;NSURLExtras.h&quot;
</span><span class="cx"> 
</span><del>-#import &quot;CFURLExtras.h&quot;
-#import &quot;URLParser.h&quot;
</del><ins>+#import &lt;unicode/uchar.h&gt;
+#import &lt;unicode/uidna.h&gt;
+#import &lt;unicode/uscript.h&gt;
</ins><span class="cx"> #import &lt;wtf/Function.h&gt;
</span><span class="cx"> #import &lt;wtf/HexNumber.h&gt;
</span><span class="cx"> #import &lt;wtf/ObjCRuntimeExtras.h&gt;
</span><span class="cx"> #import &lt;wtf/RetainPtr.h&gt;
</span><ins>+#import &lt;wtf/URLParser.h&gt;
</ins><span class="cx"> #import &lt;wtf/Vector.h&gt;
</span><del>-#import &lt;unicode/uchar.h&gt;
-#import &lt;unicode/uidna.h&gt;
-#import &lt;unicode/uscript.h&gt;
</del><ins>+#import &lt;wtf/cf/CFURLExtras.h&gt;
</ins><span class="cx"> 
</span><span class="cx"> // Needs to be big enough to hold an IDN-encoded name.
</span><span class="cx"> // For host names bigger than this, we won't do IDN \
encoding, which is almost certainly OK. </span></span></pre></div>
<a id="trunkSourceWTFwtfcocoaURLCocoamm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WTF/wtf/cocoa/URLCocoa.mm (239555 => \
239556)</h4> <pre class="diff"><span>
<span class="info">--- trunk/Source/WTF/wtf/cocoa/URLCocoa.mm	2018-12-27 04:01:23 UTC \
                (rev 239555)
+++ trunk/Source/WTF/wtf/cocoa/URLCocoa.mm	2018-12-27 16:13:47 UTC (rev 239556)
</span><span class="lines">@@ -26,10 +26,10 @@
</span><span class="cx"> #import &quot;config.h&quot;
</span><span class="cx"> #import &lt;wtf/URL.h&gt;
</span><span class="cx"> 
</span><del>-#import &quot;CFURLExtras.h&quot;
-#import &quot;NSURLExtras.h&quot;
</del><span class="cx"> #import &lt;wtf/ObjCRuntimeExtras.h&gt;
</span><span class="cx"> #import &lt;wtf/URLParser.h&gt;
</span><ins>+#import &lt;wtf/cf/CFURLExtras.h&gt;
+#import &lt;wtf/cocoa/NSURLExtras.h&gt;
</ins><span class="cx"> #import &lt;wtf/text/CString.h&gt;
</span><span class="cx"> 
</span><span class="cx"> @interface NSString (WTFNSURLExtras)
</span></span></pre></div>
<a id="trunkSourceWebCoreCMakeListstxt"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/CMakeLists.txt (239555 => \
239556)</h4> <pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/CMakeLists.txt	2018-12-27 04:01:23 UTC \
                (rev 239555)
+++ trunk/Source/WebCore/CMakeLists.txt	2018-12-27 16:13:47 UTC (rev 239556)
</span><span class="lines">@@ -1843,7 +1843,7 @@
</span><span class="cx">     DEPENDS ${WebCore_CSS_VALUE_KEYWORDS}
</span><span class="cx">     WORKING_DIRECTORY ${DERIVED_SOURCES_WEBCORE_DIR}
</span><span class="cx">     COMMAND ${PERL_EXECUTABLE} -ne &quot;print&quot; \
${WebCore_CSS_VALUE_KEYWORDS} &gt; ${DERIVED_SOURCES_WEBCORE_DIR}/CSSValueKeywords.in \
</span><del>-    COMMAND ${PERL_EXECUTABLE} ${WEBCORE_DIR}/css/makevalues.pl \
--defines &quot;${FEATURE_DEFINES_WITH_SPACE_SEPARATOR}&quot; --preprocessor \
&quot;${CODE_GENERATOR_PREPROCESSOR}&quot; --gperf-executable \
&quot;${GPERF_EXECUTABLE}&quot; </del><ins>+    COMMAND ${PERL_EXECUTABLE} \
${WEBCORE_DIR}/css/makevalues.pl --defines \
&quot;${FEATURE_DEFINES_WITH_SPACE_SEPARATOR} ${CSS_VALUE_PLATFORM_DEFINES}&quot; \
--preprocessor &quot;${CODE_GENERATOR_PREPROCESSOR}&quot; --gperf-executable \
&quot;${GPERF_EXECUTABLE}&quot; </ins><span class="cx">     VERBATIM)
</span><span class="cx"> list(APPEND WebCore_SOURCES \
${DERIVED_SOURCES_WEBCORE_DIR}/CSSValueKeywords.cpp) </span><span class="cx"> \
ADD_SOURCE_WEBCORE_DERIVED_DEPENDENCIES(${WEBCORE_DIR}/css/CSSParser.cpp \
CSSValueKeywords.h) </span></span></pre></div>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (239555 => \
239556)</h4> <pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog	2018-12-27 04:01:23 UTC (rev \
                239555)
+++ trunk/Source/WebCore/ChangeLog	2018-12-27 16:13:47 UTC (rev 239556)
</span><span class="lines">@@ -1,3 +1,16 @@
</span><ins>+2018-12-27  Alex Christensen  &lt;achristensen@webkit.org&gt;
+
+        Resurrect Mac CMake build
+        https://bugs.webkit.org/show_bug.cgi?id=192658
+
+        Reviewed by Yusuke Suzuki.
+
+        This makes it so JSC and most of WebCore builds.
+        WebCore's use of ARC seems inconsistent, so I'll fix that later.
+
+        * PlatformMac.cmake:
+        * config.h:
+
</ins><span class="cx"> 2018-12-26  Jim Mason  &lt;jmason@ibinx.com&gt;
</span><span class="cx"> 
</span><span class="cx">         [FreeType] Restore conditional compilation logic for \
recent HarfBuzz refactoring </span></span></pre></div>
<a id="trunkSourceWebCoreModuleswebgpuWHLSLWHLSLLexercpp"></a>
<div class="modfile"><h4>Modified: \
trunk/Source/WebCore/Modules/webgpu/WHLSL/WHLSLLexer.cpp (239555 => 239556)</h4> <pre \
class="diff"><span> <span class="info">--- \
trunk/Source/WebCore/Modules/webgpu/WHLSL/WHLSLLexer.cpp	2018-12-27 04:01:23 UTC (rev \
                239555)
+++ trunk/Source/WebCore/Modules/webgpu/WHLSL/WHLSLLexer.cpp	2018-12-27 16:13:47 UTC \
(rev 239556) </span><span class="lines">@@ -25,11 +25,11 @@
</span><span class="cx"> 
</span><span class="cx"> #pragma once
</span><span class="cx"> 
</span><del>-#if ENABLE(WEBGPU)
-
</del><span class="cx"> #include &quot;config.h&quot;
</span><span class="cx"> #include &quot;WHLSLLexer.h&quot;
</span><span class="cx"> 
</span><ins>+#if ENABLE(WEBGPU)
+
</ins><span class="cx"> namespace WebCore {
</span><span class="cx"> 
</span><span class="cx"> namespace WHLSL {
</span></span></pre></div>
<a id="trunkSourceWebCorePALChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/PAL/ChangeLog (239555 => \
239556)</h4> <pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/PAL/ChangeLog	2018-12-27 04:01:23 UTC \
                (rev 239555)
+++ trunk/Source/WebCore/PAL/ChangeLog	2018-12-27 16:13:47 UTC (rev 239556)
</span><span class="lines">@@ -1,3 +1,12 @@
</span><ins>+2018-12-27  Alex Christensen  &lt;achristensen@webkit.org&gt;
+
+        Resurrect Mac CMake build
+        https://bugs.webkit.org/show_bug.cgi?id=192658
+
+        Reviewed by Yusuke Suzuki.
+
+        * pal/PlatformMac.cmake:
+
</ins><span class="cx"> 2018-12-21  Eric Carlson  &lt;eric.carlson@apple.com&gt;
</span><span class="cx"> 
</span><span class="cx">         'ended' Event doesn't fire on MediaStreamTrack when \
a USB camera is unplugged </span></span></pre></div>
<a id="trunkSourceWebCorePALpalPlatformMaccmake"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/PAL/pal/PlatformMac.cmake \
(239555 => 239556)</h4> <pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/PAL/pal/PlatformMac.cmake	2018-12-27 \
                04:01:23 UTC (rev 239555)
+++ trunk/Source/WebCore/PAL/pal/PlatformMac.cmake	2018-12-27 16:13:47 UTC (rev \
239556) </span><span class="lines">@@ -16,6 +16,7 @@
</span><span class="cx">     spi/cg/ImageIOSPI.h
</span><span class="cx"> 
</span><span class="cx">     spi/cocoa/AVKitSPI.h
</span><ins>+    spi/cocoa/AudioToolboxSPI.h
</ins><span class="cx">     spi/cocoa/CFNSURLConnectionSPI.h
</span><span class="cx">     spi/cocoa/CoreTextSPI.h
</span><span class="cx">     spi/cocoa/DataDetectorsCoreSPI.h
</span><span class="lines">@@ -47,7 +48,11 @@
</span><span class="cx">     spi/cocoa/WebFilterEvaluatorSPI.h
</span><span class="cx">     spi/cocoa/pthreadSPI.h
</span><span class="cx"> 
</span><ins>+    spi/ios/DataDetectorsUISPI.h
+    spi/ios/GraphicsServicesSPI.h
+
</ins><span class="cx">     spi/mac/AVFoundationSPI.h
</span><ins>+    spi/mac/CoreUISPI.h
</ins><span class="cx">     spi/mac/DataDetectorsSPI.h
</span><span class="cx">     spi/mac/HIServicesSPI.h
</span><span class="cx">     spi/mac/HIToolboxSPI.h
</span><span class="lines">@@ -55,11 +60,13 @@
</span><span class="cx">     spi/mac/MediaRemoteSPI.h
</span><span class="cx">     spi/mac/MetadataSPI.h
</span><span class="cx">     spi/mac/NSAccessibilitySPI.h
</span><ins>+    spi/mac/NSAppearanceSPI.h
</ins><span class="cx">     spi/mac/NSApplicationSPI.h
</span><span class="cx">     spi/mac/NSCellSPI.h
</span><span class="cx">     spi/mac/NSEventSPI.h
</span><span class="cx">     spi/mac/NSFontSPI.h
</span><span class="cx">     spi/mac/NSGraphicsSPI.h
</span><ins>+    spi/mac/NSImageSPI.h
</ins><span class="cx">     spi/mac/NSImmediateActionGestureRecognizerSPI.h
</span><span class="cx">     spi/mac/NSMenuSPI.h
</span><span class="cx">     spi/mac/NSPasteboardSPI.h
</span><span class="lines">@@ -97,7 +104,6 @@
</span><span class="cx">     cf/CoreMediaSoftLink.cpp
</span><span class="cx"> 
</span><span class="cx">     cocoa/FileSizeFormatterCocoa.mm
</span><del>-    cocoa/LoggingCocoa.mm
</del><span class="cx">     cocoa/PassKitSoftLink.mm
</span><span class="cx"> 
</span><span class="cx">     crypto/commoncrypto/CryptoDigestCommonCrypto.cpp
</span><span class="lines">@@ -115,6 +121,7 @@
</span><span class="cx"> )
</span><span class="cx"> 
</span><span class="cx"> list(APPEND PAL_PRIVATE_INCLUDE_DIRECTORIES
</span><ins>+    &quot;${DERIVED_SOURCES_WTF_DIR}&quot;
</ins><span class="cx">     &quot;${PAL_DIR}/pal/avfoundation&quot;
</span><span class="cx">     &quot;${PAL_DIR}/pal/cf&quot;
</span><span class="cx">     &quot;${PAL_DIR}/pal/cocoa&quot;
</span></span></pre></div>
<a id="trunkSourceWebCorePlatformMaccmake"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/PlatformMac.cmake (239555 => \
239556)</h4> <pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/PlatformMac.cmake	2018-12-27 04:01:23 UTC \
                (rev 239555)
+++ trunk/Source/WebCore/PlatformMac.cmake	2018-12-27 16:13:47 UTC (rev 239556)
</span><span class="lines">@@ -1,4 +1,3 @@
</span><del>-find_library(ACCELERATE_LIBRARY accelerate)
</del><span class="cx"> find_library(APPLICATIONSERVICES_LIBRARY ApplicationServices)
</span><span class="cx"> find_library(AVFOUNDATION_LIBRARY AVFoundation)
</span><span class="cx"> find_library(AUDIOTOOLBOX_LIBRARY AudioToolbox)
</span><span class="lines">@@ -23,11 +22,9 @@
</span><span class="cx"> 
</span><span class="cx"> list(APPEND WebCore_UNIFIED_SOURCE_LIST_FILES
</span><span class="cx">     &quot;SourcesCocoa.txt&quot;
</span><del>-    &quot;SourcesMac.txt&quot;
</del><span class="cx"> )
</span><span class="cx"> 
</span><span class="cx"> list(APPEND WebCore_LIBRARIES
</span><del>-    ${ACCELERATE_LIBRARY}
</del><span class="cx">     ${AUDIOTOOLBOX_LIBRARY}
</span><span class="cx">     ${AUDIOUNIT_LIBRARY}
</span><span class="cx">     ${AVFOUNDATION_LIBRARY}
</span><span class="lines">@@ -67,6 +64,8 @@
</span><span class="cx"> endif ()
</span><span class="cx"> 
</span><span class="cx"> list(APPEND WebCore_INCLUDE_DIRECTORIES
</span><ins>+    &quot;${CMAKE_SOURCE_DIR}/Source&quot;
+    &quot;${DERIVED_SOURCES_WTF_DIR}&quot;
</ins><span class="cx">     &quot;${THIRDPARTY_DIR}/ANGLE&quot;
</span><span class="cx">     &quot;${THIRDPARTY_DIR}/ANGLE/include/KHR&quot;
</span><span class="cx">     &quot;${WEBCORE_DIR}/accessibility/mac&quot;
</span><span class="lines">@@ -94,6 +93,7 @@
</span><span class="cx">     &quot;${WEBCORE_DIR}/platform/graphics/cg&quot;
</span><span class="cx">     &quot;${WEBCORE_DIR}/platform/graphics/cv&quot;
</span><span class="cx">     &quot;${WEBCORE_DIR}/platform/graphics/gpu&quot;
</span><ins>+    &quot;${WEBCORE_DIR}/platform/graphics/gpu/legacy&quot;
</ins><span class="cx">     &quot;${WEBCORE_DIR}/platform/graphics/egl&quot;
</span><span class="cx">     &quot;${WEBCORE_DIR}/platform/graphics/opentype&quot;
</span><span class="cx">     &quot;${WEBCORE_DIR}/platform/graphics/opengl&quot;
</span><span class="lines">@@ -142,11 +142,9 @@
</span><span class="cx">     editing/ios/AutofillElements.cpp
</span><span class="cx"> 
</span><span class="cx">     editing/mac/AlternativeTextUIController.mm
</span><del>-    editing/mac/DictionaryLookup.mm
</del><span class="cx">     editing/mac/EditorMac.mm
</span><span class="cx">     editing/mac/TextAlternativeWithRange.mm
</span><span class="cx">     editing/mac/TextUndoInsertionMarkupMac.mm
</span><del>-    editing/mac/WebContentReaderMac.mm
</del><span class="cx"> 
</span><span class="cx">     html/HTMLSlotElement.cpp
</span><span class="cx"> 
</span><span class="lines">@@ -158,7 +156,6 @@
</span><span class="cx">     page/mac/EventHandlerMac.mm
</span><span class="cx">     page/mac/ServicesOverlayController.mm
</span><span class="cx">     page/mac/TextIndicatorWindow.mm
</span><del>-    page/mac/UserAgentMac.mm
</del><span class="cx">     page/mac/WheelEventDeltaFilterMac.mm
</span><span class="cx"> 
</span><span class="cx">     page/scrolling/mac/ScrollingCoordinatorMac.mm
</span><span class="lines">@@ -173,7 +170,6 @@
</span><span class="cx"> 
</span><span class="cx">     platform/audio/AudioSession.cpp
</span><span class="cx"> 
</span><del>-    platform/audio/cocoa/MediaSessionManagerCocoa.cpp
</del><span class="cx">     platform/audio/cocoa/WebAudioBufferList.cpp
</span><span class="cx"> 
</span><span class="cx">     platform/audio/mac/CAAudioStreamDescription.cpp
</span><span class="lines">@@ -185,7 +181,6 @@
</span><span class="cx">     platform/audio/mac/AudioSessionMac.cpp
</span><span class="cx">     platform/audio/mac/CARingBuffer.cpp
</span><span class="cx">     platform/audio/mac/FFTFrameMac.cpp
</span><del>-    platform/audio/mac/MediaSessionManagerMac.mm
</del><span class="cx"> 
</span><span class="cx">     platform/cf/FileSystemCF.cpp
</span><span class="cx">     platform/cf/KeyedDecoderCF.cpp
</span><span class="lines">@@ -202,7 +197,6 @@
</span><span class="cx">     platform/cocoa/KeyEventCocoa.mm
</span><span class="cx">     platform/cocoa/LocalizedStringsCocoa.mm
</span><span class="cx">     platform/cocoa/MIMETypeRegistryCocoa.mm
</span><del>-    platform/cocoa/MachSendRight.cpp
</del><span class="cx">     platform/cocoa/NetworkExtensionContentFilter.mm
</span><span class="cx">     platform/cocoa/ParentalControlsContentFilter.mm
</span><span class="cx">     platform/cocoa/PasteboardCocoa.mm
</span><span class="lines">@@ -328,34 +322,10 @@
</span><span class="cx">     platform/graphics/mac/IntPointMac.mm
</span><span class="cx">     platform/graphics/mac/IntRectMac.mm
</span><span class="cx">     platform/graphics/mac/IntSizeMac.mm
</span><del>-    platform/graphics/mac/MediaPlayerPrivateQTKit.mm
-    platform/graphics/mac/MediaTimeQTKit.mm
</del><span class="cx">     platform/graphics/mac/PDFDocumentImageMac.mm
</span><span class="cx">     platform/graphics/mac/SimpleFontDataCoreText.cpp
</span><span class="cx">     platform/graphics/mac/WebLayer.mm
</span><span class="cx"> 
</span><del>-    platform/graphics/metal/GPUBufferMetal.mm
-    platform/graphics/metal/GPUCommandBufferMetal.mm
-    platform/graphics/metal/GPUCommandQueueMetal.mm
-    platform/graphics/metal/GPUComputeCommandEncoderMetal.mm
-    platform/graphics/metal/GPUComputePipelineStateMetal.mm
-    platform/graphics/metal/GPUDepthStencilDescriptorMetal.mm
-    platform/graphics/metal/GPUDepthStencilStateMetal.mm
-    platform/graphics/metal/GPUDeviceMetal.mm
-    platform/graphics/metal/GPUDrawableMetal.mm
-    platform/graphics/metal/GPUFunctionMetal.mm
-    platform/graphics/metal/GPULibraryMetal.mm
-    platform/graphics/metal/GPURenderCommandEncoderMetal.mm
-    platform/graphics/metal/GPURenderPassAttachmentDescriptorMetal.mm
-    platform/graphics/metal/GPURenderPassColorAttachmentDescriptorMetal.mm
-    platform/graphics/metal/GPURenderPassDepthAttachmentDescriptorMetal.mm
-    platform/graphics/metal/GPURenderPassDescriptorMetal.mm
-    platform/graphics/metal/GPURenderPipelineColorAttachmentDescriptorMetal.mm
-    platform/graphics/metal/GPURenderPipelineDescriptorMetal.mm
-    platform/graphics/metal/GPURenderPipelineStateMetal.mm
-    platform/graphics/metal/GPUTextureDescriptorMetal.mm
-    platform/graphics/metal/GPUTextureMetal.mm
-
</del><span class="cx">     platform/graphics/opengl/Extensions3DOpenGL.cpp
</span><span class="cx">     platform/graphics/opengl/Extensions3DOpenGLCommon.cpp
</span><span class="cx">     platform/graphics/opengl/GraphicsContext3DOpenGL.cpp
</span><span class="lines">@@ -404,7 +374,6 @@
</span><span class="cx">     platform/mac/WebCoreObjCExtras.mm
</span><span class="cx">     platform/mac/WebGLBlacklist.mm
</span><span class="cx">     platform/mac/WebNSAttributedStringExtras.mm
</span><del>-    platform/mac/WebWindowAnimation.mm
</del><span class="cx">     platform/mac/WidgetMac.mm
</span><span class="cx"> 
</span><span class="cx">     platform/mediastream/mac/MockRealtimeVideoSourceMac.mm
</span><span class="lines">@@ -512,6 +481,7 @@
</span><span class="cx">     html/forms
</span><span class="cx">     html/parser
</span><span class="cx">     html/shadow
</span><ins>+    html/track
</ins><span class="cx"> 
</span><span class="cx">     inspector/agents
</span><span class="cx"> 
</span><span class="lines">@@ -534,6 +504,7 @@
</span><span class="cx">     platform/audio
</span><span class="cx">     platform/cf
</span><span class="cx">     platform/cocoa
</span><ins>+    platform/ios
</ins><span class="cx">     platform/graphics
</span><span class="cx">     platform/mac
</span><span class="cx">     platform/mediastream
</span><span class="lines">@@ -547,6 +518,7 @@
</span><span class="cx">     platform/gamepad/cocoa
</span><span class="cx">     platform/gamepad/mac
</span><span class="cx"> 
</span><ins>+    platform/graphics/avfoundation
</ins><span class="cx">     platform/graphics/ca
</span><span class="cx">     platform/graphics/cocoa
</span><span class="cx">     platform/graphics/cg
</span><span class="lines">@@ -647,6 +619,7 @@
</span><span class="cx">     ${WORKERGLOBALSCOPE_CONSTRUCTORS_FILE}
</span><span class="cx">     ${DEDICATEDWORKERGLOBALSCOPE_CONSTRUCTORS_FILE}
</span><span class="cx"> )
</span><ins>+set(CSS_VALUE_PLATFORM_DEFINES WTF_PLATFORM_MAC=1)
</ins><span class="cx"> 
</span><span class="cx"> list(APPEND WebCoreTestSupport_LIBRARIES PRIVATE WebCore)
</span><span class="cx"> list(APPEND WebCoreTestSupport_SOURCES
</span></span></pre></div>
<a id="trunkSourceWebCoreSourcesCocoatxt"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/SourcesCocoa.txt (239555 => \
239556)</h4> <pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/SourcesCocoa.txt	2018-12-27 04:01:23 UTC \
                (rev 239555)
+++ trunk/Source/WebCore/SourcesCocoa.txt	2018-12-27 16:13:47 UTC (rev 239556)
</span><span class="lines">@@ -494,7 +494,6 @@
</span><span class="cx"> 
</span><span class="cx"> \
platform/mediastream/mac/AudioTrackPrivateMediaStreamCocoa.cpp </span><span \
class="cx"> platform/mediastream/mac/AVCaptureDeviceManager.mm @no-unify \
</span><del>-platform/mediastream/mac/AVMediaCaptureSource.mm @no-unify </del><span \
class="cx"> platform/mediastream/mac/AVVideoCaptureSource.mm @no-unify </span><span \
class="cx"> platform/mediastream/mac/MockRealtimeVideoSourceMac.mm </span><span \
class="cx">  </span></span></pre></div>
<a id="trunkSourceWebCoreconfigh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/config.h (239555 => \
239556)</h4> <pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/config.h	2018-12-27 04:01:23 UTC (rev \
                239555)
+++ trunk/Source/WebCore/config.h	2018-12-27 16:13:47 UTC (rev 239556)
</span><span class="lines">@@ -36,7 +36,10 @@
</span><span class="cx"> // Using CMake with Unix makefiles does not use prefix \
headers. </span><span class="cx"> #if PLATFORM(MAC) &amp;&amp; \
defined(BUILDING_WITH_CMAKE) </span><span class="cx"> #include \
&quot;WebCorePrefix.h&quot; </span><ins>+#ifndef JSC_API_AVAILABLE
+#define JSC_API_AVAILABLE(...)
</ins><span class="cx"> #endif
</span><ins>+#endif
</ins><span class="cx"> 
</span><span class="cx"> #ifdef __cplusplus
</span><span class="cx"> 
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformmacWebCoreFullScreenPlaceholderViewh"></a>
<div class="modfile"><h4>Modified: \
trunk/Source/WebCore/platform/mac/WebCoreFullScreenPlaceholderView.h (239555 => \
239556)</h4> <pre class="diff"><span>
<span class="info">--- \
trunk/Source/WebCore/platform/mac/WebCoreFullScreenPlaceholderView.h	2018-12-27 \
                04:01:23 UTC (rev 239555)
+++ trunk/Source/WebCore/platform/mac/WebCoreFullScreenPlaceholderView.h	2018-12-27 \
16:13:47 UTC (rev 239556) </span><span class="lines">@@ -26,12 +26,13 @@
</span><span class="cx"> #if PLATFORM(MAC)
</span><span class="cx"> 
</span><span class="cx"> #import &lt;wtf/RetainPtr.h&gt;
</span><ins>+#import &lt;wtf/WeakObjCPtr.h&gt;
</ins><span class="cx"> 
</span><span class="cx"> WEBCORE_EXPORT @interface WebCoreFullScreenPlaceholderView : \
NSView { </span><span class="cx"> @private
</span><span class="cx">     RetainPtr&lt;NSVisualEffectView&gt; _effectView;
</span><span class="cx">     RetainPtr&lt;NSTextField&gt; _exitWarning;
</span><del>-    __weak NSResponder *_target;
</del><ins>+    WeakObjCPtr&lt;NSResponder&gt; _target;
</ins><span class="cx"> }
</span><span class="cx"> @property (nullable, strong) id contents;
</span><span class="cx"> @property (nullable, weak) NSResponder *target;
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformmacWebCoreFullScreenPlaceholderViewmm"></a>
<div class="modfile"><h4>Modified: \
trunk/Source/WebCore/platform/mac/WebCoreFullScreenPlaceholderView.mm (239555 => \
239556)</h4> <pre class="diff"><span>
<span class="info">--- \
trunk/Source/WebCore/platform/mac/WebCoreFullScreenPlaceholderView.mm	2018-12-27 \
                04:01:23 UTC (rev 239555)
+++ trunk/Source/WebCore/platform/mac/WebCoreFullScreenPlaceholderView.mm	2018-12-27 \
16:13:47 UTC (rev 239556) </span><span class="lines">@@ -81,8 +81,16 @@
</span><span class="cx">     return self;
</span><span class="cx"> }
</span><span class="cx"> 
</span><del>-@synthesize target = _target;
</del><ins>+- (NSResponder *)target
+{
+    return _target.get().get();
+}
</ins><span class="cx"> 
</span><ins>+- (void)setTarget:(NSResponder *)target
+{
+    _target = target;
+}
+
</ins><span class="cx"> @dynamic contents;
</span><span class="cx"> 
</span><span class="cx"> - (void)setContents:(id)contents
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformmediastreammacAVMediaCaptureSourcemm"></a>
<div class="delfile"><h4>Deleted: \
trunk/Source/WebCore/platform/mediastream/mac/AVMediaCaptureSource.mm (239555 => \
239556)</h4> <pre class="diff"><span>
<span class="info">--- \
trunk/Source/WebCore/platform/mediastream/mac/AVMediaCaptureSource.mm	2018-12-27 \
                04:01:23 UTC (rev 239555)
+++ trunk/Source/WebCore/platform/mediastream/mac/AVMediaCaptureSource.mm	2018-12-27 \
16:13:47 UTC (rev 239556) </span><span class="lines">@@ -1,439 +0,0 @@
</span><del>-/*
- * Copyright (C) 2013-2015 Apple Inc. All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY APPLE INC. ``AS IS'' AND ANY
- * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL APPLE INC. OR
- * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
- * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
- * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
- * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY
- * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-#import &quot;config.h&quot;
-#import &quot;AVMediaCaptureSource.h&quot;
-
-#if ENABLE(MEDIA_STREAM) &amp;&amp; USE(AVFOUNDATION)
-
-#import &quot;AVCaptureDeviceManager.h&quot;
-#import &quot;AudioSourceProvider.h&quot;
-#import &quot;Logging.h&quot;
-#import &quot;MediaConstraints.h&quot;
-#import &quot;RealtimeMediaSourceSettings.h&quot;
-#import &lt;AVFoundation/AVCaptureDevice.h&gt;
-#import &lt;AVFoundation/AVCaptureInput.h&gt;
-#import &lt;AVFoundation/AVCaptureOutput.h&gt;
-#import &lt;AVFoundation/AVCaptureSession.h&gt;
-#import &lt;AVFoundation/AVError.h&gt;
-#import &lt;objc/runtime.h&gt;
-#import &lt;wtf/MainThread.h&gt;
-
-#import &lt;pal/cf/CoreMediaSoftLink.h&gt;
-
-typedef AVCaptureConnection AVCaptureConnectionType;
-typedef AVCaptureDevice AVCaptureDeviceTypedef;
-typedef AVCaptureDeviceInput AVCaptureDeviceInputType;
-typedef AVCaptureOutput AVCaptureOutputType;
-typedef AVCaptureSession AVCaptureSessionType;
-typedef AVCaptureAudioDataOutput AVCaptureAudioDataOutputType;
-typedef AVCaptureVideoDataOutput AVCaptureVideoDataOutputType;
-
-SOFT_LINK_FRAMEWORK_OPTIONAL(AVFoundation)
-
-SOFT_LINK_CLASS(AVFoundation, AVCaptureAudioDataOutput)
-SOFT_LINK_CLASS(AVFoundation, AVCaptureConnection)
-SOFT_LINK_CLASS(AVFoundation, AVCaptureDevice)
-SOFT_LINK_CLASS(AVFoundation, AVCaptureDeviceInput)
-SOFT_LINK_CLASS(AVFoundation, AVCaptureOutput)
-SOFT_LINK_CLASS(AVFoundation, AVCaptureSession)
-SOFT_LINK_CLASS(AVFoundation, AVCaptureVideoDataOutput)
-
-#define AVCaptureAudioDataOutput getAVCaptureAudioDataOutputClass()
-#define AVCaptureConnection getAVCaptureConnectionClass()
-#define AVCaptureDevice getAVCaptureDeviceClass()
-#define AVCaptureDeviceInput getAVCaptureDeviceInputClass()
-#define AVCaptureOutput getAVCaptureOutputClass()
-#define AVCaptureSession getAVCaptureSessionClass()
-#define AVCaptureVideoDataOutput getAVCaptureVideoDataOutputClass()
-
-SOFT_LINK_CONSTANT(AVFoundation, AVMediaTypeAudio, NSString *)
-SOFT_LINK_CONSTANT(AVFoundation, AVMediaTypeMuxed, NSString *)
-SOFT_LINK_CONSTANT(AVFoundation, AVMediaTypeVideo, NSString *)
-
-#define AVMediaTypeAudio getAVMediaTypeAudio()
-#define AVMediaTypeMuxed getAVMediaTypeMuxed()
-#define AVMediaTypeVideo getAVMediaTypeVideo()
-
-#if PLATFORM(IOS_FAMILY)
-SOFT_LINK_POINTER_OPTIONAL(AVFoundation, AVCaptureSessionRuntimeErrorNotification, \
                NSString *)
-SOFT_LINK_POINTER_OPTIONAL(AVFoundation, AVCaptureSessionWasInterruptedNotification, \
                NSString *)
-SOFT_LINK_POINTER_OPTIONAL(AVFoundation, \
                AVCaptureSessionInterruptionEndedNotification, NSString *)
-SOFT_LINK_POINTER_OPTIONAL(AVFoundation, AVCaptureSessionInterruptionReasonKey, \
                NSString *)
-SOFT_LINK_POINTER_OPTIONAL(AVFoundation, AVCaptureSessionErrorKey, NSString *)
-
-#define AVCaptureSessionRuntimeErrorNotification \
                getAVCaptureSessionRuntimeErrorNotification()
-#define AVCaptureSessionWasInterruptedNotification \
                getAVCaptureSessionWasInterruptedNotification()
-#define AVCaptureSessionInterruptionEndedNotification \
                getAVCaptureSessionInterruptionEndedNotification()
-#define AVCaptureSessionInterruptionReasonKey \
                getAVCaptureSessionInterruptionReasonKey()
-#define AVCaptureSessionErrorKey getAVCaptureSessionErrorKey()
-#endif
-
-using namespace WebCore;
-
-@interface WebCoreAVMediaCaptureSourceObserver : \
NSObject&lt;AVCaptureAudioDataOutputSampleBufferDelegate, \
                AVCaptureVideoDataOutputSampleBufferDelegate&gt;
-{
-    AVMediaCaptureSource* m_callback;
-}
-
--(id)initWithCallback:(AVMediaCaptureSource*)callback;
--(void)disconnect;
--(void)addNotificationObservers;
--(void)removeNotificationObservers;
--(void)captureOutput:(AVCaptureOutputType*)captureOutput \
didOutputSampleBuffer:(CMSampleBufferRef)sampleBuffer \
                fromConnection:(AVCaptureConnectionType*)connection;
--(void)observeValueForKeyPath:keyPath ofObject:(id)object \
                change:(NSDictionary*)change context:(void*)context;
-#if PLATFORM(IOS_FAMILY)
--(void)sessionRuntimeError:(NSNotification*)notification;
--(void)beginSessionInterrupted:(NSNotification*)notification;
--(void)endSessionInterrupted:(NSNotification*)notification;
-#endif
-@end
-
-namespace WebCore {
-
-static NSArray&lt;NSString*&gt;* sessionKVOProperties();
-
-static dispatch_queue_t globaAudioCaptureSerialQueue()
-{
-    static dispatch_queue_t globalQueue;
-    static dispatch_once_t onceToken;
-    dispatch_once(&amp;onceToken, ^{
-        globalQueue = dispatch_queue_create(&quot;WebCoreAVMediaCaptureSource audio \
                capture queue&quot;, DISPATCH_QUEUE_SERIAL);
-    });
-    return globalQueue;
-}
-
-static dispatch_queue_t globaVideoCaptureSerialQueue()
-{
-    static dispatch_queue_t globalQueue;
-    static dispatch_once_t onceToken;
-    dispatch_once(&amp;onceToken, ^{
-        globalQueue = \
dispatch_queue_create_with_target(&quot;WebCoreAVMediaCaptureSource video capture \
queue&quot;, DISPATCH_QUEUE_SERIAL, \
                dispatch_get_global_queue(DISPATCH_QUEUE_PRIORITY_HIGH, 0));
-    });
-    return globalQueue;
-}
-
-AVMediaCaptureSource::AVMediaCaptureSource(AVCaptureDeviceTypedef* device, const \
                AtomicString&amp; id, RealtimeMediaSource::Type type)
-    : RealtimeMediaSource(id, type, device.localizedName)
-    , m_objcObserver(adoptNS([[WebCoreAVMediaCaptureSourceObserver alloc] \
                initWithCallback:this]))
-    , m_device(device)
-{
-#if PLATFORM(IOS_FAMILY)
-    static_assert(static_cast&lt;int&gt;(InterruptionReason::VideoNotAllowedInBackground) \
== static_cast&lt;int&gt;(AVCaptureSessionInterruptionReasonVideoDeviceNotAvailableInBackground), \
&quot;InterruptionReason::VideoNotAllowedInBackground is not \
AVCaptureSessionInterruptionReasonVideoDeviceNotAvailableInBackground as \
                expected&quot;);
-    static_assert(static_cast&lt;int&gt;(InterruptionReason::VideoNotAllowedInSideBySide) \
== AVCaptureSessionInterruptionReasonVideoDeviceNotAvailableWithMultipleForegroundApps, \
&quot;InterruptionReason::VideoNotAllowedInSideBySide is not \
AVCaptureSessionInterruptionReasonVideoDeviceNotAvailableWithMultipleForegroundApps \
                as expected&quot;);
-    static_assert(static_cast&lt;int&gt;(InterruptionReason::VideoInUse) == \
AVCaptureSessionInterruptionReasonVideoDeviceInUseByAnotherClient, \
&quot;InterruptionReason::VideoInUse is not \
                AVCaptureSessionInterruptionReasonVideoDeviceInUseByAnotherClient as \
                expected&quot;);
-    static_assert(static_cast&lt;int&gt;(InterruptionReason::AudioInUse) == \
AVCaptureSessionInterruptionReasonAudioDeviceInUseByAnotherClient, \
&quot;InterruptionReason::AudioInUse is not \
                AVCaptureSessionInterruptionReasonAudioDeviceInUseByAnotherClient as \
                expected&quot;);
-#endif
-    
-    setPersistentID(String(device.uniqueID));
-}
-
-AVMediaCaptureSource::~AVMediaCaptureSource()
-{
-    [m_objcObserver disconnect];
-
-    if (!m_session)
-        return;
-
-    for (NSString *keyName in sessionKVOProperties())
-        [m_session removeObserver:m_objcObserver.get() forKeyPath:keyName];
-
-    if ([m_session isRunning])
-        [m_session stopRunning];
-
-}
-
-void AVMediaCaptureSource::startProducingData()
-{
-    if (!m_session) {
-        if (!setupSession())
-            return;
-    }
-
-    if ([m_session isRunning])
-        return;
-
-    [m_objcObserver addNotificationObservers];
-    [m_session startRunning];
-}
-
-void AVMediaCaptureSource::stopProducingData()
-{
-    if (!m_session)
-        return;
-
-    [m_objcObserver removeNotificationObservers];
-
-    if ([m_session isRunning])
-        [m_session stopRunning];
-
-    m_interruption = InterruptionReason::None;
-#if PLATFORM(IOS_FAMILY)
-    m_session = nullptr;
-#endif
-}
-
-void AVMediaCaptureSource::beginConfiguration()
-{
-    if (m_session)
-        [m_session beginConfiguration];
-}
-
-void AVMediaCaptureSource::commitConfiguration()
-{
-    if (m_session)
-        [m_session commitConfiguration];
-}
-
-void AVMediaCaptureSource::initializeSettings()
-{
-    if (m_currentSettings.deviceId().isEmpty())
-        m_currentSettings.setSupportedConstraints(supportedConstraints());
-
-    m_currentSettings.setDeviceId(id());
-    updateSettings(m_currentSettings);
-}
-
-const RealtimeMediaSourceSettings&amp; AVMediaCaptureSource::settings() const
-{
-    const_cast&lt;AVMediaCaptureSource&amp;&gt;(*this).initializeSettings();
-    return m_currentSettings;
-}
-
-RealtimeMediaSourceSupportedConstraints&amp; \
                AVMediaCaptureSource::supportedConstraints()
-{
-    if (m_supportedConstraints.supportsDeviceId())
-        return m_supportedConstraints;
-
-    m_supportedConstraints.setSupportsDeviceId(true);
-    initializeSupportedConstraints(m_supportedConstraints);
-
-    return m_supportedConstraints;
-}
-
-void AVMediaCaptureSource::initializeCapabilities()
-{
-    m_capabilities = \
                std::make_unique&lt;RealtimeMediaSourceCapabilities&gt;(supportedConstraints());
                
-    m_capabilities-&gt;setDeviceId(id());
-
-    initializeCapabilities(*m_capabilities.get());
-}
-
-const RealtimeMediaSourceCapabilities&amp; AVMediaCaptureSource::capabilities() \
                const
-{
-    if (!m_capabilities)
-        const_cast&lt;AVMediaCaptureSource&amp;&gt;(*this).initializeCapabilities();
-    return *m_capabilities;
-}
-
-bool AVMediaCaptureSource::setupSession()
-{
-    if (m_session)
-        return true;
-
-    m_session = adoptNS([allocAVCaptureSessionInstance() init]);
-    for (NSString* keyName in sessionKVOProperties())
-        [m_session addObserver:m_objcObserver.get() forKeyPath:keyName \
                options:NSKeyValueObservingOptionNew context:(void *)nil];
-
-    [m_session beginConfiguration];
-    bool success = setupCaptureSession();
-    [m_session commitConfiguration];
-
-    if (!success)
-        captureFailed();
-
-    return success;
-}
-
-void AVMediaCaptureSource::captureSessionIsRunningDidChange(bool state)
-{
-    scheduleDeferredTask([this, state] {
-        if ((state == m_isRunning) &amp;&amp; (state == !muted()))
-            return;
-
-        m_isRunning = state;
-        notifyMutedChange(!m_isRunning);
-    });
-}
-
-#if PLATFORM(IOS_FAMILY)
-void AVMediaCaptureSource::captureSessionRuntimeError(RetainPtr&lt;NSError&gt; \
                error)
-{
-    if (!m_isRunning || error.get().code != AVErrorMediaServicesWereReset)
-        return;
-
-    // Try to restart the session, but reset m_isRunning immediately so if it fails \
                we won't try again.
-    [m_session startRunning];
-    m_isRunning = [m_session isRunning];
-}
-
-void AVMediaCaptureSource::captureSessionBeginInterruption(RetainPtr&lt;NSNotification&gt; \
                notification)
-{
-    m_interruption = \
static_cast&lt;AVMediaCaptureSource::InterruptionReason&gt;([notification.get().userInfo[AVCaptureSessionInterruptionReasonKey] \
                integerValue]);
-}
-
-void AVMediaCaptureSource::captureSessionEndInterruption(RetainPtr&lt;NSNotification&gt;)
                
-{
-    InterruptionReason reason = m_interruption;
-
-    m_interruption = InterruptionReason::None;
-    if (reason != InterruptionReason::VideoNotAllowedInSideBySide || m_isRunning || \
                !m_session)
-        return;
-
-    [m_session startRunning];
-    m_isRunning = [m_session isRunning];
-}
-#endif
-
-void AVMediaCaptureSource::setVideoSampleBufferDelegate(AVCaptureVideoDataOutputType* \
                videoOutput)
-{
-    [videoOutput setSampleBufferDelegate:m_objcObserver.get() \
                queue:globaVideoCaptureSerialQueue()];
-}
-
-void AVMediaCaptureSource::setAudioSampleBufferDelegate(AVCaptureAudioDataOutputType* \
                audioOutput)
-{
-    [audioOutput setSampleBufferDelegate:m_objcObserver.get() \
                queue:globaAudioCaptureSerialQueue()];
-}
-
-bool AVMediaCaptureSource::interrupted() const
-{
-    if (m_interruption != InterruptionReason::None)
-        return true;
-
-    return RealtimeMediaSource::interrupted();
-}
-
-NSArray&lt;NSString*&gt;* sessionKVOProperties()
-{
-    static NSArray* keys = [@[@&quot;running&quot;] retain];
-    return keys;
-}
-
-} // namespace WebCore
-
-@implementation WebCoreAVMediaCaptureSourceObserver
-
-- (id)initWithCallback:(AVMediaCaptureSource*)callback
-{
-    self = [super init];
-    if (!self)
-        return nil;
-
-    m_callback = callback;
-
-    return self;
-}
-
-- (void)disconnect
-{
-    [NSObject cancelPreviousPerformRequestsWithTarget:self];
-    [self removeNotificationObservers];
-    m_callback = nullptr;
-}
-
-- (void)addNotificationObservers
-{
-#if PLATFORM(IOS_FAMILY)
-    ASSERT(m_callback);
-
-    NSNotificationCenter* center = [NSNotificationCenter defaultCenter];
-    AVCaptureSessionType* session = m_callback-&gt;session();
-
-    [center addObserver:self selector:@selector(sessionRuntimeError:) \
                name:AVCaptureSessionRuntimeErrorNotification object:session];
-    [center addObserver:self selector:@selector(beginSessionInterrupted:) \
                name:AVCaptureSessionWasInterruptedNotification object:session];
-    [center addObserver:self selector:@selector(endSessionInterrupted:) \
                name:AVCaptureSessionInterruptionEndedNotification object:session];
-#endif
-}
-
-- (void)removeNotificationObservers
-{
-#if PLATFORM(IOS_FAMILY)
-    [[NSNotificationCenter defaultCenter] removeObserver:self];
-#endif
-}
-
-- (void)captureOutput:(AVCaptureOutputType*)captureOutput \
didOutputSampleBuffer:(CMSampleBufferRef)sampleBuffer \
                fromConnection:(AVCaptureConnectionType*)connection
-{
-    if (!m_callback)
-        return;
-
-    m_callback-&gt;captureOutputDidOutputSampleBufferFromConnection(captureOutput, \
                sampleBuffer, connection);
-}
-
-- (void)observeValueForKeyPath:keyPath ofObject:(id)object \
                change:(NSDictionary*)change context:(void*)context
-{
-    UNUSED_PARAM(object);
-    UNUSED_PARAM(context);
-
-    if (!m_callback)
-        return;
-
-    id newValue = [change valueForKey:NSKeyValueChangeNewKey];
-
-#if !LOG_DISABLED
-    bool willChange = [[change valueForKey:NSKeyValueChangeNotificationIsPriorKey] \
                boolValue];
-
-    if (willChange)
-        LOG(Media, &quot;WebCoreAVMediaCaptureSourceObserver::observeValueForKeyPath(%p) \
                - will change, keyPath = %s&quot;, self, [keyPath UTF8String]);
-    else {
-        RetainPtr&lt;NSString&gt; valueString = adoptNS([[NSString alloc] \
                initWithFormat:@&quot;%@&quot;, newValue]);
-        LOG(Media, &quot;WebCoreAVMediaCaptureSourceObserver::observeValueForKeyPath(%p) \
- did change, keyPath = %s, value = %s&quot;, self, [keyPath UTF8String], \
                [valueString.get() UTF8String]);
-    }
-#endif
-
-    if ([keyPath isEqualToString:@&quot;running&quot;])
-        m_callback-&gt;captureSessionIsRunningDidChange([newValue boolValue]);
-}
-
-#if PLATFORM(IOS_FAMILY)
-- (void)sessionRuntimeError:(NSNotification*)notification
-{
-    NSError *error = notification.userInfo[AVCaptureSessionErrorKey];
-    LOG(Media, &quot;WebCoreAVMediaCaptureSourceObserver::sessionRuntimeError(%p) - \
                error = %s&quot;, self, [[error localizedDescription] UTF8String]);
-
-    if (m_callback)
-        m_callback-&gt;captureSessionRuntimeError(error);
-}
-
--(void)beginSessionInterrupted:(NSNotification*)notification
-{
-    LOG(Media, &quot;WebCoreAVMediaCaptureSourceObserver::beginSessionInterrupted(%p) \
- reason = %d&quot;, self, \
                [notification.userInfo[AVCaptureSessionInterruptionReasonKey] \
                integerValue]);
-
-    if (m_callback)
-        m_callback-&gt;captureSessionBeginInterruption(notification);
-}
-
-- (void)endSessionInterrupted:(NSNotification*)notification
-{
-    LOG(Media, &quot;WebCoreAVMediaCaptureSourceObserver::endSessionInterrupted(%p)&quot;, \
                self);
-
-    if (m_callback)
-        m_callback-&gt;captureSessionEndInterruption(notification);
-}
-#endif
-
-@end
-
-#endif // ENABLE(MEDIA_STREAM)
</del></span></pre></div>
<a id="trunkSourceWebKitChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/ChangeLog (239555 => \
239556)</h4> <pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/ChangeLog	2018-12-27 04:01:23 UTC (rev \
                239555)
+++ trunk/Source/WebKit/ChangeLog	2018-12-27 16:13:47 UTC (rev 239556)
</span><span class="lines">@@ -1,3 +1,12 @@
</span><ins>+2018-12-27  Alex Christensen  &lt;achristensen@webkit.org&gt;
+
+        Resurrect Mac CMake build
+        https://bugs.webkit.org/show_bug.cgi?id=192658
+
+        Reviewed by Yusuke Suzuki.
+
+        * PlatformMac.cmake:
+
</ins><span class="cx"> 2018-12-26  Fujii Hironori  &lt;Hironori.Fujii@sony.com&gt;
</span><span class="cx"> 
</span><span class="cx">         [MSVC] error C2381: \
'WebKit::NetworkHTTPSUpgradeChecker::~NetworkHTTPSUpgradeChecker': redefinition; \
'__declspec(noreturn)' or '[[noreturn]]' differs </span></span></pre></div>
<a id="trunkSourceWebKitPlatformMaccmake"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/PlatformMac.cmake (239555 => \
239556)</h4> <pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/PlatformMac.cmake	2018-12-27 04:01:23 UTC \
                (rev 239555)
+++ trunk/Source/WebKit/PlatformMac.cmake	2018-12-27 16:13:47 UTC (rev 239556)
</span><span class="lines">@@ -95,8 +95,6 @@
</span><span class="cx">     Shared/API/c/mac/WKWebArchive.cpp
</span><span class="cx">     Shared/API/c/mac/WKWebArchiveResource.cpp
</span><span class="cx"> 
</span><del>-    Shared/Authentication/mac/AuthenticationManager.mac.mm
-
</del><span class="cx">     Shared/Cocoa/APIDataCocoa.mm
</span><span class="cx">     Shared/Cocoa/APIObject.mm
</span><span class="cx">     Shared/Cocoa/ChildProcessCocoa.mm
</span><span class="lines">@@ -137,7 +135,6 @@
</span><span class="cx">     Shared/mac/ChildProcessMac.mm
</span><span class="cx">     Shared/mac/CodeSigning.mm
</span><span class="cx">     Shared/mac/ColorSpaceData.mm
</span><del>-    Shared/mac/CookieStorageShimLibrary.cpp
</del><span class="cx">     Shared/mac/HangDetectionDisablerMac.mm
</span><span class="cx">     Shared/mac/NativeWebGestureEventMac.mm
</span><span class="cx">     Shared/mac/NativeWebKeyboardEventMac.mm
</span><span class="lines">@@ -263,7 +260,6 @@
</span><span class="cx">     UIProcess/Cocoa/WebPasteboardProxyCocoa.mm
</span><span class="cx">     UIProcess/Cocoa/WebProcessPoolCocoa.mm
</span><span class="cx">     UIProcess/Cocoa/WebProcessProxyCocoa.mm
</span><del>-    UIProcess/Cocoa/WebResourceLoadStatisticsStoreCocoa.mm
</del><span class="cx">     UIProcess/Cocoa/WebURLSchemeHandlerCocoa.mm
</span><span class="cx">     UIProcess/Cocoa/WebViewImpl.mm
</span><span class="cx"> 
</span><span class="lines">@@ -271,8 +267,6 @@
</span><span class="cx"> 
</span><span class="cx">     \
UIProcess/Network/CustomProtocols/LegacyCustomProtocolManagerProxy.cpp </span><span \
class="cx">  </span><del>-    UIProcess/Network/mac/NetworkProcessProxyMac.mm
-
</del><span class="cx">     UIProcess/Plugins/mac/PluginInfoStoreMac.mm
</span><span class="cx">     UIProcess/Plugins/mac/PluginProcessManagerMac.mm
</span><span class="cx">     UIProcess/Plugins/mac/PluginProcessProxyMac.mm
</span></span></pre></div>
<a id="trunkSourceWebKitLegacyChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKitLegacy/ChangeLog (239555 => \
239556)</h4> <pre class="diff"><span>
<span class="info">--- trunk/Source/WebKitLegacy/ChangeLog	2018-12-27 04:01:23 UTC \
                (rev 239555)
+++ trunk/Source/WebKitLegacy/ChangeLog	2018-12-27 16:13:47 UTC (rev 239556)
</span><span class="lines">@@ -1,3 +1,12 @@
</span><ins>+2018-12-27  Alex Christensen  &lt;achristensen@webkit.org&gt;
+
+        Resurrect Mac CMake build
+        https://bugs.webkit.org/show_bug.cgi?id=192658
+
+        Reviewed by Yusuke Suzuki.
+
+        * PlatformMac.cmake:
+
</ins><span class="cx"> 2018-12-20  Yusuke Suzuki  &lt;yusukesuzuki@slowstart.org&gt;
</span><span class="cx"> 
</span><span class="cx">         Use Ref&lt;&gt; as much as possible
</span></span></pre></div>
<a id="trunkSourceWebKitLegacyPlatformMaccmake"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKitLegacy/PlatformMac.cmake \
(239555 => 239556)</h4> <pre class="diff"><span>
<span class="info">--- trunk/Source/WebKitLegacy/PlatformMac.cmake	2018-12-27 \
                04:01:23 UTC (rev 239555)
+++ trunk/Source/WebKitLegacy/PlatformMac.cmake	2018-12-27 16:13:47 UTC (rev 239556)
</span><span class="lines">@@ -6,25 +6,22 @@
</span><span class="cx"> list(APPEND WebKitLegacy_INCLUDE_DIRECTORIES
</span><span class="cx">     &quot;${DERIVED_SOURCES_WEBKITLEGACY_DIR}&quot;
</span><span class="cx">     &quot;${CMAKE_SOURCE_DIR}/WebKitLibraries&quot;
</span><ins>+    &quot;${WEBKITLEGACY_DIR}/mac&quot;
+    &quot;${WEBKITLEGACY_DIR}/mac/Carbon&quot;
+    &quot;${WEBKITLEGACY_DIR}/mac/DefaultDelegates&quot;
+    &quot;${WEBKITLEGACY_DIR}/mac/DOM&quot;
+    &quot;${WEBKITLEGACY_DIR}/mac/History&quot;
+    &quot;${WEBKITLEGACY_DIR}/mac/icu&quot;
+    &quot;${WEBKITLEGACY_DIR}/mac/Misc&quot;
+    &quot;${WEBKITLEGACY_DIR}/mac/Panels&quot;
+    &quot;${WEBKITLEGACY_DIR}/mac/Plugins&quot;
+    &quot;${WEBKITLEGACY_DIR}/mac/Plugins/Hosted&quot;
+    &quot;${WEBKITLEGACY_DIR}/mac/Storage&quot;
+    &quot;${WEBKITLEGACY_DIR}/mac/WebCoreSupport&quot;
+    &quot;${WEBKITLEGACY_DIR}/mac/WebInspector&quot;
+    &quot;${WEBKITLEGACY_DIR}/mac/WebView&quot;
</ins><span class="cx"> )
</span><span class="cx"> 
</span><del>-list(APPEND WebKitLegacy_SYSTEM_INCLUDE_DIRECTORIES
-    mac
-    mac/Carbon
-    mac/DefaultDelegates
-    mac/DOM
-    mac/History
-    mac/icu
-    mac/Misc
-    mac/Panels
-    mac/Plugins
-    mac/Plugins/Hosted
-    mac/Storage
-    mac/WebCoreSupport
-    mac/WebInspector
-    mac/WebView
-)
-
</del><span class="cx"> list(APPEND WebKitLegacy_SOURCES
</span><span class="cx">     cf/WebCoreSupport/WebInspectorClientCF.cpp
</span><span class="cx"> 
</span><span class="lines">@@ -271,7 +268,6 @@
</span><span class="cx">     mac/WebCoreSupport/WebProgressTrackerClient.mm
</span><span class="cx">     mac/WebCoreSupport/WebSecurityOrigin.mm
</span><span class="cx">     mac/WebCoreSupport/WebSelectionServiceController.mm
</span><del>-    mac/WebCoreSupport/WebUserMediaClient.mm
</del><span class="cx">     mac/WebCoreSupport/WebValidationMessageClient.mm
</span><span class="cx">     mac/WebCoreSupport/WebVisitedLinkStore.mm
</span><span class="cx"> 
</span></span></pre></div>
<a id="trunkSourcecmakeOptionsMaccmake"></a>
<div class="modfile"><h4>Modified: trunk/Source/cmake/OptionsMac.cmake (239555 => \
239556)</h4> <pre class="diff"><span>
<span class="info">--- trunk/Source/cmake/OptionsMac.cmake	2018-12-27 04:01:23 UTC \
                (rev 239555)
+++ trunk/Source/cmake/OptionsMac.cmake	2018-12-27 16:13:47 UTC (rev 239556)
</span><span class="lines">@@ -27,19 +27,22 @@
</span><span class="cx"> WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_INPUT_TYPE_MONTH \
PRIVATE ON) </span><span class="cx"> \
WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_INPUT_TYPE_TIME PRIVATE ON) </span><span \
class="cx"> WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_LEGACY_ENCRYPTED_MEDIA PRIVATE \
ON) </span><del>-WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_LETTERPRESS PRIVATE ON)
</del><ins>+WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_LETTERPRESS PRIVATE OFF)
</ins><span class="cx"> WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_MEDIA_SOURCE PRIVATE \
ON) </span><span class="cx"> WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_MEMORY_SAMPLER \
PRIVATE ON) </span><span class="cx"> \
WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_MOUSE_CURSOR_SCALE PRIVATE ON) </span><span \
class="cx"> WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_PDFKIT_PLUGIN PRIVATE ON) \
</span><ins>+WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_RESOURCE_LOAD_STATISTICS PRIVATE \
ON) </ins><span class="cx"> WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_RESOURCE_USAGE \
PRIVATE ON) </span><span class="cx"> \
WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_RUBBER_BANDING PRIVATE ON) </span><span \
class="cx"> WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_SERVICE_CONTROLS PRIVATE ON) \
</span><span class="cx"> WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_SPEECH_SYNTHESIS \
PRIVATE ON) </span><span class="cx"> \
WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_TELEPHONE_NUMBER_DETECTION PRIVATE ON) \
</span><ins>+WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_VIDEO_PRESENTATION_MODE PRIVATE \
ON) </ins><span class="cx"> WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_WEBGL2 PRIVATE \
ON) </span><span class="cx"> WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_WEBGPU PRIVATE \
ON) </span><span class="cx"> WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_WEBMETAL PRIVATE \
ON) </span><ins>+WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_WIRELESS_PLAYBACK_TARGET \
PRIVATE ON) </ins><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></span></pre></div>
<a id="trunkToolsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Tools/ChangeLog (239555 => 239556)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/ChangeLog	2018-12-27 04:01:23 UTC (rev 239555)
+++ trunk/Tools/ChangeLog	2018-12-27 16:13:47 UTC (rev 239556)
</span><span class="lines">@@ -1,3 +1,14 @@
</span><ins>+2018-12-27  Alex Christensen  &lt;achristensen@webkit.org&gt;
+
+        Resurrect Mac CMake build
+        https://bugs.webkit.org/show_bug.cgi?id=192658
+
+        Reviewed by Yusuke Suzuki.
+
+        * DumpRenderTree/PlatformMac.cmake:
+        * MiniBrowser/mac/CMakeLists.txt:
+        * TestWebKitAPI/PlatformMac.cmake:
+
</ins><span class="cx"> 2018-12-26  Adrian Perez de Castro  &lt;aperez@igalia.com&gt;
</span><span class="cx"> 
</span><span class="cx">         [Tools] Remove references to Bison and Flex
</span></span></pre></div>
<a id="trunkToolsDumpRenderTreePlatformMaccmake"></a>
<div class="modfile"><h4>Modified: trunk/Tools/DumpRenderTree/PlatformMac.cmake \
(239555 => 239556)</h4> <pre class="diff"><span>
<span class="info">--- trunk/Tools/DumpRenderTree/PlatformMac.cmake	2018-12-27 \
                04:01:23 UTC (rev 239555)
+++ trunk/Tools/DumpRenderTree/PlatformMac.cmake	2018-12-27 16:13:47 UTC (rev 239556)
</span><span class="lines">@@ -77,7 +77,6 @@
</span><span class="cx">     mac/DumpRenderTreeDraggingInfo.mm
</span><span class="cx">     mac/DumpRenderTreeMain.mm
</span><span class="cx">     mac/DumpRenderTreePasteboard.mm
</span><del>-    mac/DumpRenderTreeSpellChecker.mm
</del><span class="cx">     mac/DumpRenderTreeWindow.mm
</span><span class="cx">     mac/EditingDelegate.mm
</span><span class="cx">     mac/EventSendingController.mm
</span></span></pre></div>
<a id="trunkToolsMiniBrowsermacCMakeListstxt"></a>
<div class="modfile"><h4>Modified: trunk/Tools/MiniBrowser/mac/CMakeLists.txt (239555 \
=> 239556)</h4> <pre class="diff"><span>
<span class="info">--- trunk/Tools/MiniBrowser/mac/CMakeLists.txt	2018-12-27 04:01:23 \
                UTC (rev 239555)
+++ trunk/Tools/MiniBrowser/mac/CMakeLists.txt	2018-12-27 16:13:47 UTC (rev 239556)
</span><span class="lines">@@ -12,7 +12,6 @@
</span><span class="cx">     ${MINIBROWSER_DIR}/WK2BrowserWindowController.m
</span><span class="cx">     ${MINIBROWSER_DIR}/main.m
</span><span class="cx">     ${TOOLS_DIR}/MiniBrowser/MBToolbarItem.m
</span><del>-    ${TOOLS_DIR}/MiniBrowser/MiniBrowserWebProcessPlugIn.m
</del><span class="cx"> )
</span><span class="cx"> 
</span><span class="cx"> set(MiniBrowser_INCLUDE_DIRECTORIES
</span></span></pre></div>
<a id="trunkToolsTestWebKitAPIPlatformMaccmake"></a>
<div class="modfile"><h4>Modified: trunk/Tools/TestWebKitAPI/PlatformMac.cmake \
(239555 => 239556)</h4> <pre class="diff"><span>
<span class="info">--- trunk/Tools/TestWebKitAPI/PlatformMac.cmake	2018-12-27 \
                04:01:23 UTC (rev 239555)
+++ trunk/Tools/TestWebKitAPI/PlatformMac.cmake	2018-12-27 16:13:47 UTC (rev 239556)
</span><span class="lines">@@ -25,7 +25,6 @@
</span><span class="cx"> )
</span><span class="cx"> 
</span><span class="cx"> set(bundle_harness_SOURCES
</span><del>-    ${TESTWEBKITAPI_DIR}/cocoa/InstanceMethodSwizzler.mm
</del><span class="cx">     ${TESTWEBKITAPI_DIR}/cocoa/PlatformUtilitiesCocoa.mm
</span><span class="cx">     ${TESTWEBKITAPI_DIR}/cocoa/UtilitiesCocoa.mm
</span><span class="cx">     ${TESTWEBKITAPI_DIR}/mac/InjectedBundleControllerMac.mm
</span></span></pre>
</div>
</div>

</body>
</html>



_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes


[prev in list] [next in list] [prev in thread] [next in thread]

Configure | About | News | Add a list | Sponsored by KoreLogic