<!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>[209985] branches/safari-603-branch</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/209985">209985</a></dd>
<dt>Author</dt> <dd>bshafiei@apple.com</dd>
<dt>Date</dt> <dd>2016-12-19 09:31:55 -0800 (Mon, 19 Dec 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>Merge patch for rdar://problem/29466493.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#branchessafari603branchSourceJavaScriptCoreChangeLog">branches/safari-603-branch/Source/JavaScriptCore/ChangeLog</a></li>
<li><a href="#branchessafari603branchSourceJavaScriptCoreConfigurationsFeatureDefinesxcconfig">branches/safari-603-branch/Source/JavaScriptCore/Configurations/FeatureDefines.xcconfig</a></li>
<li><a href="#branchessafari603branchSourceWTFChangeLog">branches/safari-603-branch/Source/WTF/ChangeLog</a></li>
<li><a href="#branchessafari603branchSourceWTFwtfFeatureDefinesh">branches/safari-603-branch/Source/WTF/wtf/FeatureDefines.h</a></li>
<li><a href="#branchessafari603branchSourceWebCoreChangeLog">branches/safari-603-branch/Source/WebCore/ChangeLog</a></li>
<li><a href="#branchessafari603branchSourceWebCoreConfigurationsFeatureDefinesxcconfig">branches/safari-603-branch/Source/WebCore/Configurations/FeatureDefines.xcconfig</a></li>
<li><a href="#branchessafari603branchSourceWebKitmacChangeLog">branches/safari-603-branch/Source/WebKit/mac/ChangeLog</a></li>
<li><a href="#branchessafari603branchSourceWebKitmacConfigurationsFeatureDefinesxcconfig">branches/safari-603-branch/Source/WebKit/mac/Configurations/FeatureDefines.xcconfig</a></li>
<li><a href="#branchessafari603branchSourceWebKit2ChangeLog">branches/safari-603-branch/Source/WebKit2/ChangeLog</a></li>
<li><a href="#branchessafari603branchSourceWebKit2ConfigurationsFeatureDefinesxcconfig">branches/safari-603-branch/Source/WebKit2/Configurations/FeatureDefines.xcconfig</a></li>
<li><a href="#branchessafari603branchSourceWebKit2SharedWebPreferencesDefinitionsh">branches/safari-603-branch/Source/WebKit2/Shared/WebPreferencesDefinitions.h</a></li>
<li><a href="#branchessafari603branchToolsChangeLog">branches/safari-603-branch/Tools/ChangeLog</a></li>
<li><a href="#branchessafari603branchToolsTestWebKitAPIConfigurationsFeatureDefinesxcconfig">branches/safari-603-branch/Tools/TestWebKitAPI/Configurations/FeatureDefines.xcconfig</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="branchessafari603branchSourceJavaScriptCoreChangeLog"></a>
<div class="modfile"><h4>Modified: branches/safari-603-branch/Source/JavaScriptCore/ChangeLog (209984 => 209985)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-603-branch/Source/JavaScriptCore/ChangeLog 2016-12-19 17:11:29 UTC (rev 209984)
+++ branches/safari-603-branch/Source/JavaScriptCore/ChangeLog 2016-12-19 17:31:55 UTC (rev 209985)
</span><span class="lines">@@ -1,3 +1,19 @@
</span><ins>+2016-12-19 Babak Shafiei <bshafiei@apple.com>
+
+ Merge patch for rdar://problem/29466493.
+
+ 2016-12-19 Dean Jackson <dino@apple.com>
+
+ Disable some features on the safari-603-branch.
+ <rdar://problem/29466493>
+
+ - Force the default state of experimental features to off.
+ - Move some experimental features that should be enabled on this
+ branch into the general feature list, so they can't be disabled.
+ - Disable some features that are not ready.
+
+ * Configurations/FeatureDefines.xcconfig:
+
</ins><span class="cx"> 2016-12-18 Mark Lam <mark.lam@apple.com>
</span><span class="cx">
</span><span class="cx"> Rename finallyActionRegister to completionTypeRegister and only store int JSValues in it.
</span></span></pre></div>
<a id="branchessafari603branchSourceJavaScriptCoreConfigurationsFeatureDefinesxcconfig"></a>
<div class="modfile"><h4>Modified: branches/safari-603-branch/Source/JavaScriptCore/Configurations/FeatureDefines.xcconfig (209984 => 209985)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-603-branch/Source/JavaScriptCore/Configurations/FeatureDefines.xcconfig 2016-12-19 17:11:29 UTC (rev 209984)
+++ branches/safari-603-branch/Source/JavaScriptCore/Configurations/FeatureDefines.xcconfig 2016-12-19 17:31:55 UTC (rev 209985)
</span><span class="lines">@@ -62,7 +62,7 @@
</span><span class="cx"> ENABLE_CONTENT_FILTERING[sdk=iphone*] = ENABLE_CONTENT_FILTERING;
</span><span class="cx"> ENABLE_CONTENT_FILTERING[sdk=macosx*] = ENABLE_CONTENT_FILTERING;
</span><span class="cx"> ENABLE_CSP_NEXT = ;
</span><del>-ENABLE_CSS_ANIMATIONS_LEVEL_2 = ENABLE_CSS_ANIMATIONS_LEVEL_2;
</del><ins>+ENABLE_CSS_ANIMATIONS_LEVEL_2 = ;
</ins><span class="cx"> ENABLE_CSS_BOX_DECORATION_BREAK = ENABLE_CSS_BOX_DECORATION_BREAK;
</span><span class="cx"> ENABLE_CSS_COMPOSITING = ENABLE_CSS_COMPOSITING;
</span><span class="cx"> ENABLE_CSS_DEVICE_ADAPTATION = ;
</span><span class="lines">@@ -70,7 +70,7 @@
</span><span class="cx"> ENABLE_CSS_IMAGE_ORIENTATION = ;
</span><span class="cx"> ENABLE_CSS_IMAGE_RESOLUTION = ;
</span><span class="cx"> ENABLE_CSS_REGIONS = ENABLE_CSS_REGIONS;
</span><del>-ENABLE_CSS_SELECTORS_LEVEL4 = ENABLE_CSS_SELECTORS_LEVEL4;
</del><ins>+ENABLE_CSS_SELECTORS_LEVEL4 = ;
</ins><span class="cx"> ENABLE_CSS3_TEXT = ;
</span><span class="cx"> ENABLE_CURSOR_VISIBILITY = ENABLE_CURSOR_VISIBILITY;
</span><span class="cx"> ENABLE_CUSTOM_SCHEME_HANDLER = ;
</span><span class="lines">@@ -92,9 +92,9 @@
</span><span class="cx"> ENABLE_SERVICE_CONTROLS[sdk=macosx*] = ENABLE_SERVICE_CONTROLS;
</span><span class="cx"> ENABLE_INDEXED_DATABASE = ENABLE_INDEXED_DATABASE;
</span><span class="cx"> ENABLE_INDEXED_DATABASE_IN_WORKERS = ENABLE_INDEXED_DATABASE_IN_WORKERS;
</span><del>-ENABLE_INDIE_UI = ENABLE_INDIE_UI;
-ENABLE_INPUT_TYPE_COLOR[sdk=macosx*] = ENABLE_INPUT_TYPE_COLOR;
-ENABLE_INPUT_TYPE_COLOR_POPOVER[sdk=macosx*] = ENABLE_INPUT_TYPE_COLOR_POPOVER;
</del><ins>+ENABLE_INDIE_UI = ;
+ENABLE_INPUT_TYPE_COLOR[sdk=macosx*] = ;
+ENABLE_INPUT_TYPE_COLOR_POPOVER[sdk=macosx*] = ;
</ins><span class="cx"> ENABLE_INPUT_TYPE_DATE[sdk=iphone*] = ENABLE_INPUT_TYPE_DATE;
</span><span class="cx"> ENABLE_INPUT_TYPE_DATETIME_INCOMPLETE = ;
</span><span class="cx"> ENABLE_INPUT_TYPE_DATETIMELOCAL[sdk=iphone*] = ENABLE_INPUT_TYPE_DATETIMELOCAL;
</span><span class="lines">@@ -141,7 +141,7 @@
</span><span class="cx"> ENABLE_MEDIA_SOURCE[sdk=macosx*] = ENABLE_MEDIA_SOURCE;
</span><span class="cx">
</span><span class="cx"> ENABLE_MEDIA_STATISTICS = ;
</span><del>-ENABLE_MEDIA_STREAM = ENABLE_MEDIA_STREAM;
</del><ins>+ENABLE_MEDIA_STREAM = ;
</ins><span class="cx"> ENABLE_METER_ELEMENT = ENABLE_METER_ELEMENT;
</span><span class="cx"> ENABLE_MHTML = ;
</span><span class="cx"> ENABLE_MOUSE_CURSOR_SCALE[sdk=macosx*] = ENABLE_MOUSE_CURSOR_SCALE;
</span><span class="lines">@@ -166,7 +166,7 @@
</span><span class="cx"> ENABLE_SPEECH_SYNTHESIS = ENABLE_SPEECH_SYNTHESIS;
</span><span class="cx"> ENABLE_SUBTLE_CRYPTO = ENABLE_SUBTLE_CRYPTO;
</span><span class="cx"> ENABLE_SVG_FONTS = ENABLE_SVG_FONTS;
</span><del>-ENABLE_WEB_RTC = ENABLE_WEB_RTC;
</del><ins>+ENABLE_WEB_RTC = ;
</ins><span class="cx"> ENABLE_WRITABLE_STREAM_API = ENABLE_WRITABLE_STREAM_API;
</span><span class="cx">
</span><span class="cx"> ENABLE_TELEPHONE_NUMBER_DETECTION = ENABLE_TELEPHONE_NUMBER_DETECTION;
</span><span class="lines">@@ -191,11 +191,11 @@
</span><span class="cx"> ENABLE_WEBASSEMBLY = ;
</span><span class="cx"> ENABLE_WEBGL = ENABLE_WEBGL;
</span><span class="cx"> ENABLE_WEBGL2 = ENABLE_WEBGL2;
</span><del>-ENABLE_WEB_ANIMATIONS = ENABLE_WEB_ANIMATIONS;
</del><ins>+ENABLE_WEB_ANIMATIONS = ;
</ins><span class="cx"> ENABLE_WEB_AUDIO = ENABLE_WEB_AUDIO;
</span><span class="cx"> ENABLE_WEB_REPLAY = $(ENABLE_WEB_REPLAY_$(PLATFORM_NAME)_$(CONFIGURATION));
</span><del>-ENABLE_WEB_REPLAY_macosx_Debug = ENABLE_WEB_REPLAY;
-ENABLE_WEB_REPLAY_macosx_Release = ENABLE_WEB_REPLAY;
</del><ins>+ENABLE_WEB_REPLAY_macosx_Debug = ;
+ENABLE_WEB_REPLAY_macosx_Release = ;
</ins><span class="cx"> ENABLE_WEB_SOCKETS = ENABLE_WEB_SOCKETS;
</span><span class="cx">
</span><span class="cx"> ENABLE_WEB_TIMING = ENABLE_WEB_TIMING;
</span></span></pre></div>
<a id="branchessafari603branchSourceWTFChangeLog"></a>
<div class="modfile"><h4>Modified: branches/safari-603-branch/Source/WTF/ChangeLog (209984 => 209985)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-603-branch/Source/WTF/ChangeLog 2016-12-19 17:11:29 UTC (rev 209984)
+++ branches/safari-603-branch/Source/WTF/ChangeLog 2016-12-19 17:31:55 UTC (rev 209985)
</span><span class="lines">@@ -1,3 +1,19 @@
</span><ins>+2016-12-19 Babak Shafiei <bshafiei@apple.com>
+
+ Merge patch for rdar://problem/29466493.
+
+ 2016-12-19 Dean Jackson <dino@apple.com>
+
+ Disable some features on the safari-603-branch.
+ <rdar://problem/29466493>
+
+ - Force the default state of experimental features to off.
+ - Move some experimental features that should be enabled on this
+ branch into the general feature list, so they can't be disabled.
+ - Disable some features that are not ready.
+
+ * wtf/FeatureDefines.h:
+
</ins><span class="cx"> 2016-12-16 Mark Lam <mark.lam@apple.com>
</span><span class="cx">
</span><span class="cx"> Add predecessor info to dumps from JSC_dumpBytecodeLivenessResults=true.
</span></span></pre></div>
<a id="branchessafari603branchSourceWTFwtfFeatureDefinesh"></a>
<div class="modfile"><h4>Modified: branches/safari-603-branch/Source/WTF/wtf/FeatureDefines.h (209984 => 209985)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-603-branch/Source/WTF/wtf/FeatureDefines.h 2016-12-19 17:11:29 UTC (rev 209984)
+++ branches/safari-603-branch/Source/WTF/wtf/FeatureDefines.h 2016-12-19 17:31:55 UTC (rev 209985)
</span><span class="lines">@@ -228,11 +228,11 @@
</span><span class="cx"> #endif
</span><span class="cx">
</span><span class="cx"> #if !defined(ENABLE_INPUT_TYPE_COLOR)
</span><del>-#define ENABLE_INPUT_TYPE_COLOR 1
</del><ins>+#define ENABLE_INPUT_TYPE_COLOR 0
</ins><span class="cx"> #endif
</span><span class="cx">
</span><span class="cx"> #if !defined(ENABLE_INPUT_TYPE_COLOR_POPOVER)
</span><del>-#define ENABLE_INPUT_TYPE_COLOR_POPOVER 1
</del><ins>+#define ENABLE_INPUT_TYPE_COLOR_POPOVER 0
</ins><span class="cx"> #endif
</span><span class="cx">
</span><span class="cx"> #if !defined(ENABLE_FILE_REPLACEMENT)
</span><span class="lines">@@ -600,7 +600,7 @@
</span><span class="cx"> #endif
</span><span class="cx">
</span><span class="cx"> #if !defined(ENABLE_NAVIGATOR_HWCONCURRENCY)
</span><del>-#define ENABLE_NAVIGATOR_HWCONCURRENCY 1
</del><ins>+#define ENABLE_NAVIGATOR_HWCONCURRENCY 0
</ins><span class="cx"> #endif
</span><span class="cx">
</span><span class="cx"> #if !defined(ENABLE_NETSCAPE_PLUGIN_API)
</span><span class="lines">@@ -769,7 +769,7 @@
</span><span class="cx"> #endif
</span><span class="cx">
</span><span class="cx"> #if !defined(ENABLE_WILL_REVEAL_EDGE_EVENTS)
</span><del>-#define ENABLE_WILL_REVEAL_EDGE_EVENTS 1
</del><ins>+#define ENABLE_WILL_REVEAL_EDGE_EVENTS 0
</ins><span class="cx"> #endif
</span><span class="cx">
</span><span class="cx"> #if !defined(ENABLE_XSLT)
</span></span></pre></div>
<a id="branchessafari603branchSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: branches/safari-603-branch/Source/WebCore/ChangeLog (209984 => 209985)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-603-branch/Source/WebCore/ChangeLog 2016-12-19 17:11:29 UTC (rev 209984)
+++ branches/safari-603-branch/Source/WebCore/ChangeLog 2016-12-19 17:31:55 UTC (rev 209985)
</span><span class="lines">@@ -1,3 +1,19 @@
</span><ins>+2016-12-19 Babak Shafiei <bshafiei@apple.com>
+
+ Merge patch for rdar://problem/29466493.
+
+ 2016-12-19 Dean Jackson <dino@apple.com>
+
+ Disable some features on the safari-603-branch.
+ <rdar://problem/29466493>
+
+ - Force the default state of experimental features to off.
+ - Move some experimental features that should be enabled on this
+ branch into the general feature list, so they can't be disabled.
+ - Disable some features that are not ready.
+
+ * Configurations/FeatureDefines.xcconfig:
+
</ins><span class="cx"> 2016-12-18 Brady Eidson <beidson@apple.com>
</span><span class="cx">
</span><span class="cx"> IndexedDB 2.0: Prefetch cursor records in the server.
</span></span></pre></div>
<a id="branchessafari603branchSourceWebCoreConfigurationsFeatureDefinesxcconfig"></a>
<div class="modfile"><h4>Modified: branches/safari-603-branch/Source/WebCore/Configurations/FeatureDefines.xcconfig (209984 => 209985)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-603-branch/Source/WebCore/Configurations/FeatureDefines.xcconfig 2016-12-19 17:11:29 UTC (rev 209984)
+++ branches/safari-603-branch/Source/WebCore/Configurations/FeatureDefines.xcconfig 2016-12-19 17:31:55 UTC (rev 209985)
</span><span class="lines">@@ -62,7 +62,7 @@
</span><span class="cx"> ENABLE_CONTENT_FILTERING[sdk=iphone*] = ENABLE_CONTENT_FILTERING;
</span><span class="cx"> ENABLE_CONTENT_FILTERING[sdk=macosx*] = ENABLE_CONTENT_FILTERING;
</span><span class="cx"> ENABLE_CSP_NEXT = ;
</span><del>-ENABLE_CSS_ANIMATIONS_LEVEL_2 = ENABLE_CSS_ANIMATIONS_LEVEL_2;
</del><ins>+ENABLE_CSS_ANIMATIONS_LEVEL_2 = ;
</ins><span class="cx"> ENABLE_CSS_BOX_DECORATION_BREAK = ENABLE_CSS_BOX_DECORATION_BREAK;
</span><span class="cx"> ENABLE_CSS_COMPOSITING = ENABLE_CSS_COMPOSITING;
</span><span class="cx"> ENABLE_CSS_DEVICE_ADAPTATION = ;
</span><span class="lines">@@ -70,7 +70,7 @@
</span><span class="cx"> ENABLE_CSS_IMAGE_ORIENTATION = ;
</span><span class="cx"> ENABLE_CSS_IMAGE_RESOLUTION = ;
</span><span class="cx"> ENABLE_CSS_REGIONS = ENABLE_CSS_REGIONS;
</span><del>-ENABLE_CSS_SELECTORS_LEVEL4 = ENABLE_CSS_SELECTORS_LEVEL4;
</del><ins>+ENABLE_CSS_SELECTORS_LEVEL4 = ;
</ins><span class="cx"> ENABLE_CSS3_TEXT = ;
</span><span class="cx"> ENABLE_CURSOR_VISIBILITY = ENABLE_CURSOR_VISIBILITY;
</span><span class="cx"> ENABLE_CUSTOM_SCHEME_HANDLER = ;
</span><span class="lines">@@ -92,9 +92,9 @@
</span><span class="cx"> ENABLE_SERVICE_CONTROLS[sdk=macosx*] = ENABLE_SERVICE_CONTROLS;
</span><span class="cx"> ENABLE_INDEXED_DATABASE = ENABLE_INDEXED_DATABASE;
</span><span class="cx"> ENABLE_INDEXED_DATABASE_IN_WORKERS = ENABLE_INDEXED_DATABASE_IN_WORKERS;
</span><del>-ENABLE_INDIE_UI = ENABLE_INDIE_UI;
-ENABLE_INPUT_TYPE_COLOR[sdk=macosx*] = ENABLE_INPUT_TYPE_COLOR;
-ENABLE_INPUT_TYPE_COLOR_POPOVER[sdk=macosx*] = ENABLE_INPUT_TYPE_COLOR_POPOVER;
</del><ins>+ENABLE_INDIE_UI = ;
+ENABLE_INPUT_TYPE_COLOR[sdk=macosx*] = ;
+ENABLE_INPUT_TYPE_COLOR_POPOVER[sdk=macosx*] = ;
</ins><span class="cx"> ENABLE_INPUT_TYPE_DATE[sdk=iphone*] = ENABLE_INPUT_TYPE_DATE;
</span><span class="cx"> ENABLE_INPUT_TYPE_DATETIME_INCOMPLETE = ;
</span><span class="cx"> ENABLE_INPUT_TYPE_DATETIMELOCAL[sdk=iphone*] = ENABLE_INPUT_TYPE_DATETIMELOCAL;
</span><span class="lines">@@ -141,7 +141,7 @@
</span><span class="cx"> ENABLE_MEDIA_SOURCE[sdk=macosx*] = ENABLE_MEDIA_SOURCE;
</span><span class="cx">
</span><span class="cx"> ENABLE_MEDIA_STATISTICS = ;
</span><del>-ENABLE_MEDIA_STREAM = ENABLE_MEDIA_STREAM;
</del><ins>+ENABLE_MEDIA_STREAM = ;
</ins><span class="cx"> ENABLE_METER_ELEMENT = ENABLE_METER_ELEMENT;
</span><span class="cx"> ENABLE_MHTML = ;
</span><span class="cx"> ENABLE_MOUSE_CURSOR_SCALE[sdk=macosx*] = ENABLE_MOUSE_CURSOR_SCALE;
</span><span class="lines">@@ -166,7 +166,7 @@
</span><span class="cx"> ENABLE_SPEECH_SYNTHESIS = ENABLE_SPEECH_SYNTHESIS;
</span><span class="cx"> ENABLE_SUBTLE_CRYPTO = ENABLE_SUBTLE_CRYPTO;
</span><span class="cx"> ENABLE_SVG_FONTS = ENABLE_SVG_FONTS;
</span><del>-ENABLE_WEB_RTC = ENABLE_WEB_RTC;
</del><ins>+ENABLE_WEB_RTC = ;
</ins><span class="cx"> ENABLE_WRITABLE_STREAM_API = ENABLE_WRITABLE_STREAM_API;
</span><span class="cx">
</span><span class="cx"> ENABLE_TELEPHONE_NUMBER_DETECTION = ENABLE_TELEPHONE_NUMBER_DETECTION;
</span><span class="lines">@@ -191,11 +191,11 @@
</span><span class="cx"> ENABLE_WEBASSEMBLY = ;
</span><span class="cx"> ENABLE_WEBGL = ENABLE_WEBGL;
</span><span class="cx"> ENABLE_WEBGL2 = ENABLE_WEBGL2;
</span><del>-ENABLE_WEB_ANIMATIONS = ENABLE_WEB_ANIMATIONS;
</del><ins>+ENABLE_WEB_ANIMATIONS = ;
</ins><span class="cx"> ENABLE_WEB_AUDIO = ENABLE_WEB_AUDIO;
</span><span class="cx"> ENABLE_WEB_REPLAY = $(ENABLE_WEB_REPLAY_$(PLATFORM_NAME)_$(CONFIGURATION));
</span><del>-ENABLE_WEB_REPLAY_macosx_Debug = ENABLE_WEB_REPLAY;
-ENABLE_WEB_REPLAY_macosx_Release = ENABLE_WEB_REPLAY;
</del><ins>+ENABLE_WEB_REPLAY_macosx_Debug = ;
+ENABLE_WEB_REPLAY_macosx_Release = ;
</ins><span class="cx"> ENABLE_WEB_SOCKETS = ENABLE_WEB_SOCKETS;
</span><span class="cx">
</span><span class="cx"> ENABLE_WEB_TIMING = ENABLE_WEB_TIMING;
</span></span></pre></div>
<a id="branchessafari603branchSourceWebKitmacChangeLog"></a>
<div class="modfile"><h4>Modified: branches/safari-603-branch/Source/WebKit/mac/ChangeLog (209984 => 209985)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-603-branch/Source/WebKit/mac/ChangeLog 2016-12-19 17:11:29 UTC (rev 209984)
+++ branches/safari-603-branch/Source/WebKit/mac/ChangeLog 2016-12-19 17:31:55 UTC (rev 209985)
</span><span class="lines">@@ -1,3 +1,19 @@
</span><ins>+2016-12-19 Babak Shafiei <bshafiei@apple.com>
+
+ Merge patch for rdar://problem/29466493.
+
+ 2016-12-19 Dean Jackson <dino@apple.com>
+
+ Disable some features on the safari-603-branch.
+ <rdar://problem/29466493>
+
+ - Force the default state of experimental features to off.
+ - Move some experimental features that should be enabled on this
+ branch into the general feature list, so they can't be disabled.
+ - Disable some features that are not ready.
+
+ * Configurations/FeatureDefines.xcconfig:
+
</ins><span class="cx"> 2016-12-16 Dave Hyatt <hyatt@apple.com>
</span><span class="cx">
</span><span class="cx"> [CSS Values] Make separate wrapper classes for the deprecated CSS Values OM
</span></span></pre></div>
<a id="branchessafari603branchSourceWebKitmacConfigurationsFeatureDefinesxcconfig"></a>
<div class="modfile"><h4>Modified: branches/safari-603-branch/Source/WebKit/mac/Configurations/FeatureDefines.xcconfig (209984 => 209985)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-603-branch/Source/WebKit/mac/Configurations/FeatureDefines.xcconfig 2016-12-19 17:11:29 UTC (rev 209984)
+++ branches/safari-603-branch/Source/WebKit/mac/Configurations/FeatureDefines.xcconfig 2016-12-19 17:31:55 UTC (rev 209985)
</span><span class="lines">@@ -62,7 +62,7 @@
</span><span class="cx"> ENABLE_CONTENT_FILTERING[sdk=iphone*] = ENABLE_CONTENT_FILTERING;
</span><span class="cx"> ENABLE_CONTENT_FILTERING[sdk=macosx*] = ENABLE_CONTENT_FILTERING;
</span><span class="cx"> ENABLE_CSP_NEXT = ;
</span><del>-ENABLE_CSS_ANIMATIONS_LEVEL_2 = ENABLE_CSS_ANIMATIONS_LEVEL_2;
</del><ins>+ENABLE_CSS_ANIMATIONS_LEVEL_2 = ;
</ins><span class="cx"> ENABLE_CSS_BOX_DECORATION_BREAK = ENABLE_CSS_BOX_DECORATION_BREAK;
</span><span class="cx"> ENABLE_CSS_COMPOSITING = ENABLE_CSS_COMPOSITING;
</span><span class="cx"> ENABLE_CSS_DEVICE_ADAPTATION = ;
</span><span class="lines">@@ -70,7 +70,7 @@
</span><span class="cx"> ENABLE_CSS_IMAGE_ORIENTATION = ;
</span><span class="cx"> ENABLE_CSS_IMAGE_RESOLUTION = ;
</span><span class="cx"> ENABLE_CSS_REGIONS = ENABLE_CSS_REGIONS;
</span><del>-ENABLE_CSS_SELECTORS_LEVEL4 = ENABLE_CSS_SELECTORS_LEVEL4;
</del><ins>+ENABLE_CSS_SELECTORS_LEVEL4 = ;
</ins><span class="cx"> ENABLE_CSS3_TEXT = ;
</span><span class="cx"> ENABLE_CURSOR_VISIBILITY = ENABLE_CURSOR_VISIBILITY;
</span><span class="cx"> ENABLE_CUSTOM_SCHEME_HANDLER = ;
</span><span class="lines">@@ -92,9 +92,9 @@
</span><span class="cx"> ENABLE_SERVICE_CONTROLS[sdk=macosx*] = ENABLE_SERVICE_CONTROLS;
</span><span class="cx"> ENABLE_INDEXED_DATABASE = ENABLE_INDEXED_DATABASE;
</span><span class="cx"> ENABLE_INDEXED_DATABASE_IN_WORKERS = ENABLE_INDEXED_DATABASE_IN_WORKERS;
</span><del>-ENABLE_INDIE_UI = ENABLE_INDIE_UI;
-ENABLE_INPUT_TYPE_COLOR[sdk=macosx*] = ENABLE_INPUT_TYPE_COLOR;
-ENABLE_INPUT_TYPE_COLOR_POPOVER[sdk=macosx*] = ENABLE_INPUT_TYPE_COLOR_POPOVER;
</del><ins>+ENABLE_INDIE_UI = ;
+ENABLE_INPUT_TYPE_COLOR[sdk=macosx*] = ;
+ENABLE_INPUT_TYPE_COLOR_POPOVER[sdk=macosx*] = ;
</ins><span class="cx"> ENABLE_INPUT_TYPE_DATE[sdk=iphone*] = ENABLE_INPUT_TYPE_DATE;
</span><span class="cx"> ENABLE_INPUT_TYPE_DATETIME_INCOMPLETE = ;
</span><span class="cx"> ENABLE_INPUT_TYPE_DATETIMELOCAL[sdk=iphone*] = ENABLE_INPUT_TYPE_DATETIMELOCAL;
</span><span class="lines">@@ -141,7 +141,7 @@
</span><span class="cx"> ENABLE_MEDIA_SOURCE[sdk=macosx*] = ENABLE_MEDIA_SOURCE;
</span><span class="cx">
</span><span class="cx"> ENABLE_MEDIA_STATISTICS = ;
</span><del>-ENABLE_MEDIA_STREAM = ENABLE_MEDIA_STREAM;
</del><ins>+ENABLE_MEDIA_STREAM = ;
</ins><span class="cx"> ENABLE_METER_ELEMENT = ENABLE_METER_ELEMENT;
</span><span class="cx"> ENABLE_MHTML = ;
</span><span class="cx"> ENABLE_MOUSE_CURSOR_SCALE[sdk=macosx*] = ENABLE_MOUSE_CURSOR_SCALE;
</span><span class="lines">@@ -166,7 +166,7 @@
</span><span class="cx"> ENABLE_SPEECH_SYNTHESIS = ENABLE_SPEECH_SYNTHESIS;
</span><span class="cx"> ENABLE_SUBTLE_CRYPTO = ENABLE_SUBTLE_CRYPTO;
</span><span class="cx"> ENABLE_SVG_FONTS = ENABLE_SVG_FONTS;
</span><del>-ENABLE_WEB_RTC = ENABLE_WEB_RTC;
</del><ins>+ENABLE_WEB_RTC = ;
</ins><span class="cx"> ENABLE_WRITABLE_STREAM_API = ENABLE_WRITABLE_STREAM_API;
</span><span class="cx">
</span><span class="cx"> ENABLE_TELEPHONE_NUMBER_DETECTION = ENABLE_TELEPHONE_NUMBER_DETECTION;
</span><span class="lines">@@ -191,11 +191,11 @@
</span><span class="cx"> ENABLE_WEBASSEMBLY = ;
</span><span class="cx"> ENABLE_WEBGL = ENABLE_WEBGL;
</span><span class="cx"> ENABLE_WEBGL2 = ENABLE_WEBGL2;
</span><del>-ENABLE_WEB_ANIMATIONS = ENABLE_WEB_ANIMATIONS;
</del><ins>+ENABLE_WEB_ANIMATIONS = ;
</ins><span class="cx"> ENABLE_WEB_AUDIO = ENABLE_WEB_AUDIO;
</span><span class="cx"> ENABLE_WEB_REPLAY = $(ENABLE_WEB_REPLAY_$(PLATFORM_NAME)_$(CONFIGURATION));
</span><del>-ENABLE_WEB_REPLAY_macosx_Debug = ENABLE_WEB_REPLAY;
-ENABLE_WEB_REPLAY_macosx_Release = ENABLE_WEB_REPLAY;
</del><ins>+ENABLE_WEB_REPLAY_macosx_Debug = ;
+ENABLE_WEB_REPLAY_macosx_Release = ;
</ins><span class="cx"> ENABLE_WEB_SOCKETS = ENABLE_WEB_SOCKETS;
</span><span class="cx">
</span><span class="cx"> ENABLE_WEB_TIMING = ENABLE_WEB_TIMING;
</span></span></pre></div>
<a id="branchessafari603branchSourceWebKit2ChangeLog"></a>
<div class="modfile"><h4>Modified: branches/safari-603-branch/Source/WebKit2/ChangeLog (209984 => 209985)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-603-branch/Source/WebKit2/ChangeLog 2016-12-19 17:11:29 UTC (rev 209984)
+++ branches/safari-603-branch/Source/WebKit2/ChangeLog 2016-12-19 17:31:55 UTC (rev 209985)
</span><span class="lines">@@ -1,3 +1,20 @@
</span><ins>+2016-12-19 Babak Shafiei <bshafiei@apple.com>
+
+ Merge patch for rdar://problem/29466493.
+
+ 2016-12-19 Dean Jackson <dino@apple.com>
+
+ Disable some features on the safari-603-branch.
+ <rdar://problem/29466493>
+
+ - Force the default state of experimental features to off.
+ - Move some experimental features that should be enabled on this
+ branch into the general feature list, so they can't be disabled.
+ - Disable some features that are not ready.
+
+ * Configurations/FeatureDefines.xcconfig:
+ * Shared/WebPreferencesDefinitions.h:
+
</ins><span class="cx"> 2016-12-18 Simon Fraser <simon.fraser@apple.com>
</span><span class="cx">
</span><span class="cx"> Expose a way for MiniBrowser to simulate header and footer banners
</span></span></pre></div>
<a id="branchessafari603branchSourceWebKit2ConfigurationsFeatureDefinesxcconfig"></a>
<div class="modfile"><h4>Modified: branches/safari-603-branch/Source/WebKit2/Configurations/FeatureDefines.xcconfig (209984 => 209985)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-603-branch/Source/WebKit2/Configurations/FeatureDefines.xcconfig 2016-12-19 17:11:29 UTC (rev 209984)
+++ branches/safari-603-branch/Source/WebKit2/Configurations/FeatureDefines.xcconfig 2016-12-19 17:31:55 UTC (rev 209985)
</span><span class="lines">@@ -62,7 +62,7 @@
</span><span class="cx"> ENABLE_CONTENT_FILTERING[sdk=iphone*] = ENABLE_CONTENT_FILTERING;
</span><span class="cx"> ENABLE_CONTENT_FILTERING[sdk=macosx*] = ENABLE_CONTENT_FILTERING;
</span><span class="cx"> ENABLE_CSP_NEXT = ;
</span><del>-ENABLE_CSS_ANIMATIONS_LEVEL_2 = ENABLE_CSS_ANIMATIONS_LEVEL_2;
</del><ins>+ENABLE_CSS_ANIMATIONS_LEVEL_2 = ;
</ins><span class="cx"> ENABLE_CSS_BOX_DECORATION_BREAK = ENABLE_CSS_BOX_DECORATION_BREAK;
</span><span class="cx"> ENABLE_CSS_COMPOSITING = ENABLE_CSS_COMPOSITING;
</span><span class="cx"> ENABLE_CSS_DEVICE_ADAPTATION = ;
</span><span class="lines">@@ -70,7 +70,7 @@
</span><span class="cx"> ENABLE_CSS_IMAGE_ORIENTATION = ;
</span><span class="cx"> ENABLE_CSS_IMAGE_RESOLUTION = ;
</span><span class="cx"> ENABLE_CSS_REGIONS = ENABLE_CSS_REGIONS;
</span><del>-ENABLE_CSS_SELECTORS_LEVEL4 = ENABLE_CSS_SELECTORS_LEVEL4;
</del><ins>+ENABLE_CSS_SELECTORS_LEVEL4 = ;
</ins><span class="cx"> ENABLE_CSS3_TEXT = ;
</span><span class="cx"> ENABLE_CURSOR_VISIBILITY = ENABLE_CURSOR_VISIBILITY;
</span><span class="cx"> ENABLE_CUSTOM_SCHEME_HANDLER = ;
</span><span class="lines">@@ -92,9 +92,9 @@
</span><span class="cx"> ENABLE_SERVICE_CONTROLS[sdk=macosx*] = ENABLE_SERVICE_CONTROLS;
</span><span class="cx"> ENABLE_INDEXED_DATABASE = ENABLE_INDEXED_DATABASE;
</span><span class="cx"> ENABLE_INDEXED_DATABASE_IN_WORKERS = ENABLE_INDEXED_DATABASE_IN_WORKERS;
</span><del>-ENABLE_INDIE_UI = ENABLE_INDIE_UI;
-ENABLE_INPUT_TYPE_COLOR[sdk=macosx*] = ENABLE_INPUT_TYPE_COLOR;
-ENABLE_INPUT_TYPE_COLOR_POPOVER[sdk=macosx*] = ENABLE_INPUT_TYPE_COLOR_POPOVER;
</del><ins>+ENABLE_INDIE_UI = ;
+ENABLE_INPUT_TYPE_COLOR[sdk=macosx*] = ;
+ENABLE_INPUT_TYPE_COLOR_POPOVER[sdk=macosx*] = ;
</ins><span class="cx"> ENABLE_INPUT_TYPE_DATE[sdk=iphone*] = ENABLE_INPUT_TYPE_DATE;
</span><span class="cx"> ENABLE_INPUT_TYPE_DATETIME_INCOMPLETE = ;
</span><span class="cx"> ENABLE_INPUT_TYPE_DATETIMELOCAL[sdk=iphone*] = ENABLE_INPUT_TYPE_DATETIMELOCAL;
</span><span class="lines">@@ -141,7 +141,7 @@
</span><span class="cx"> ENABLE_MEDIA_SOURCE[sdk=macosx*] = ENABLE_MEDIA_SOURCE;
</span><span class="cx">
</span><span class="cx"> ENABLE_MEDIA_STATISTICS = ;
</span><del>-ENABLE_MEDIA_STREAM = ENABLE_MEDIA_STREAM;
</del><ins>+ENABLE_MEDIA_STREAM = ;
</ins><span class="cx"> ENABLE_METER_ELEMENT = ENABLE_METER_ELEMENT;
</span><span class="cx"> ENABLE_MHTML = ;
</span><span class="cx"> ENABLE_MOUSE_CURSOR_SCALE[sdk=macosx*] = ENABLE_MOUSE_CURSOR_SCALE;
</span><span class="lines">@@ -166,7 +166,7 @@
</span><span class="cx"> ENABLE_SPEECH_SYNTHESIS = ENABLE_SPEECH_SYNTHESIS;
</span><span class="cx"> ENABLE_SUBTLE_CRYPTO = ENABLE_SUBTLE_CRYPTO;
</span><span class="cx"> ENABLE_SVG_FONTS = ENABLE_SVG_FONTS;
</span><del>-ENABLE_WEB_RTC = ENABLE_WEB_RTC;
</del><ins>+ENABLE_WEB_RTC = ;
</ins><span class="cx"> ENABLE_WRITABLE_STREAM_API = ENABLE_WRITABLE_STREAM_API;
</span><span class="cx">
</span><span class="cx"> ENABLE_TELEPHONE_NUMBER_DETECTION = ENABLE_TELEPHONE_NUMBER_DETECTION;
</span><span class="lines">@@ -191,11 +191,11 @@
</span><span class="cx"> ENABLE_WEBASSEMBLY = ;
</span><span class="cx"> ENABLE_WEBGL = ENABLE_WEBGL;
</span><span class="cx"> ENABLE_WEBGL2 = ENABLE_WEBGL2;
</span><del>-ENABLE_WEB_ANIMATIONS = ENABLE_WEB_ANIMATIONS;
</del><ins>+ENABLE_WEB_ANIMATIONS = ;
</ins><span class="cx"> ENABLE_WEB_AUDIO = ENABLE_WEB_AUDIO;
</span><span class="cx"> ENABLE_WEB_REPLAY = $(ENABLE_WEB_REPLAY_$(PLATFORM_NAME)_$(CONFIGURATION));
</span><del>-ENABLE_WEB_REPLAY_macosx_Debug = ENABLE_WEB_REPLAY;
-ENABLE_WEB_REPLAY_macosx_Release = ENABLE_WEB_REPLAY;
</del><ins>+ENABLE_WEB_REPLAY_macosx_Debug = ;
+ENABLE_WEB_REPLAY_macosx_Release = ;
</ins><span class="cx"> ENABLE_WEB_SOCKETS = ENABLE_WEB_SOCKETS;
</span><span class="cx">
</span><span class="cx"> ENABLE_WEB_TIMING = ENABLE_WEB_TIMING;
</span></span></pre></div>
<a id="branchessafari603branchSourceWebKit2SharedWebPreferencesDefinitionsh"></a>
<div class="modfile"><h4>Modified: branches/safari-603-branch/Source/WebKit2/Shared/WebPreferencesDefinitions.h (209984 => 209985)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-603-branch/Source/WebKit2/Shared/WebPreferencesDefinitions.h 2016-12-19 17:11:29 UTC (rev 209984)
+++ branches/safari-603-branch/Source/WebKit2/Shared/WebPreferencesDefinitions.h 2016-12-19 17:31:55 UTC (rev 209985)
</span><span class="lines">@@ -248,6 +248,9 @@
</span><span class="cx"> macro(IntersectionObserverEnabled, intersectionObserverEnabled, Bool, bool, false, "Intersection Observer", "Enable Intersection Observer support") \
</span><span class="cx"> macro(InteractiveFormValidationEnabled, interactiveFormValidationEnabled, Bool, bool, DEFAULT_HTML_INTERACTIVE_FORM_VALIDATION_ENABLED, "HTML Interactive Form Validation", "HTML interactive form validation") \
</span><span class="cx"> macro(ShouldSuppressKeyboardInputDuringProvisionalNavigation, shouldSuppressKeyboardInputDuringProvisionalNavigation, Bool, bool, false, "", "") \
</span><ins>+ macro(CSSGridLayoutEnabled, cssGridLayoutEnabled, Bool, bool, true, "CSS Grid", "CSS Grid Layout Module support") \
+ macro(InputEventsEnabled, inputEventsEnabled, Bool, bool, true, "Input Events", "Enable InputEvents support") \
+ macro(ES6ModulesEnabled, es6ModulesEnabled, Bool, bool, true, "ES6 Modules", "Enable ES6 Modules support") \
</ins><span class="cx"> \
</span><span class="cx">
</span><span class="cx"> #define FOR_EACH_WEBKIT_DOUBLE_PREFERENCE(macro) \
</span><span class="lines">@@ -298,7 +301,7 @@
</span><span class="cx"> // Our XCode build system does not currently have any concept of DEVELOPER_MODE.
</span><span class="cx"> // Cocoa ports must disable experimental features on release branches for now.
</span><span class="cx"> #if ENABLE(DEVELOPER_MODE) || PLATFORM(COCOA)
</span><del>-#define DEFAULT_EXPERIMENTAL_FEATURES_ENABLED true
</del><ins>+#define DEFAULT_EXPERIMENTAL_FEATURES_ENABLED false
</ins><span class="cx"> #else
</span><span class="cx"> #define DEFAULT_EXPERIMENTAL_FEATURES_ENABLED false
</span><span class="cx"> #endif
</span><span class="lines">@@ -313,15 +316,12 @@
</span><span class="cx"> // wider testing).
</span><span class="cx">
</span><span class="cx"> #define FOR_EACH_WEBKIT_EXPERIMENTAL_FEATURE_PREFERENCE(macro) \
</span><del>- macro(CSSGridLayoutEnabled, cssGridLayoutEnabled, Bool, bool, DEFAULT_EXPERIMENTAL_FEATURES_ENABLED, "CSS Grid", "CSS Grid Layout Module support") \
</del><span class="cx"> macro(SpringTimingFunctionEnabled, springTimingFunctionEnabled, Bool, bool, DEFAULT_EXPERIMENTAL_FEATURES_ENABLED, "CSS Spring Animations", "CSS Spring Animation prototype") \
</span><span class="cx"> macro(GamepadsEnabled, gamepadsEnabled, Bool, bool, DEFAULT_EXPERIMENTAL_FEATURES_ENABLED, "Gamepads", "Web Gamepad API support") \
</span><span class="cx"> macro(ModernMediaControlsEnabled, modernMediaControlsEnabled, Bool, bool, false, "Modern Media Controls", "Use modern media controls look") \
</span><span class="cx"> macro(VariationFontsEnabled, variationFontsEnabled, Bool, bool, DEFAULT_EXPERIMENTAL_FEATURES_ENABLED, "Variation Fonts", "Enable variation fonts") \
</span><del>- macro(InputEventsEnabled, inputEventsEnabled, Bool, bool, DEFAULT_EXPERIMENTAL_FEATURES_ENABLED, "Input Events", "Enable InputEvents support") \
</del><span class="cx"> macro(SubtleCryptoEnabled, subtleCryptoEnabled, Bool, bool, DEFAULT_EXPERIMENTAL_FEATURES_ENABLED, "SubtleCrypto", "Enable SubtleCrypto support") \
</span><span class="cx"> macro(WebGL2Enabled, webGL2Enabled, Bool, bool, DEFAULT_EXPERIMENTAL_FEATURES_ENABLED, "WebGL 2.0", "WebGL 2 prototype") \
</span><del>- macro(ES6ModulesEnabled, es6ModulesEnabled, Bool, bool, DEFAULT_EXPERIMENTAL_FEATURES_ENABLED, "ES6 Modules", "Enable ES6 Modules support") \
</del><span class="cx"> \
</span><span class="cx">
</span><span class="cx"> #if PLATFORM(COCOA)
</span></span></pre></div>
<a id="branchessafari603branchToolsChangeLog"></a>
<div class="modfile"><h4>Modified: branches/safari-603-branch/Tools/ChangeLog (209984 => 209985)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-603-branch/Tools/ChangeLog 2016-12-19 17:11:29 UTC (rev 209984)
+++ branches/safari-603-branch/Tools/ChangeLog 2016-12-19 17:31:55 UTC (rev 209985)
</span><span class="lines">@@ -1,3 +1,19 @@
</span><ins>+2016-12-19 Babak Shafiei <bshafiei@apple.com>
+
+ Merge patch for rdar://problem/29466493.
+
+ 2016-12-19 Dean Jackson <dino@apple.com>
+
+ Disable some features on the safari-603-branch.
+ <rdar://problem/29466493>
+
+ - Force the default state of experimental features to off.
+ - Move some experimental features that should be enabled on this
+ branch into the general feature list, so they can't be disabled.
+ - Disable some features that are not ready.
+
+ * TestWebKitAPI/Configurations/FeatureDefines.xcconfig:
+
</ins><span class="cx"> 2016-12-18 Simon Fraser <simon.fraser@apple.com>
</span><span class="cx">
</span><span class="cx"> Expose a way for MiniBrowser to simulate header and footer banners
</span></span></pre></div>
<a id="branchessafari603branchToolsTestWebKitAPIConfigurationsFeatureDefinesxcconfig"></a>
<div class="modfile"><h4>Modified: branches/safari-603-branch/Tools/TestWebKitAPI/Configurations/FeatureDefines.xcconfig (209984 => 209985)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-603-branch/Tools/TestWebKitAPI/Configurations/FeatureDefines.xcconfig 2016-12-19 17:11:29 UTC (rev 209984)
+++ branches/safari-603-branch/Tools/TestWebKitAPI/Configurations/FeatureDefines.xcconfig 2016-12-19 17:31:55 UTC (rev 209985)
</span><span class="lines">@@ -62,7 +62,7 @@
</span><span class="cx"> ENABLE_CONTENT_FILTERING[sdk=iphone*] = ENABLE_CONTENT_FILTERING;
</span><span class="cx"> ENABLE_CONTENT_FILTERING[sdk=macosx*] = ENABLE_CONTENT_FILTERING;
</span><span class="cx"> ENABLE_CSP_NEXT = ;
</span><del>-ENABLE_CSS_ANIMATIONS_LEVEL_2 = ENABLE_CSS_ANIMATIONS_LEVEL_2;
</del><ins>+ENABLE_CSS_ANIMATIONS_LEVEL_2 = ;
</ins><span class="cx"> ENABLE_CSS_BOX_DECORATION_BREAK = ENABLE_CSS_BOX_DECORATION_BREAK;
</span><span class="cx"> ENABLE_CSS_COMPOSITING = ENABLE_CSS_COMPOSITING;
</span><span class="cx"> ENABLE_CSS_DEVICE_ADAPTATION = ;
</span><span class="lines">@@ -70,7 +70,7 @@
</span><span class="cx"> ENABLE_CSS_IMAGE_ORIENTATION = ;
</span><span class="cx"> ENABLE_CSS_IMAGE_RESOLUTION = ;
</span><span class="cx"> ENABLE_CSS_REGIONS = ENABLE_CSS_REGIONS;
</span><del>-ENABLE_CSS_SELECTORS_LEVEL4 = ENABLE_CSS_SELECTORS_LEVEL4;
</del><ins>+ENABLE_CSS_SELECTORS_LEVEL4 = ;
</ins><span class="cx"> ENABLE_CSS3_TEXT = ;
</span><span class="cx"> ENABLE_CURSOR_VISIBILITY = ENABLE_CURSOR_VISIBILITY;
</span><span class="cx"> ENABLE_CUSTOM_SCHEME_HANDLER = ;
</span><span class="lines">@@ -92,9 +92,9 @@
</span><span class="cx"> ENABLE_SERVICE_CONTROLS[sdk=macosx*] = ENABLE_SERVICE_CONTROLS;
</span><span class="cx"> ENABLE_INDEXED_DATABASE = ENABLE_INDEXED_DATABASE;
</span><span class="cx"> ENABLE_INDEXED_DATABASE_IN_WORKERS = ENABLE_INDEXED_DATABASE_IN_WORKERS;
</span><del>-ENABLE_INDIE_UI = ENABLE_INDIE_UI;
-ENABLE_INPUT_TYPE_COLOR[sdk=macosx*] = ENABLE_INPUT_TYPE_COLOR;
-ENABLE_INPUT_TYPE_COLOR_POPOVER[sdk=macosx*] = ENABLE_INPUT_TYPE_COLOR_POPOVER;
</del><ins>+ENABLE_INDIE_UI = ;
+ENABLE_INPUT_TYPE_COLOR[sdk=macosx*] = ;
+ENABLE_INPUT_TYPE_COLOR_POPOVER[sdk=macosx*] = ;
</ins><span class="cx"> ENABLE_INPUT_TYPE_DATE[sdk=iphone*] = ENABLE_INPUT_TYPE_DATE;
</span><span class="cx"> ENABLE_INPUT_TYPE_DATETIME_INCOMPLETE = ;
</span><span class="cx"> ENABLE_INPUT_TYPE_DATETIMELOCAL[sdk=iphone*] = ENABLE_INPUT_TYPE_DATETIMELOCAL;
</span><span class="lines">@@ -141,7 +141,7 @@
</span><span class="cx"> ENABLE_MEDIA_SOURCE[sdk=macosx*] = ENABLE_MEDIA_SOURCE;
</span><span class="cx">
</span><span class="cx"> ENABLE_MEDIA_STATISTICS = ;
</span><del>-ENABLE_MEDIA_STREAM = ENABLE_MEDIA_STREAM;
</del><ins>+ENABLE_MEDIA_STREAM = ;
</ins><span class="cx"> ENABLE_METER_ELEMENT = ENABLE_METER_ELEMENT;
</span><span class="cx"> ENABLE_MHTML = ;
</span><span class="cx"> ENABLE_MOUSE_CURSOR_SCALE[sdk=macosx*] = ENABLE_MOUSE_CURSOR_SCALE;
</span><span class="lines">@@ -166,7 +166,7 @@
</span><span class="cx"> ENABLE_SPEECH_SYNTHESIS = ENABLE_SPEECH_SYNTHESIS;
</span><span class="cx"> ENABLE_SUBTLE_CRYPTO = ENABLE_SUBTLE_CRYPTO;
</span><span class="cx"> ENABLE_SVG_FONTS = ENABLE_SVG_FONTS;
</span><del>-ENABLE_WEB_RTC = ENABLE_WEB_RTC;
</del><ins>+ENABLE_WEB_RTC = ;
</ins><span class="cx"> ENABLE_WRITABLE_STREAM_API = ENABLE_WRITABLE_STREAM_API;
</span><span class="cx">
</span><span class="cx"> ENABLE_TELEPHONE_NUMBER_DETECTION = ENABLE_TELEPHONE_NUMBER_DETECTION;
</span><span class="lines">@@ -191,11 +191,11 @@
</span><span class="cx"> ENABLE_WEBASSEMBLY = ;
</span><span class="cx"> ENABLE_WEBGL = ENABLE_WEBGL;
</span><span class="cx"> ENABLE_WEBGL2 = ENABLE_WEBGL2;
</span><del>-ENABLE_WEB_ANIMATIONS = ENABLE_WEB_ANIMATIONS;
</del><ins>+ENABLE_WEB_ANIMATIONS = ;
</ins><span class="cx"> ENABLE_WEB_AUDIO = ENABLE_WEB_AUDIO;
</span><span class="cx"> ENABLE_WEB_REPLAY = $(ENABLE_WEB_REPLAY_$(PLATFORM_NAME)_$(CONFIGURATION));
</span><del>-ENABLE_WEB_REPLAY_macosx_Debug = ENABLE_WEB_REPLAY;
-ENABLE_WEB_REPLAY_macosx_Release = ENABLE_WEB_REPLAY;
</del><ins>+ENABLE_WEB_REPLAY_macosx_Debug = ;
+ENABLE_WEB_REPLAY_macosx_Release = ;
</ins><span class="cx"> ENABLE_WEB_SOCKETS = ENABLE_WEB_SOCKETS;
</span><span class="cx">
</span><span class="cx"> ENABLE_WEB_TIMING = ENABLE_WEB_TIMING;
</span></span></pre>
</div>
</div>
</body>
</html>