<!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>[213756] tags/Safari-604.1.9.1</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/213756">213756</a></dd>
<dt>Author</dt> <dd>bshafiei@apple.com</dd>
<dt>Date</dt> <dd>2017-03-11 00:38:51 -0800 (Sat, 11 Mar 2017)</dd>
</dl>
<h3>Log Message</h3>
<pre>Merged <a href="http://trac.webkit.org/projects/webkit/changeset/213752">r213752</a>. rdar://problem/30990870</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#tagsSafari604191SourceJavaScriptCoreChangeLog">tags/Safari-604.1.9.1/Source/JavaScriptCore/ChangeLog</a></li>
<li><a href="#tagsSafari604191SourceJavaScriptCoreConfigurationsFeatureDefinesxcconfig">tags/Safari-604.1.9.1/Source/JavaScriptCore/Configurations/FeatureDefines.xcconfig</a></li>
<li><a href="#tagsSafari604191SourceWebCoreChangeLog">tags/Safari-604.1.9.1/Source/WebCore/ChangeLog</a></li>
<li><a href="#tagsSafari604191SourceWebCoreConfigurationsFeatureDefinesxcconfig">tags/Safari-604.1.9.1/Source/WebCore/Configurations/FeatureDefines.xcconfig</a></li>
<li><a href="#tagsSafari604191SourceWebCorePALChangeLog">tags/Safari-604.1.9.1/Source/WebCore/PAL/ChangeLog</a></li>
<li><a href="#tagsSafari604191SourceWebCorePALConfigurationsFeatureDefinesxcconfig">tags/Safari-604.1.9.1/Source/WebCore/PAL/Configurations/FeatureDefines.xcconfig</a></li>
<li><a href="#tagsSafari604191SourceWebKitmacChangeLog">tags/Safari-604.1.9.1/Source/WebKit/mac/ChangeLog</a></li>
<li><a href="#tagsSafari604191SourceWebKitmacConfigurationsFeatureDefinesxcconfig">tags/Safari-604.1.9.1/Source/WebKit/mac/Configurations/FeatureDefines.xcconfig</a></li>
<li><a href="#tagsSafari604191SourceWebKit2ChangeLog">tags/Safari-604.1.9.1/Source/WebKit2/ChangeLog</a></li>
<li><a href="#tagsSafari604191SourceWebKit2ConfigurationsFeatureDefinesxcconfig">tags/Safari-604.1.9.1/Source/WebKit2/Configurations/FeatureDefines.xcconfig</a></li>
<li><a href="#tagsSafari604191ToolsChangeLog">tags/Safari-604.1.9.1/Tools/ChangeLog</a></li>
<li><a href="#tagsSafari604191ToolsTestWebKitAPIConfigurationsFeatureDefinesxcconfig">tags/Safari-604.1.9.1/Tools/TestWebKitAPI/Configurations/FeatureDefines.xcconfig</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="tagsSafari604191SourceJavaScriptCoreChangeLog"></a>
<div class="modfile"><h4>Modified: tags/Safari-604.1.9.1/Source/JavaScriptCore/ChangeLog (213755 => 213756)</h4>
<pre class="diff"><span>
<span class="info">--- tags/Safari-604.1.9.1/Source/JavaScriptCore/ChangeLog 2017-03-11 08:36:40 UTC (rev 213755)
+++ tags/Safari-604.1.9.1/Source/JavaScriptCore/ChangeLog 2017-03-11 08:38:51 UTC (rev 213756)
</span><span class="lines">@@ -1,3 +1,16 @@
</span><ins>+2017-03-11 Babak Shafiei <bshafiei@apple.com>
+
+ Merge r213752.
+
+ 2017-03-10 Alex Christensen <achristensen@webkit.org>
+
+ Fix watch and tv builds after r213294
+ https://bugs.webkit.org/show_bug.cgi?id=169508
+
+ Reviewed by Dan Bernstein.
+
+ * Configurations/FeatureDefines.xcconfig:
+
</ins><span class="cx"> 2017-03-07 Dean Jackson <dino@apple.com>
</span><span class="cx">
</span><span class="cx"> Some platforms won't be able to create a GPUDevice
</span><span class="lines">@@ -5642,8 +5655,8 @@
</span><span class="cx"> sum of the depths of its nodes, with a node's depth equal to the number
</span><span class="cx"> of frames in its associated call stack. For any stack trace,
</span><span class="cx">
</span><del>- S = { s𝟶, s𝟷, …, s𝑘 }, with endpoints s𝟶, s𝑘
- depth(S) = depth(s𝟶) + depth(s𝟷) + … + depth(s𝑘)
</del><ins>+ S = { sퟶ, sퟷ, …, s푘 }, with endpoints sퟶ, s푘
+ depth(S) = depth(sퟶ) + depth(sퟷ) + … + depth(s푘)
</ins><span class="cx">
</span><span class="cx"> A stack trace is truncated when it exceeds the maximum depth. Truncation
</span><span class="cx"> occurs on node boundaries, not call frames, consequently the maximum depth
</span><span class="lines">@@ -5650,7 +5663,7 @@
</span><span class="cx"> is more of a target than a guarantee:
</span><span class="cx">
</span><span class="cx"> d = maximum stack trace depth
</span><del>- for all S, depth(S) ≤ d + depth(s𝑘)
</del><ins>+ for all S, depth(S) ≤ d + depth(s푘)
</ins><span class="cx">
</span><span class="cx"> Because nodes can belong to multiple stack traces, it may be necessary
</span><span class="cx"> to clone the tail of a stack trace being truncated to prevent other traces
</span><span class="lines">@@ -5743,8 +5756,8 @@
</span><span class="cx"> sum of the depths of its nodes, with a node's depth equal to the number
</span><span class="cx"> of frames in its associated call stack. For any stack trace,
</span><span class="cx">
</span><del>- S = { s𝟶, s𝟷, …, s𝑘 }, with endpoints s𝟶, s𝑘
- depth(S) = depth(s𝟶) + depth(s𝟷) + … + depth(s𝑘)
</del><ins>+ S = { sퟶ, sퟷ, …, s푘 }, with endpoints sퟶ, s푘
+ depth(S) = depth(sퟶ) + depth(sퟷ) + … + depth(s푘)
</ins><span class="cx">
</span><span class="cx"> A stack trace is truncated when it exceeds the maximum depth. Truncation
</span><span class="cx"> occurs on node boundaries, not call frames, consequently the maximum depth
</span><span class="lines">@@ -5751,7 +5764,7 @@
</span><span class="cx"> is more of a target than a guarantee:
</span><span class="cx">
</span><span class="cx"> d = maximum stack trace depth
</span><del>- for all S, depth(S) ≤ d + depth(s𝑘)
</del><ins>+ for all S, depth(S) ≤ d + depth(s푘)
</ins><span class="cx">
</span><span class="cx"> Because nodes can belong to multiple stack traces, it may be necessary
</span><span class="cx"> to clone the tail of a stack trace being truncated to prevent other traces
</span></span></pre></div>
<a id="tagsSafari604191SourceJavaScriptCoreConfigurationsFeatureDefinesxcconfig"></a>
<div class="modfile"><h4>Modified: tags/Safari-604.1.9.1/Source/JavaScriptCore/Configurations/FeatureDefines.xcconfig (213755 => 213756)</h4>
<pre class="diff"><span>
<span class="info">--- tags/Safari-604.1.9.1/Source/JavaScriptCore/Configurations/FeatureDefines.xcconfig 2017-03-11 08:36:40 UTC (rev 213755)
+++ tags/Safari-604.1.9.1/Source/JavaScriptCore/Configurations/FeatureDefines.xcconfig 2017-03-11 08:38:51 UTC (rev 213756)
</span><span class="lines">@@ -164,6 +164,8 @@
</span><span class="cx"> ENABLE_SUBTLE_CRYPTO = ENABLE_SUBTLE_CRYPTO;
</span><span class="cx"> ENABLE_SVG_FONTS = ENABLE_SVG_FONTS;
</span><span class="cx">
</span><ins>+ENABLE_WEB_RTC[sdk=watch*] = ;
+ENABLE_WEB_RTC[sdk=appletv*] = ;
</ins><span class="cx"> ENABLE_WEB_RTC[sdk=iphone*] = $(ENABLE_WEB_RTC_ios);
</span><span class="cx"> ENABLE_WEB_RTC_ios[arch=arm64] = $(ENABLE_WEB_RTC_ios_$(IPHONEOS_DEPLOYMENT_TARGET:base))
</span><span class="cx"> ENABLE_WEB_RTC_ios[arch=x86_64] = $(ENABLE_WEB_RTC_ios_$(IPHONEOS_DEPLOYMENT_TARGET:base))
</span></span></pre></div>
<a id="tagsSafari604191SourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: tags/Safari-604.1.9.1/Source/WebCore/ChangeLog (213755 => 213756)</h4>
<pre class="diff"><span>
<span class="info">--- tags/Safari-604.1.9.1/Source/WebCore/ChangeLog 2017-03-11 08:36:40 UTC (rev 213755)
+++ tags/Safari-604.1.9.1/Source/WebCore/ChangeLog 2017-03-11 08:38:51 UTC (rev 213756)
</span><span class="lines">@@ -1,3 +1,16 @@
</span><ins>+2017-03-11 Babak Shafiei <bshafiei@apple.com>
+
+ Merge r213752.
+
+ 2017-03-10 Alex Christensen <achristensen@webkit.org>
+
+ Fix watch and tv builds after r213294
+ https://bugs.webkit.org/show_bug.cgi?id=169508
+
+ Reviewed by Dan Bernstein.
+
+ * Configurations/FeatureDefines.xcconfig:
+
</ins><span class="cx"> 2017-03-07 Simon Fraser <simon.fraser@apple.com>
</span><span class="cx">
</span><span class="cx"> Remove never-implemented CSS3 text decoration-related properties
</span></span></pre></div>
<a id="tagsSafari604191SourceWebCoreConfigurationsFeatureDefinesxcconfig"></a>
<div class="modfile"><h4>Modified: tags/Safari-604.1.9.1/Source/WebCore/Configurations/FeatureDefines.xcconfig (213755 => 213756)</h4>
<pre class="diff"><span>
<span class="info">--- tags/Safari-604.1.9.1/Source/WebCore/Configurations/FeatureDefines.xcconfig 2017-03-11 08:36:40 UTC (rev 213755)
+++ tags/Safari-604.1.9.1/Source/WebCore/Configurations/FeatureDefines.xcconfig 2017-03-11 08:38:51 UTC (rev 213756)
</span><span class="lines">@@ -164,6 +164,8 @@
</span><span class="cx"> ENABLE_SUBTLE_CRYPTO = ENABLE_SUBTLE_CRYPTO;
</span><span class="cx"> ENABLE_SVG_FONTS = ENABLE_SVG_FONTS;
</span><span class="cx">
</span><ins>+ENABLE_WEB_RTC[sdk=watch*] = ;
+ENABLE_WEB_RTC[sdk=appletv*] = ;
</ins><span class="cx"> ENABLE_WEB_RTC[sdk=iphone*] = $(ENABLE_WEB_RTC_ios);
</span><span class="cx"> ENABLE_WEB_RTC_ios[arch=arm64] = $(ENABLE_WEB_RTC_ios_$(IPHONEOS_DEPLOYMENT_TARGET:base))
</span><span class="cx"> ENABLE_WEB_RTC_ios[arch=x86_64] = $(ENABLE_WEB_RTC_ios_$(IPHONEOS_DEPLOYMENT_TARGET:base))
</span></span></pre></div>
<a id="tagsSafari604191SourceWebCorePALChangeLog"></a>
<div class="modfile"><h4>Modified: tags/Safari-604.1.9.1/Source/WebCore/PAL/ChangeLog (213755 => 213756)</h4>
<pre class="diff"><span>
<span class="info">--- tags/Safari-604.1.9.1/Source/WebCore/PAL/ChangeLog 2017-03-11 08:36:40 UTC (rev 213755)
+++ tags/Safari-604.1.9.1/Source/WebCore/PAL/ChangeLog 2017-03-11 08:38:51 UTC (rev 213756)
</span><span class="lines">@@ -1,3 +1,16 @@
</span><ins>+2017-03-11 Babak Shafiei <bshafiei@apple.com>
+
+ Merge r213752.
+
+ 2017-03-10 Alex Christensen <achristensen@webkit.org>
+
+ Fix watch and tv builds after r213294
+ https://bugs.webkit.org/show_bug.cgi?id=169508
+
+ Reviewed by Dan Bernstein.
+
+ * Configurations/FeatureDefines.xcconfig:
+
</ins><span class="cx"> 2017-03-07 Dean Jackson <dino@apple.com>
</span><span class="cx">
</span><span class="cx"> Some platforms won't be able to create a GPUDevice
</span></span></pre></div>
<a id="tagsSafari604191SourceWebCorePALConfigurationsFeatureDefinesxcconfig"></a>
<div class="modfile"><h4>Modified: tags/Safari-604.1.9.1/Source/WebCore/PAL/Configurations/FeatureDefines.xcconfig (213755 => 213756)</h4>
<pre class="diff"><span>
<span class="info">--- tags/Safari-604.1.9.1/Source/WebCore/PAL/Configurations/FeatureDefines.xcconfig 2017-03-11 08:36:40 UTC (rev 213755)
+++ tags/Safari-604.1.9.1/Source/WebCore/PAL/Configurations/FeatureDefines.xcconfig 2017-03-11 08:38:51 UTC (rev 213756)
</span><span class="lines">@@ -164,6 +164,8 @@
</span><span class="cx"> ENABLE_SUBTLE_CRYPTO = ENABLE_SUBTLE_CRYPTO;
</span><span class="cx"> ENABLE_SVG_FONTS = ENABLE_SVG_FONTS;
</span><span class="cx">
</span><ins>+ENABLE_WEB_RTC[sdk=watch*] = ;
+ENABLE_WEB_RTC[sdk=appletv*] = ;
</ins><span class="cx"> ENABLE_WEB_RTC[sdk=iphone*] = $(ENABLE_WEB_RTC_ios);
</span><span class="cx"> ENABLE_WEB_RTC_ios[arch=arm64] = $(ENABLE_WEB_RTC_ios_$(IPHONEOS_DEPLOYMENT_TARGET:base))
</span><span class="cx"> ENABLE_WEB_RTC_ios[arch=x86_64] = $(ENABLE_WEB_RTC_ios_$(IPHONEOS_DEPLOYMENT_TARGET:base))
</span></span></pre></div>
<a id="tagsSafari604191SourceWebKitmacChangeLog"></a>
<div class="modfile"><h4>Modified: tags/Safari-604.1.9.1/Source/WebKit/mac/ChangeLog (213755 => 213756)</h4>
<pre class="diff"><span>
<span class="info">--- tags/Safari-604.1.9.1/Source/WebKit/mac/ChangeLog 2017-03-11 08:36:40 UTC (rev 213755)
+++ tags/Safari-604.1.9.1/Source/WebKit/mac/ChangeLog 2017-03-11 08:38:51 UTC (rev 213756)
</span><span class="lines">@@ -1,3 +1,16 @@
</span><ins>+2017-03-11 Babak Shafiei <bshafiei@apple.com>
+
+ Merge r213752.
+
+ 2017-03-10 Alex Christensen <achristensen@webkit.org>
+
+ Fix watch and tv builds after r213294
+ https://bugs.webkit.org/show_bug.cgi?id=169508
+
+ Reviewed by Dan Bernstein.
+
+ * Configurations/FeatureDefines.xcconfig:
+
</ins><span class="cx"> 2017-03-09 Jason Marcell <jmarcell@apple.com>
</span><span class="cx">
</span><span class="cx"> Rollout r213557. rdar://problem/30955791
</span></span></pre></div>
<a id="tagsSafari604191SourceWebKitmacConfigurationsFeatureDefinesxcconfig"></a>
<div class="modfile"><h4>Modified: tags/Safari-604.1.9.1/Source/WebKit/mac/Configurations/FeatureDefines.xcconfig (213755 => 213756)</h4>
<pre class="diff"><span>
<span class="info">--- tags/Safari-604.1.9.1/Source/WebKit/mac/Configurations/FeatureDefines.xcconfig 2017-03-11 08:36:40 UTC (rev 213755)
+++ tags/Safari-604.1.9.1/Source/WebKit/mac/Configurations/FeatureDefines.xcconfig 2017-03-11 08:38:51 UTC (rev 213756)
</span><span class="lines">@@ -164,6 +164,8 @@
</span><span class="cx"> ENABLE_SUBTLE_CRYPTO = ENABLE_SUBTLE_CRYPTO;
</span><span class="cx"> ENABLE_SVG_FONTS = ENABLE_SVG_FONTS;
</span><span class="cx">
</span><ins>+ENABLE_WEB_RTC[sdk=watch*] = ;
+ENABLE_WEB_RTC[sdk=appletv*] = ;
</ins><span class="cx"> ENABLE_WEB_RTC[sdk=iphone*] = $(ENABLE_WEB_RTC_ios);
</span><span class="cx"> ENABLE_WEB_RTC_ios[arch=arm64] = $(ENABLE_WEB_RTC_ios_$(IPHONEOS_DEPLOYMENT_TARGET:base))
</span><span class="cx"> ENABLE_WEB_RTC_ios[arch=x86_64] = $(ENABLE_WEB_RTC_ios_$(IPHONEOS_DEPLOYMENT_TARGET:base))
</span></span></pre></div>
<a id="tagsSafari604191SourceWebKit2ChangeLog"></a>
<div class="modfile"><h4>Modified: tags/Safari-604.1.9.1/Source/WebKit2/ChangeLog (213755 => 213756)</h4>
<pre class="diff"><span>
<span class="info">--- tags/Safari-604.1.9.1/Source/WebKit2/ChangeLog 2017-03-11 08:36:40 UTC (rev 213755)
+++ tags/Safari-604.1.9.1/Source/WebKit2/ChangeLog 2017-03-11 08:38:51 UTC (rev 213756)
</span><span class="lines">@@ -1,3 +1,16 @@
</span><ins>+2017-03-11 Babak Shafiei <bshafiei@apple.com>
+
+ Merge r213752.
+
+ 2017-03-10 Alex Christensen <achristensen@webkit.org>
+
+ Fix watch and tv builds after r213294
+ https://bugs.webkit.org/show_bug.cgi?id=169508
+
+ Reviewed by Dan Bernstein.
+
+ * Configurations/FeatureDefines.xcconfig:
+
</ins><span class="cx"> 2017-03-09 Jason Marcell <jmarcell@apple.com>
</span><span class="cx">
</span><span class="cx"> Rollout r213557. rdar://problem/30955791
</span></span></pre></div>
<a id="tagsSafari604191SourceWebKit2ConfigurationsFeatureDefinesxcconfig"></a>
<div class="modfile"><h4>Modified: tags/Safari-604.1.9.1/Source/WebKit2/Configurations/FeatureDefines.xcconfig (213755 => 213756)</h4>
<pre class="diff"><span>
<span class="info">--- tags/Safari-604.1.9.1/Source/WebKit2/Configurations/FeatureDefines.xcconfig 2017-03-11 08:36:40 UTC (rev 213755)
+++ tags/Safari-604.1.9.1/Source/WebKit2/Configurations/FeatureDefines.xcconfig 2017-03-11 08:38:51 UTC (rev 213756)
</span><span class="lines">@@ -164,6 +164,8 @@
</span><span class="cx"> ENABLE_SUBTLE_CRYPTO = ENABLE_SUBTLE_CRYPTO;
</span><span class="cx"> ENABLE_SVG_FONTS = ENABLE_SVG_FONTS;
</span><span class="cx">
</span><ins>+ENABLE_WEB_RTC[sdk=watch*] = ;
+ENABLE_WEB_RTC[sdk=appletv*] = ;
</ins><span class="cx"> ENABLE_WEB_RTC[sdk=iphone*] = $(ENABLE_WEB_RTC_ios);
</span><span class="cx"> ENABLE_WEB_RTC_ios[arch=arm64] = $(ENABLE_WEB_RTC_ios_$(IPHONEOS_DEPLOYMENT_TARGET:base))
</span><span class="cx"> ENABLE_WEB_RTC_ios[arch=x86_64] = $(ENABLE_WEB_RTC_ios_$(IPHONEOS_DEPLOYMENT_TARGET:base))
</span></span></pre></div>
<a id="tagsSafari604191ToolsChangeLog"></a>
<div class="modfile"><h4>Modified: tags/Safari-604.1.9.1/Tools/ChangeLog (213755 => 213756)</h4>
<pre class="diff"><span>
<span class="info">--- tags/Safari-604.1.9.1/Tools/ChangeLog 2017-03-11 08:36:40 UTC (rev 213755)
+++ tags/Safari-604.1.9.1/Tools/ChangeLog 2017-03-11 08:38:51 UTC (rev 213756)
</span><span class="lines">@@ -1,3 +1,16 @@
</span><ins>+2017-03-11 Babak Shafiei <bshafiei@apple.com>
+
+ Merge r213752.
+
+ 2017-03-10 Alex Christensen <achristensen@webkit.org>
+
+ Fix watch and tv builds after r213294
+ https://bugs.webkit.org/show_bug.cgi?id=169508
+
+ Reviewed by Dan Bernstein.
+
+ * TestWebKitAPI/Configurations/FeatureDefines.xcconfig:
+
</ins><span class="cx"> 2017-03-07 Kocsen Chung <kocsen_chung@apple.com>
</span><span class="cx">
</span><span class="cx"> Perf and layout test results should report using correct scm revision.
</span></span></pre></div>
<a id="tagsSafari604191ToolsTestWebKitAPIConfigurationsFeatureDefinesxcconfig"></a>
<div class="modfile"><h4>Modified: tags/Safari-604.1.9.1/Tools/TestWebKitAPI/Configurations/FeatureDefines.xcconfig (213755 => 213756)</h4>
<pre class="diff"><span>
<span class="info">--- tags/Safari-604.1.9.1/Tools/TestWebKitAPI/Configurations/FeatureDefines.xcconfig 2017-03-11 08:36:40 UTC (rev 213755)
+++ tags/Safari-604.1.9.1/Tools/TestWebKitAPI/Configurations/FeatureDefines.xcconfig 2017-03-11 08:38:51 UTC (rev 213756)
</span><span class="lines">@@ -164,6 +164,8 @@
</span><span class="cx"> ENABLE_SUBTLE_CRYPTO = ENABLE_SUBTLE_CRYPTO;
</span><span class="cx"> ENABLE_SVG_FONTS = ENABLE_SVG_FONTS;
</span><span class="cx">
</span><ins>+ENABLE_WEB_RTC[sdk=watch*] = ;
+ENABLE_WEB_RTC[sdk=appletv*] = ;
</ins><span class="cx"> ENABLE_WEB_RTC[sdk=iphone*] = $(ENABLE_WEB_RTC_ios);
</span><span class="cx"> ENABLE_WEB_RTC_ios[arch=arm64] = $(ENABLE_WEB_RTC_ios_$(IPHONEOS_DEPLOYMENT_TARGET:base))
</span><span class="cx"> ENABLE_WEB_RTC_ios[arch=x86_64] = $(ENABLE_WEB_RTC_ios_$(IPHONEOS_DEPLOYMENT_TARGET:base))
</span></span></pre>
</div>
</div>
</body>
</html>