<!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>[209533] 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/209533">209533</a></dd>
<dt>Author</dt> <dd>achristensen@apple.com</dd>
<dt>Date</dt> <dd>2016-12-08 01:29:28 -0800 (Thu, 08 Dec 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>Fix CMake build.
Source/WebCore:
* PlatformMac.cmake:
Add PerformanceLoggingCocoa.mm after <a href="http://trac.webkit.org/projects/webkit/changeset/209181">r209181</a>.
Source/WebKit2:
* CMakeLists.txt:
Add the new NetworkProcess/capture include directory to find new headers from <a href="http://trac.webkit.org/projects/webkit/changeset/209498">r209498</a>.
* NetworkProcess/capture/NetworkCaptureEvent.cpp:
(WebKit::NetworkCapture::Response::Response):
(WebKit::NetworkCapture::Error::Error):
The String constructor was ambiguous after <a href="http://trac.webkit.org/projects/webkit/changeset/209498">r209498</a> because URL has an operator NSString* and String has an NSString constructor.
We should get rid of operator NSString* and operator String on URL.
* UIProcess/WebPageProxy.cpp:
* UIProcess/WebPageProxy.h:
Add some ENABLE(MEDIA_STREAM) macros to fix the build without it enabled after <a href="http://trac.webkit.org/projects/webkit/changeset/209512">r209512</a>.
Tools:
* DumpRenderTree/PlatformMac.cmake:
Remove CheckedMalloc.cpp after <a href="http://trac.webkit.org/projects/webkit/changeset/209516">r209516</a>.</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="#trunkSourceWebKit2CMakeListstxt">trunk/Source/WebKit2/CMakeLists.txt</a></li>
<li><a href="#trunkSourceWebKit2ChangeLog">trunk/Source/WebKit2/ChangeLog</a></li>
<li><a href="#trunkSourceWebKit2NetworkProcesscaptureNetworkCaptureEventcpp">trunk/Source/WebKit2/NetworkProcess/capture/NetworkCaptureEvent.cpp</a></li>
<li><a href="#trunkSourceWebKit2UIProcessWebPageProxycpp">trunk/Source/WebKit2/UIProcess/WebPageProxy.cpp</a></li>
<li><a href="#trunkSourceWebKit2UIProcessWebPageProxyh">trunk/Source/WebKit2/UIProcess/WebPageProxy.h</a></li>
<li><a href="#trunkToolsChangeLog">trunk/Tools/ChangeLog</a></li>
<li><a href="#trunkToolsDumpRenderTreePlatformMaccmake">trunk/Tools/DumpRenderTree/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 (209532 => 209533)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2016-12-08 09:04:29 UTC (rev 209532)
+++ trunk/Source/WebCore/ChangeLog 2016-12-08 09:29:28 UTC (rev 209533)
</span><span class="lines">@@ -1,3 +1,10 @@
</span><ins>+2016-12-08 Alex Christensen <achristensen@webkit.org>
+
+ Fix CMake build.
+
+ * PlatformMac.cmake:
+ Add PerformanceLoggingCocoa.mm after r209181.
+
</ins><span class="cx"> 2016-12-08 Per Arne Vollan <pvollan@apple.com>
</span><span class="cx">
</span><span class="cx"> [Win] Some versions of Cygwin Perl generate incorrect C++ code.
</span></span></pre></div>
<a id="trunkSourceWebCorePlatformMaccmake"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/PlatformMac.cmake (209532 => 209533)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/PlatformMac.cmake 2016-12-08 09:04:29 UTC (rev 209532)
+++ trunk/Source/WebCore/PlatformMac.cmake 2016-12-08 09:29:28 UTC (rev 209533)
</span><span class="lines">@@ -261,10 +261,11 @@
</span><span class="cx"> page/PageDebuggable.cpp
</span><span class="cx">
</span><span class="cx"> page/cocoa/MemoryReleaseCocoa.mm
</span><del>- page/cocoa/UserAgent.mm
</del><ins>+ page/cocoa/PerformanceLoggingCocoa.mm
</ins><span class="cx"> page/cocoa/ResourceUsageOverlayCocoa.mm
</span><span class="cx"> page/cocoa/ResourceUsageThreadCocoa.mm
</span><span class="cx"> page/cocoa/SettingsCocoa.mm
</span><ins>+ page/cocoa/UserAgent.mm
</ins><span class="cx">
</span><span class="cx"> page/mac/ChromeMac.mm
</span><span class="cx"> page/mac/DragControllerMac.mm
</span></span></pre></div>
<a id="trunkSourceWebKit2CMakeListstxt"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/CMakeLists.txt (209532 => 209533)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/CMakeLists.txt 2016-12-08 09:04:29 UTC (rev 209532)
+++ trunk/Source/WebKit2/CMakeLists.txt 2016-12-08 09:29:28 UTC (rev 209533)
</span><span class="lines">@@ -10,6 +10,7 @@
</span><span class="cx"> "${WEBKIT2_DIR}/NetworkProcess/Downloads"
</span><span class="cx"> "${WEBKIT2_DIR}/NetworkProcess/FileAPI"
</span><span class="cx"> "${WEBKIT2_DIR}/NetworkProcess/cache"
</span><ins>+ "${WEBKIT2_DIR}/NetworkProcess/capture"
</ins><span class="cx"> "${WEBKIT2_DIR}/Platform"
</span><span class="cx"> "${WEBKIT2_DIR}/Platform/IPC"
</span><span class="cx"> "${WEBKIT2_DIR}/PluginProcess"
</span></span></pre></div>
<a id="trunkSourceWebKit2ChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/ChangeLog (209532 => 209533)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/ChangeLog 2016-12-08 09:04:29 UTC (rev 209532)
+++ trunk/Source/WebKit2/ChangeLog 2016-12-08 09:29:28 UTC (rev 209533)
</span><span class="lines">@@ -1,5 +1,20 @@
</span><span class="cx"> 2016-12-08 Alex Christensen <achristensen@webkit.org>
</span><span class="cx">
</span><ins>+ Fix CMake build.
+
+ * CMakeLists.txt:
+ Add the new NetworkProcess/capture include directory to find new headers from r209498.
+ * NetworkProcess/capture/NetworkCaptureEvent.cpp:
+ (WebKit::NetworkCapture::Response::Response):
+ (WebKit::NetworkCapture::Error::Error):
+ The String constructor was ambiguous after r209498 because URL has an operator NSString* and String has an NSString constructor.
+ We should get rid of operator NSString* and operator String on URL.
+ * UIProcess/WebPageProxy.cpp:
+ * UIProcess/WebPageProxy.h:
+ Add some ENABLE(MEDIA_STREAM) macros to fix the build without it enabled after r209512.
+
+2016-12-08 Alex Christensen <achristensen@webkit.org>
+
</ins><span class="cx"> Fix iOS debug build after r209498
</span><span class="cx"> https://bugs.webkit.org/show_bug.cgi?id=164527
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebKit2NetworkProcesscaptureNetworkCaptureEventcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/NetworkProcess/capture/NetworkCaptureEvent.cpp (209532 => 209533)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/NetworkProcess/capture/NetworkCaptureEvent.cpp 2016-12-08 09:04:29 UTC (rev 209532)
+++ trunk/Source/WebKit2/NetworkProcess/capture/NetworkCaptureEvent.cpp 2016-12-08 09:29:28 UTC (rev 209533)
</span><span class="lines">@@ -103,7 +103,7 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> Response::Response(const WebCore::ResourceResponse& response)
</span><del>- : url(response.url())
</del><ins>+ : url(response.url().string())
</ins><span class="cx"> , mimeType(response.mimeType())
</span><span class="cx"> , expectedLength(response.expectedContentLength())
</span><span class="cx"> , textEncodingName(response.textEncodingName())
</span><span class="lines">@@ -141,7 +141,7 @@
</span><span class="cx">
</span><span class="cx"> Error::Error(const WebCore::ResourceError& error)
</span><span class="cx"> : domain(error.domain())
</span><del>- , failingURL(error.failingURL())
</del><ins>+ , failingURL(error.failingURL().string())
</ins><span class="cx"> , localizedDescription(error.localizedDescription())
</span><span class="cx"> , errorCode(error.errorCode())
</span><span class="cx"> , type(static_cast<int>(error.type()))
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessWebPageProxycpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/WebPageProxy.cpp (209532 => 209533)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/WebPageProxy.cpp 2016-12-08 09:04:29 UTC (rev 209532)
+++ trunk/Source/WebKit2/UIProcess/WebPageProxy.cpp 2016-12-08 09:29:28 UTC (rev 209533)
</span><span class="lines">@@ -5692,6 +5692,7 @@
</span><span class="cx"> request->deny();
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+#if ENABLE(MEDIA_STREAM)
</ins><span class="cx"> UserMediaPermissionRequestManagerProxy& WebPageProxy::userMediaPermissionRequestManager()
</span><span class="cx"> {
</span><span class="cx"> if (m_userMediaPermissionRequestManager)
</span><span class="lines">@@ -5700,6 +5701,7 @@
</span><span class="cx"> m_userMediaPermissionRequestManager = std::make_unique<UserMediaPermissionRequestManagerProxy>(*this);
</span><span class="cx"> return *m_userMediaPermissionRequestManager;
</span><span class="cx"> }
</span><ins>+#endif
</ins><span class="cx">
</span><span class="cx"> void WebPageProxy::requestUserMediaPermissionForFrame(uint64_t userMediaID, uint64_t frameID, String userMediaDocumentOriginIdentifier, String topLevelDocumentOriginIdentifier, const WebCore::MediaConstraintsData& audioConstraintsData, const WebCore::MediaConstraintsData& videoConstraintsData)
</span><span class="cx"> {
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessWebPageProxyh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/WebPageProxy.h (209532 => 209533)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/WebPageProxy.h 2016-12-08 09:04:29 UTC (rev 209532)
+++ trunk/Source/WebKit2/UIProcess/WebPageProxy.h 2016-12-08 09:29:28 UTC (rev 209533)
</span><span class="lines">@@ -1297,7 +1297,9 @@
</span><span class="cx"> void reachedApplicationCacheOriginQuota(const String& originIdentifier, uint64_t currentQuota, uint64_t totalBytesNeeded, PassRefPtr<Messages::WebPageProxy::ReachedApplicationCacheOriginQuota::DelayedReply>);
</span><span class="cx"> void requestGeolocationPermissionForFrame(uint64_t geolocationID, uint64_t frameID, String originIdentifier);
</span><span class="cx">
</span><ins>+#if ENABLE(MEDIA_STREAM)
</ins><span class="cx"> UserMediaPermissionRequestManagerProxy& userMediaPermissionRequestManager();
</span><ins>+#endif
</ins><span class="cx"> void requestUserMediaPermissionForFrame(uint64_t userMediaID, uint64_t frameID, String userMediaDocumentOriginIdentifier, String topLevelDocumentOriginIdentifier, const WebCore::MediaConstraintsData& audioConstraints, const WebCore::MediaConstraintsData& videoConstraints);
</span><span class="cx"> void enumerateMediaDevicesForFrame(uint64_t userMediaID, uint64_t frameID, String userMediaDocumentOriginIdentifier, String topLevelDocumentOriginIdentifier);
</span><span class="cx">
</span></span></pre></div>
<a id="trunkToolsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Tools/ChangeLog (209532 => 209533)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/ChangeLog 2016-12-08 09:04:29 UTC (rev 209532)
+++ trunk/Tools/ChangeLog 2016-12-08 09:29:28 UTC (rev 209533)
</span><span class="lines">@@ -1,3 +1,10 @@
</span><ins>+2016-12-08 Alex Christensen <achristensen@webkit.org>
+
+ Fix CMake build.
+
+ * DumpRenderTree/PlatformMac.cmake:
+ Remove CheckedMalloc.cpp after r209516.
+
</ins><span class="cx"> 2016-12-07 Mark Lam <mark.lam@apple.com>
</span><span class="cx">
</span><span class="cx"> DumpRenderTree should stop using CheckedMalloc.
</span></span></pre></div>
<a id="trunkToolsDumpRenderTreePlatformMaccmake"></a>
<div class="modfile"><h4>Modified: trunk/Tools/DumpRenderTree/PlatformMac.cmake (209532 => 209533)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/DumpRenderTree/PlatformMac.cmake 2016-12-08 09:04:29 UTC (rev 209532)
+++ trunk/Tools/DumpRenderTree/PlatformMac.cmake 2016-12-08 09:29:28 UTC (rev 209533)
</span><span class="lines">@@ -83,8 +83,6 @@
</span><span class="cx"> cf/WebArchiveDumpSupport.cpp
</span><span class="cx">
</span><span class="cx"> cg/PixelDumpSupportCG.cpp
</span><del>-
- mac/CheckedMalloc.cpp
</del><span class="cx"> )
</span><span class="cx">
</span><span class="cx"> list(APPEND DumpRenderTree_ObjCpp_SOURCES
</span></span></pre>
</div>
</div>
</body>
</html>