<!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>[202391] branches/safari-602.1.38-branch/Source</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://trac.webkit.org/projects/webkit/changeset/202391">202391</a></dd>
<dt>Author</dt> <dd>bshafiei@apple.com</dd>
<dt>Date</dt> <dd>2016-06-23 12:20:11 -0700 (Thu, 23 Jun 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>Merge patch for rdar://problem/26831566.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#branchessafari602138branchSourceJavaScriptCoreChangeLog">branches/safari-602.1.38-branch/Source/JavaScriptCore/ChangeLog</a></li>
<li><a href="#branchessafari602138branchSourceJavaScriptCoreConfigurationsFeatureDefinesxcconfig">branches/safari-602.1.38-branch/Source/JavaScriptCore/Configurations/FeatureDefines.xcconfig</a></li>
<li><a href="#branchessafari602138branchSourceWTFChangeLog">branches/safari-602.1.38-branch/Source/WTF/ChangeLog</a></li>
<li><a href="#branchessafari602138branchSourceWTFwtfFeatureDefinesh">branches/safari-602.1.38-branch/Source/WTF/wtf/FeatureDefines.h</a></li>
<li><a href="#branchessafari602138branchSourceWebCoreChangeLog">branches/safari-602.1.38-branch/Source/WebCore/ChangeLog</a></li>
<li><a href="#branchessafari602138branchSourceWebCoreConfigurationsFeatureDefinesxcconfig">branches/safari-602.1.38-branch/Source/WebCore/Configurations/FeatureDefines.xcconfig</a></li>
<li><a href="#branchessafari602138branchSourceWebCorecssCSSParsercpp">branches/safari-602.1.38-branch/Source/WebCore/css/CSSParser.cpp</a></li>
<li><a href="#branchessafari602138branchSourceWebKitmacChangeLog">branches/safari-602.1.38-branch/Source/WebKit/mac/ChangeLog</a></li>
<li><a href="#branchessafari602138branchSourceWebKitmacConfigurationsFeatureDefinesxcconfig">branches/safari-602.1.38-branch/Source/WebKit/mac/Configurations/FeatureDefines.xcconfig</a></li>
<li><a href="#branchessafari602138branchSourceWebKit2ChangeLog">branches/safari-602.1.38-branch/Source/WebKit2/ChangeLog</a></li>
<li><a href="#branchessafari602138branchSourceWebKit2ConfigurationsFeatureDefinesxcconfig">branches/safari-602.1.38-branch/Source/WebKit2/Configurations/FeatureDefines.xcconfig</a></li>
<li><a href="#branchessafari602138branchSourceWebKit2SharedWebPreferencesDefinitionsh">branches/safari-602.1.38-branch/Source/WebKit2/Shared/WebPreferencesDefinitions.h</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="branchessafari602138branchSourceJavaScriptCoreChangeLog"></a>
<div class="modfile"><h4>Modified: branches/safari-602.1.38-branch/Source/JavaScriptCore/ChangeLog (202390 => 202391)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-602.1.38-branch/Source/JavaScriptCore/ChangeLog 2016-06-23 19:17:49 UTC (rev 202390)
+++ branches/safari-602.1.38-branch/Source/JavaScriptCore/ChangeLog 2016-06-23 19:20:11 UTC (rev 202391)
</span><span class="lines">@@ -1,3 +1,14 @@
</span><ins>+2016-06-23 Babak Shafiei <bshafiei@apple.com>
+
+ Merge patch for rdar://problem/26831566.
+
+ 2016-06-23 Dean Jackson <dino@apple.com>
+
+ Disable some features on safari-602.1.38-branch.
+ <rdar://problem/26831566>
+
+ * Configurations/FeatureDefines.xcconfig:
+
</ins><span class="cx"> 2016-06-22 Saam barati <sbarati@apple.com>
</span><span class="cx">
</span><span class="cx"> TypeProfiler and TypeProfilerLog don't play nicely with the concurrent JIT
</span></span></pre></div>
<a id="branchessafari602138branchSourceJavaScriptCoreConfigurationsFeatureDefinesxcconfig"></a>
<div class="modfile"><h4>Modified: branches/safari-602.1.38-branch/Source/JavaScriptCore/Configurations/FeatureDefines.xcconfig (202390 => 202391)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-602.1.38-branch/Source/JavaScriptCore/Configurations/FeatureDefines.xcconfig 2016-06-23 19:17:49 UTC (rev 202390)
+++ branches/safari-602.1.38-branch/Source/JavaScriptCore/Configurations/FeatureDefines.xcconfig 2016-06-23 19:20:11 UTC (rev 202391)
</span><span class="lines">@@ -53,15 +53,15 @@
</span><span class="cx"> ENABLE_ES6_MODULES = ;
</span><span class="cx"> ENABLE_CONTENT_FILTERING = 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><del>-ENABLE_CSS_GRID_LAYOUT = ENABLE_CSS_GRID_LAYOUT;
</del><ins>+ENABLE_CSS_GRID_LAYOUT = ;
</ins><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_CSS_SHAPES = ENABLE_CSS_SHAPES;
</span><span class="cx"> ENABLE_CSS3_TEXT = ;
</span><span class="cx"> ENABLE_CSS3_TEXT_LINE_BREAK = ;
</span><span class="lines">@@ -75,11 +75,11 @@
</span><span class="cx"> ENABLE_DOM4_EVENTS_CONSTRUCTOR = ENABLE_DOM4_EVENTS_CONSTRUCTOR;
</span><span class="cx"> ENABLE_ENCRYPTED_MEDIA[sdk=macosx*] = ENABLE_ENCRYPTED_MEDIA;
</span><span class="cx"> ENABLE_ENCRYPTED_MEDIA_V2[sdk=macosx*] = ENABLE_ENCRYPTED_MEDIA_V2;
</span><del>-ENABLE_FETCH_API = ENABLE_FETCH_API;
</del><ins>+ENABLE_FETCH_API = ;
</ins><span class="cx"> ENABLE_FILTERS_LEVEL_2 = ENABLE_FILTERS_LEVEL_2;
</span><span class="cx"> ENABLE_FONT_LOAD_EVENTS = ;
</span><span class="cx"> ENABLE_FULLSCREEN_API[sdk=macosx*] = ENABLE_FULLSCREEN_API;
</span><del>-ENABLE_GAMEPAD[sdk=macosx*] = ENABLE_GAMEPAD;
</del><ins>+ENABLE_GAMEPAD[sdk=macosx*] = ;
</ins><span class="cx"> ENABLE_GAMEPAD_DEPRECATED = ;
</span><span class="cx"> ENABLE_GEOLOCATION = ENABLE_GEOLOCATION;
</span><span class="cx"> ENABLE_ICONDATABASE[sdk=macosx*] = ENABLE_ICONDATABASE;
</span><span class="lines">@@ -86,9 +86,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">@@ -134,12 +134,12 @@
</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[sdk=macosx*] = 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="cx"> ENABLE_NAVIGATOR_CONTENT_UTILS = ;
</span><del>-ENABLE_NAVIGATOR_HWCONCURRENCY = ENABLE_NAVIGATOR_HWCONCURRENCY;
</del><ins>+ENABLE_NAVIGATOR_HWCONCURRENCY = ;
</ins><span class="cx"> ENABLE_NOSNIFF = ;
</span><span class="cx"> ENABLE_NOTIFICATIONS[sdk=macosx*] = ENABLE_NOTIFICATIONS;
</span><span class="cx"> ENABLE_PDFKIT_PLUGIN[sdk=macosx*] = ENABLE_PDFKIT_PLUGIN;
</span><span class="lines">@@ -155,7 +155,7 @@
</span><span class="cx"> ENABLE_RUBBER_BANDING[sdk=macosx*] = ENABLE_RUBBER_BANDING;
</span><span class="cx"> ENABLE_CSS_SCROLL_SNAP = ENABLE_CSS_SCROLL_SNAP;
</span><span class="cx"> ENABLE_SPEECH_SYNTHESIS = ENABLE_SPEECH_SYNTHESIS;
</span><del>-ENABLE_STREAMS_API = ENABLE_STREAMS_API;
</del><ins>+ENABLE_STREAMS_API = ;
</ins><span class="cx"> ENABLE_SUBTLE_CRYPTO = ENABLE_SUBTLE_CRYPTO;
</span><span class="cx"> ENABLE_SVG_FONTS = ENABLE_SVG_FONTS;
</span><span class="cx">
</span><span class="lines">@@ -182,12 +182,12 @@
</span><span class="cx"> ENABLE_VIEW_MODE_CSS_MEDIA = ;
</span><span class="cx"> ENABLE_WEBASSEMBLY = ;
</span><span class="cx"> ENABLE_WEBGL = ENABLE_WEBGL;
</span><del>-ENABLE_WEBGL2 = ENABLE_WEBGL2;
-ENABLE_WEB_ANIMATIONS = ENABLE_WEB_ANIMATIONS;
</del><ins>+ENABLE_WEBGL2 = ;
+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 class="lines">@@ -197,6 +197,6 @@
</span><span class="cx"> ENABLE_FTL_JIT[sdk=macosx*] = ENABLE_FTL_JIT;
</span><span class="cx"> ENABLE_FTL_JIT[sdk=iphoneos*] = ENABLE_FTL_JIT;
</span><span class="cx">
</span><del>-ENABLE_CUSTOM_ELEMENTS = ENABLE_CUSTOM_ELEMENTS;
</del><ins>+ENABLE_CUSTOM_ELEMENTS = ;
</ins><span class="cx">
</span><span class="cx"> FEATURE_DEFINES = $(ENABLE_3D_TRANSFORMS) $(ENABLE_ACCELERATED_2D_CANVAS) $(ENABLE_ACCELERATED_OVERFLOW_SCROLLING) $(ENABLE_APPLE_PAY) $(ENABLE_AVF_CAPTIONS) $(ENABLE_ATTACHMENT_ELEMENT) $(ENABLE_CACHE_PARTITIONING) $(ENABLE_CANVAS_PATH) $(ENABLE_CANVAS_PROXY) $(ENABLE_CHANNEL_MESSAGING) $(ENABLE_ES6_MODULES) $(ENABLE_CONTENT_FILTERING) $(ENABLE_CSP_NEXT) $(ENABLE_CSS_ANIMATIONS_LEVEL_2) $(ENABLE_CSS_BOX_DECORATION_BREAK) $(ENABLE_CSS_COMPOSITING) $(ENABLE_CSS_DEVICE_ADAPTATION) $(ENABLE_CSS_GRID_LAYOUT) $(ENABLE_CSS_IMAGE_ORIENTATION) $(ENABLE_CSS_IMAGE_RESOLUTION) $(ENABLE_CSS_REGIONS) $(ENABLE_CSS_SELECTORS_LEVEL4) $(ENABLE_CSS_SHAPES) $(ENABLE_CSS3_TEXT) $(ENABLE_CSS3_TEXT_LINE_BREAK) $(ENABLE_CURSOR_VISIBILITY) $(ENABLE_CUSTOM_SCHEME_HANDLER) $(ENABLE_DASHBOARD_SUPPORT) $(ENABLE_DATALIST_ELEMENT) $(ENABLE_DATA_TRANSFER_ITEMS) $(ENABLE_DETAILS_ELEMENT) $(ENABLE_DEVICE_ORIENTATION) $(ENABLE_DOM4_EVENTS_CONSTRUCTOR) $(ENABLE_ENCRYPTED_MEDIA) $(ENABL
E_ENCRYPTED_MEDIA_V2) $(ENABLE_FETCH_API) $(ENABLE_FILTERS_LEVEL_2) $(ENABLE_FONT_LOAD_EVENTS) $(ENABLE_FULLSCREEN_API) $(ENABLE_GAMEPAD) $(ENABLE_GAMEPAD_DEPRECATED) $(ENABLE_GEOLOCATION) $(ENABLE_ICONDATABASE) $(ENABLE_SERVICE_CONTROLS) $(ENABLE_INDEXED_DATABASE) $(ENABLE_INDEXED_DATABASE_IN_WORKERS) $(ENABLE_INDIE_UI) $(ENABLE_INPUT_TYPE_COLOR) $(ENABLE_INPUT_TYPE_COLOR_POPOVER) $(ENABLE_INPUT_TYPE_DATE) $(ENABLE_INPUT_TYPE_DATETIME_INCOMPLETE) $(ENABLE_INPUT_TYPE_DATETIMELOCAL) $(ENABLE_INPUT_TYPE_MONTH) $(ENABLE_INPUT_TYPE_TIME) $(ENABLE_INPUT_TYPE_WEEK) $(ENABLE_WIRELESS_PLAYBACK_TARGET) $(ENABLE_INTL) $(ENABLE_IOS_GESTURE_EVENTS) $(ENABLE_IOS_TEXT_AUTOSIZING) $(ENABLE_IOS_TOUCH_EVENTS) $(ENABLE_LEGACY_CSS_VENDOR_PREFIXES) $(ENABLE_LEGACY_NOTIFICATIONS) $(ENABLE_LEGACY_VENDOR_PREFIXES) $(ENABLE_LEGACY_WEB_AUDIO) $(ENABLE_LETTERPRESS) $(ENABLE_LINK_PREFETCH) $(ENABLE_MAC_GESTURE_EVENTS) $(ENABLE_MATHML) $(ENABLE_MEDIA_CONTROLS_SCRIPT) $(ENABLE_MEDIA_SESSION) $(ENABLE_ME
DIA_SOURCE) $(ENABLE_MEDIA_STATISTICS) $(ENABLE_MEDIA_STREAM) $(ENABLE_METER_ELEMENT) $(ENABLE_MHTML) $(ENABLE_MOUSE_CURSOR_SCALE) $(ENABLE_NAVIGATOR_CONTENT_UTILS) $(ENABLE_NAVIGATOR_HWCONCURRENCY) $(ENABLE_NOTIFICATIONS) $(ENABLE_PDFKIT_PLUGIN) $(ENABLE_POINTER_LOCK) $(ENABLE_PROXIMITY_EVENTS) $(ENABLE_PUBLIC_SUFFIX_LIST) $(ENABLE_QUOTA) $(ENABLE_REQUEST_ANIMATION_FRAME) $(ENABLE_REQUEST_AUTOCOMPLETE) $(ENABLE_REMOTE_INSPECTOR) $(ENABLE_RESOLUTION_MEDIA_QUERY) $(ENABLE_RESOURCE_USAGE) $(ENABLE_RUBBER_BANDING) $(ENABLE_CSS_SCROLL_SNAP) $(ENABLE_SPEECH_SYNTHESIS) $(ENABLE_STREAMS_API) $(ENABLE_SUBTLE_CRYPTO) $(ENABLE_SVG_FONTS) $(ENABLE_TELEPHONE_NUMBER_DETECTION) $(ENABLE_TEXT_AUTOSIZING) $(ENABLE_TOUCH_EVENTS) $(ENABLE_TOUCH_ICON_LOADING) $(ENABLE_CSS_TRAILING_WORD) $(ENABLE_USERSELECT_ALL) $(ENABLE_VIDEO) $(ENABLE_VIDEO_TRACK) $(ENABLE_DATACUE_VALUE) $(ENABLE_VIEW_MODE_CSS_MEDIA) $(ENABLE_WEBASSEMBLY) $(ENABLE_WEBGL) $(ENABLE_WEBGL2) $(ENABLE_WEB_ANIMATIONS) $(ENABLE_WEB_
AUDIO) $(ENABLE_WEB_REPLAY) $(ENABLE_WEB_SOCKETS) $(ENABLE_WEB_TIMING) $(ENABLE_XSLT) $(ENABLE_FTL_JIT) $(ENABLE_JIT) $(ENABLE_CUSTOM_ELEMENTS) $(ENABLE_VIDEO_PRESENTATION_MODE);
</span></span></pre></div>
<a id="branchessafari602138branchSourceWTFChangeLog"></a>
<div class="modfile"><h4>Modified: branches/safari-602.1.38-branch/Source/WTF/ChangeLog (202390 => 202391)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-602.1.38-branch/Source/WTF/ChangeLog 2016-06-23 19:17:49 UTC (rev 202390)
+++ branches/safari-602.1.38-branch/Source/WTF/ChangeLog 2016-06-23 19:20:11 UTC (rev 202391)
</span><span class="lines">@@ -1,3 +1,14 @@
</span><ins>+2016-06-23 Babak Shafiei <bshafiei@apple.com>
+
+ Merge patch for rdar://problem/26831566.
+
+ 2016-06-23 Dean Jackson <dino@apple.com>
+
+ Disable some features on safari-602.1.38-branch.
+ <rdar://problem/26831566>
+
+ * wtf/FeatureDefines.h:
+
</ins><span class="cx"> 2016-06-23 John Wilander <wilander@apple.com>
</span><span class="cx">
</span><span class="cx"> Enable window.open() for existing versions of Secret Society
</span></span></pre></div>
<a id="branchessafari602138branchSourceWTFwtfFeatureDefinesh"></a>
<div class="modfile"><h4>Modified: branches/safari-602.1.38-branch/Source/WTF/wtf/FeatureDefines.h (202390 => 202391)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-602.1.38-branch/Source/WTF/wtf/FeatureDefines.h 2016-06-23 19:17:49 UTC (rev 202390)
+++ branches/safari-602.1.38-branch/Source/WTF/wtf/FeatureDefines.h 2016-06-23 19:20:11 UTC (rev 202391)
</span><span class="lines">@@ -235,11 +235,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">@@ -611,7 +611,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">@@ -684,7 +684,7 @@
</span><span class="cx"> #if PLATFORM(WIN)
</span><span class="cx"> #define ENABLE_STREAMS_API 0
</span><span class="cx"> #else
</span><del>-#define ENABLE_STREAMS_API 1
</del><ins>+#define ENABLE_STREAMS_API 0
</ins><span class="cx"> #endif
</span><span class="cx"> #endif
</span><span class="cx">
</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="branchessafari602138branchSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: branches/safari-602.1.38-branch/Source/WebCore/ChangeLog (202390 => 202391)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-602.1.38-branch/Source/WebCore/ChangeLog 2016-06-23 19:17:49 UTC (rev 202390)
+++ branches/safari-602.1.38-branch/Source/WebCore/ChangeLog 2016-06-23 19:20:11 UTC (rev 202391)
</span><span class="lines">@@ -1,3 +1,14 @@
</span><ins>+2016-06-23 Babak Shafiei <bshafiei@apple.com>
+
+ Merge patch for rdar://problem/26831566.
+
+ 2016-06-23 Dean Jackson <dino@apple.com>
+
+ Disable some features on safari-602.1.38-branch.
+ <rdar://problem/26831566>
+
+ * Configurations/FeatureDefines.xcconfig:
+
</ins><span class="cx"> 2016-06-23 John Wilander <wilander@apple.com>
</span><span class="cx">
</span><span class="cx"> Enable window.open() for existing versions of Secret Society
</span></span></pre></div>
<a id="branchessafari602138branchSourceWebCoreConfigurationsFeatureDefinesxcconfig"></a>
<div class="modfile"><h4>Modified: branches/safari-602.1.38-branch/Source/WebCore/Configurations/FeatureDefines.xcconfig (202390 => 202391)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-602.1.38-branch/Source/WebCore/Configurations/FeatureDefines.xcconfig 2016-06-23 19:17:49 UTC (rev 202390)
+++ branches/safari-602.1.38-branch/Source/WebCore/Configurations/FeatureDefines.xcconfig 2016-06-23 19:20:11 UTC (rev 202391)
</span><span class="lines">@@ -53,15 +53,15 @@
</span><span class="cx"> ENABLE_ES6_MODULES = ;
</span><span class="cx"> ENABLE_CONTENT_FILTERING = 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><del>-ENABLE_CSS_GRID_LAYOUT = ENABLE_CSS_GRID_LAYOUT;
</del><ins>+ENABLE_CSS_GRID_LAYOUT = ;
</ins><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_CSS_SHAPES = ENABLE_CSS_SHAPES;
</span><span class="cx"> ENABLE_CSS3_TEXT = ;
</span><span class="cx"> ENABLE_CSS3_TEXT_LINE_BREAK = ;
</span><span class="lines">@@ -75,11 +75,11 @@
</span><span class="cx"> ENABLE_DOM4_EVENTS_CONSTRUCTOR = ENABLE_DOM4_EVENTS_CONSTRUCTOR;
</span><span class="cx"> ENABLE_ENCRYPTED_MEDIA[sdk=macosx*] = ENABLE_ENCRYPTED_MEDIA;
</span><span class="cx"> ENABLE_ENCRYPTED_MEDIA_V2[sdk=macosx*] = ENABLE_ENCRYPTED_MEDIA_V2;
</span><del>-ENABLE_FETCH_API = ENABLE_FETCH_API;
</del><ins>+ENABLE_FETCH_API = ;
</ins><span class="cx"> ENABLE_FILTERS_LEVEL_2 = ENABLE_FILTERS_LEVEL_2;
</span><span class="cx"> ENABLE_FONT_LOAD_EVENTS = ;
</span><span class="cx"> ENABLE_FULLSCREEN_API[sdk=macosx*] = ENABLE_FULLSCREEN_API;
</span><del>-ENABLE_GAMEPAD[sdk=macosx*] = ENABLE_GAMEPAD;
</del><ins>+ENABLE_GAMEPAD[sdk=macosx*] = ;
</ins><span class="cx"> ENABLE_GAMEPAD_DEPRECATED = ;
</span><span class="cx"> ENABLE_GEOLOCATION = ENABLE_GEOLOCATION;
</span><span class="cx"> ENABLE_ICONDATABASE[sdk=macosx*] = ENABLE_ICONDATABASE;
</span><span class="lines">@@ -86,9 +86,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">@@ -134,12 +134,12 @@
</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[sdk=macosx*] = 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="cx"> ENABLE_NAVIGATOR_CONTENT_UTILS = ;
</span><del>-ENABLE_NAVIGATOR_HWCONCURRENCY = ENABLE_NAVIGATOR_HWCONCURRENCY;
</del><ins>+ENABLE_NAVIGATOR_HWCONCURRENCY = ;
</ins><span class="cx"> ENABLE_NOSNIFF = ;
</span><span class="cx"> ENABLE_NOTIFICATIONS[sdk=macosx*] = ENABLE_NOTIFICATIONS;
</span><span class="cx"> ENABLE_PDFKIT_PLUGIN[sdk=macosx*] = ENABLE_PDFKIT_PLUGIN;
</span><span class="lines">@@ -155,7 +155,7 @@
</span><span class="cx"> ENABLE_RUBBER_BANDING[sdk=macosx*] = ENABLE_RUBBER_BANDING;
</span><span class="cx"> ENABLE_CSS_SCROLL_SNAP = ENABLE_CSS_SCROLL_SNAP;
</span><span class="cx"> ENABLE_SPEECH_SYNTHESIS = ENABLE_SPEECH_SYNTHESIS;
</span><del>-ENABLE_STREAMS_API = ENABLE_STREAMS_API;
</del><ins>+ENABLE_STREAMS_API = ;
</ins><span class="cx"> ENABLE_SUBTLE_CRYPTO = ENABLE_SUBTLE_CRYPTO;
</span><span class="cx"> ENABLE_SVG_FONTS = ENABLE_SVG_FONTS;
</span><span class="cx">
</span><span class="lines">@@ -182,12 +182,12 @@
</span><span class="cx"> ENABLE_VIEW_MODE_CSS_MEDIA = ;
</span><span class="cx"> ENABLE_WEBASSEMBLY = ;
</span><span class="cx"> ENABLE_WEBGL = ENABLE_WEBGL;
</span><del>-ENABLE_WEBGL2 = ENABLE_WEBGL2;
-ENABLE_WEB_ANIMATIONS = ENABLE_WEB_ANIMATIONS;
</del><ins>+ENABLE_WEBGL2 = ;
+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 class="lines">@@ -197,6 +197,6 @@
</span><span class="cx"> ENABLE_FTL_JIT[sdk=macosx*] = ENABLE_FTL_JIT;
</span><span class="cx"> ENABLE_FTL_JIT[sdk=iphoneos*] = ENABLE_FTL_JIT;
</span><span class="cx">
</span><del>-ENABLE_CUSTOM_ELEMENTS = ENABLE_CUSTOM_ELEMENTS;
</del><ins>+ENABLE_CUSTOM_ELEMENTS = ;
</ins><span class="cx">
</span><span class="cx"> FEATURE_DEFINES = $(ENABLE_3D_TRANSFORMS) $(ENABLE_ACCELERATED_2D_CANVAS) $(ENABLE_ACCELERATED_OVERFLOW_SCROLLING) $(ENABLE_APPLE_PAY) $(ENABLE_AVF_CAPTIONS) $(ENABLE_ATTACHMENT_ELEMENT) $(ENABLE_CACHE_PARTITIONING) $(ENABLE_CANVAS_PATH) $(ENABLE_CANVAS_PROXY) $(ENABLE_CHANNEL_MESSAGING) $(ENABLE_ES6_MODULES) $(ENABLE_CONTENT_FILTERING) $(ENABLE_CSP_NEXT) $(ENABLE_CSS_ANIMATIONS_LEVEL_2) $(ENABLE_CSS_BOX_DECORATION_BREAK) $(ENABLE_CSS_COMPOSITING) $(ENABLE_CSS_DEVICE_ADAPTATION) $(ENABLE_CSS_GRID_LAYOUT) $(ENABLE_CSS_IMAGE_ORIENTATION) $(ENABLE_CSS_IMAGE_RESOLUTION) $(ENABLE_CSS_REGIONS) $(ENABLE_CSS_SELECTORS_LEVEL4) $(ENABLE_CSS_SHAPES) $(ENABLE_CSS3_TEXT) $(ENABLE_CSS3_TEXT_LINE_BREAK) $(ENABLE_CURSOR_VISIBILITY) $(ENABLE_CUSTOM_SCHEME_HANDLER) $(ENABLE_DASHBOARD_SUPPORT) $(ENABLE_DATALIST_ELEMENT) $(ENABLE_DATA_TRANSFER_ITEMS) $(ENABLE_DETAILS_ELEMENT) $(ENABLE_DEVICE_ORIENTATION) $(ENABLE_DOM4_EVENTS_CONSTRUCTOR) $(ENABLE_ENCRYPTED_MEDIA) $(ENABL
E_ENCRYPTED_MEDIA_V2) $(ENABLE_FETCH_API) $(ENABLE_FILTERS_LEVEL_2) $(ENABLE_FONT_LOAD_EVENTS) $(ENABLE_FULLSCREEN_API) $(ENABLE_GAMEPAD) $(ENABLE_GAMEPAD_DEPRECATED) $(ENABLE_GEOLOCATION) $(ENABLE_ICONDATABASE) $(ENABLE_SERVICE_CONTROLS) $(ENABLE_INDEXED_DATABASE) $(ENABLE_INDEXED_DATABASE_IN_WORKERS) $(ENABLE_INDIE_UI) $(ENABLE_INPUT_TYPE_COLOR) $(ENABLE_INPUT_TYPE_COLOR_POPOVER) $(ENABLE_INPUT_TYPE_DATE) $(ENABLE_INPUT_TYPE_DATETIME_INCOMPLETE) $(ENABLE_INPUT_TYPE_DATETIMELOCAL) $(ENABLE_INPUT_TYPE_MONTH) $(ENABLE_INPUT_TYPE_TIME) $(ENABLE_INPUT_TYPE_WEEK) $(ENABLE_WIRELESS_PLAYBACK_TARGET) $(ENABLE_INTL) $(ENABLE_IOS_GESTURE_EVENTS) $(ENABLE_IOS_TEXT_AUTOSIZING) $(ENABLE_IOS_TOUCH_EVENTS) $(ENABLE_LEGACY_CSS_VENDOR_PREFIXES) $(ENABLE_LEGACY_NOTIFICATIONS) $(ENABLE_LEGACY_VENDOR_PREFIXES) $(ENABLE_LEGACY_WEB_AUDIO) $(ENABLE_LETTERPRESS) $(ENABLE_LINK_PREFETCH) $(ENABLE_MAC_GESTURE_EVENTS) $(ENABLE_MATHML) $(ENABLE_MEDIA_CONTROLS_SCRIPT) $(ENABLE_MEDIA_SESSION) $(ENABLE_ME
DIA_SOURCE) $(ENABLE_MEDIA_STATISTICS) $(ENABLE_MEDIA_STREAM) $(ENABLE_METER_ELEMENT) $(ENABLE_MHTML) $(ENABLE_MOUSE_CURSOR_SCALE) $(ENABLE_NAVIGATOR_CONTENT_UTILS) $(ENABLE_NAVIGATOR_HWCONCURRENCY) $(ENABLE_NOTIFICATIONS) $(ENABLE_PDFKIT_PLUGIN) $(ENABLE_POINTER_LOCK) $(ENABLE_PROXIMITY_EVENTS) $(ENABLE_PUBLIC_SUFFIX_LIST) $(ENABLE_QUOTA) $(ENABLE_REQUEST_ANIMATION_FRAME) $(ENABLE_REQUEST_AUTOCOMPLETE) $(ENABLE_REMOTE_INSPECTOR) $(ENABLE_RESOLUTION_MEDIA_QUERY) $(ENABLE_RESOURCE_USAGE) $(ENABLE_RUBBER_BANDING) $(ENABLE_CSS_SCROLL_SNAP) $(ENABLE_SPEECH_SYNTHESIS) $(ENABLE_STREAMS_API) $(ENABLE_SUBTLE_CRYPTO) $(ENABLE_SVG_FONTS) $(ENABLE_TELEPHONE_NUMBER_DETECTION) $(ENABLE_TEXT_AUTOSIZING) $(ENABLE_TOUCH_EVENTS) $(ENABLE_TOUCH_ICON_LOADING) $(ENABLE_CSS_TRAILING_WORD) $(ENABLE_USERSELECT_ALL) $(ENABLE_VIDEO) $(ENABLE_VIDEO_TRACK) $(ENABLE_DATACUE_VALUE) $(ENABLE_VIEW_MODE_CSS_MEDIA) $(ENABLE_WEBASSEMBLY) $(ENABLE_WEBGL) $(ENABLE_WEBGL2) $(ENABLE_WEB_ANIMATIONS) $(ENABLE_WEB_
AUDIO) $(ENABLE_WEB_REPLAY) $(ENABLE_WEB_SOCKETS) $(ENABLE_WEB_TIMING) $(ENABLE_XSLT) $(ENABLE_FTL_JIT) $(ENABLE_JIT) $(ENABLE_CUSTOM_ELEMENTS) $(ENABLE_VIDEO_PRESENTATION_MODE);
</span></span></pre></div>
<a id="branchessafari602138branchSourceWebCorecssCSSParsercpp"></a>
<div class="modfile"><h4>Modified: branches/safari-602.1.38-branch/Source/WebCore/css/CSSParser.cpp (202390 => 202391)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-602.1.38-branch/Source/WebCore/css/CSSParser.cpp 2016-06-23 19:17:49 UTC (rev 202390)
+++ branches/safari-602.1.38-branch/Source/WebCore/css/CSSParser.cpp 2016-06-23 19:20:11 UTC (rev 202391)
</span><span class="lines">@@ -1014,7 +1014,7 @@
</span><span class="cx"> ASSERT_NOT_REACHED();
</span><span class="cx"> return false;
</span><span class="cx"> }
</span><del>-#if !ENABLE(CSS_GRID_LAYOUT)
</del><ins>+#if !ENABLE(CSS_COMPOSITING) && !ENABLE(CSS_REGIONS)
</ins><span class="cx"> UNUSED_PARAM(parserContext);
</span><span class="cx"> #endif
</span><span class="cx"> return false;
</span></span></pre></div>
<a id="branchessafari602138branchSourceWebKitmacChangeLog"></a>
<div class="modfile"><h4>Modified: branches/safari-602.1.38-branch/Source/WebKit/mac/ChangeLog (202390 => 202391)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-602.1.38-branch/Source/WebKit/mac/ChangeLog 2016-06-23 19:17:49 UTC (rev 202390)
+++ branches/safari-602.1.38-branch/Source/WebKit/mac/ChangeLog 2016-06-23 19:20:11 UTC (rev 202391)
</span><span class="lines">@@ -1,3 +1,14 @@
</span><ins>+2016-06-23 Babak Shafiei <bshafiei@apple.com>
+
+ Merge patch for rdar://problem/26831566.
+
+ 2016-06-23 Dean Jackson <dino@apple.com>
+
+ Disable some features on safari-602.1.38-branch.
+ <rdar://problem/26831566>
+
+ * Configurations/FeatureDefines.xcconfig:
+
</ins><span class="cx"> 2016-06-23 John Wilander <wilander@apple.com>
</span><span class="cx">
</span><span class="cx"> Enable window.open() for existing versions of Secret Society app
</span></span></pre></div>
<a id="branchessafari602138branchSourceWebKitmacConfigurationsFeatureDefinesxcconfig"></a>
<div class="modfile"><h4>Modified: branches/safari-602.1.38-branch/Source/WebKit/mac/Configurations/FeatureDefines.xcconfig (202390 => 202391)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-602.1.38-branch/Source/WebKit/mac/Configurations/FeatureDefines.xcconfig 2016-06-23 19:17:49 UTC (rev 202390)
+++ branches/safari-602.1.38-branch/Source/WebKit/mac/Configurations/FeatureDefines.xcconfig 2016-06-23 19:20:11 UTC (rev 202391)
</span><span class="lines">@@ -53,15 +53,15 @@
</span><span class="cx"> ENABLE_ES6_MODULES = ;
</span><span class="cx"> ENABLE_CONTENT_FILTERING = 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><del>-ENABLE_CSS_GRID_LAYOUT = ENABLE_CSS_GRID_LAYOUT;
</del><ins>+ENABLE_CSS_GRID_LAYOUT = ;
</ins><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_CSS_SHAPES = ENABLE_CSS_SHAPES;
</span><span class="cx"> ENABLE_CSS3_TEXT = ;
</span><span class="cx"> ENABLE_CSS3_TEXT_LINE_BREAK = ;
</span><span class="lines">@@ -75,11 +75,11 @@
</span><span class="cx"> ENABLE_DOM4_EVENTS_CONSTRUCTOR = ENABLE_DOM4_EVENTS_CONSTRUCTOR;
</span><span class="cx"> ENABLE_ENCRYPTED_MEDIA[sdk=macosx*] = ENABLE_ENCRYPTED_MEDIA;
</span><span class="cx"> ENABLE_ENCRYPTED_MEDIA_V2[sdk=macosx*] = ENABLE_ENCRYPTED_MEDIA_V2;
</span><del>-ENABLE_FETCH_API = ENABLE_FETCH_API;
</del><ins>+ENABLE_FETCH_API = ;
</ins><span class="cx"> ENABLE_FILTERS_LEVEL_2 = ENABLE_FILTERS_LEVEL_2;
</span><span class="cx"> ENABLE_FONT_LOAD_EVENTS = ;
</span><span class="cx"> ENABLE_FULLSCREEN_API[sdk=macosx*] = ENABLE_FULLSCREEN_API;
</span><del>-ENABLE_GAMEPAD[sdk=macosx*] = ENABLE_GAMEPAD;
</del><ins>+ENABLE_GAMEPAD[sdk=macosx*] = ;
</ins><span class="cx"> ENABLE_GAMEPAD_DEPRECATED = ;
</span><span class="cx"> ENABLE_GEOLOCATION = ENABLE_GEOLOCATION;
</span><span class="cx"> ENABLE_ICONDATABASE[sdk=macosx*] = ENABLE_ICONDATABASE;
</span><span class="lines">@@ -86,9 +86,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">@@ -134,12 +134,12 @@
</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[sdk=macosx*] = 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="cx"> ENABLE_NAVIGATOR_CONTENT_UTILS = ;
</span><del>-ENABLE_NAVIGATOR_HWCONCURRENCY = ENABLE_NAVIGATOR_HWCONCURRENCY;
</del><ins>+ENABLE_NAVIGATOR_HWCONCURRENCY = ;
</ins><span class="cx"> ENABLE_NOSNIFF = ;
</span><span class="cx"> ENABLE_NOTIFICATIONS[sdk=macosx*] = ENABLE_NOTIFICATIONS;
</span><span class="cx"> ENABLE_PDFKIT_PLUGIN[sdk=macosx*] = ENABLE_PDFKIT_PLUGIN;
</span><span class="lines">@@ -155,7 +155,7 @@
</span><span class="cx"> ENABLE_RUBBER_BANDING[sdk=macosx*] = ENABLE_RUBBER_BANDING;
</span><span class="cx"> ENABLE_CSS_SCROLL_SNAP = ENABLE_CSS_SCROLL_SNAP;
</span><span class="cx"> ENABLE_SPEECH_SYNTHESIS = ENABLE_SPEECH_SYNTHESIS;
</span><del>-ENABLE_STREAMS_API = ENABLE_STREAMS_API;
</del><ins>+ENABLE_STREAMS_API = ;
</ins><span class="cx"> ENABLE_SUBTLE_CRYPTO = ENABLE_SUBTLE_CRYPTO;
</span><span class="cx"> ENABLE_SVG_FONTS = ENABLE_SVG_FONTS;
</span><span class="cx">
</span><span class="lines">@@ -182,12 +182,12 @@
</span><span class="cx"> ENABLE_VIEW_MODE_CSS_MEDIA = ;
</span><span class="cx"> ENABLE_WEBASSEMBLY = ;
</span><span class="cx"> ENABLE_WEBGL = ENABLE_WEBGL;
</span><del>-ENABLE_WEBGL2 = ENABLE_WEBGL2;
-ENABLE_WEB_ANIMATIONS = ENABLE_WEB_ANIMATIONS;
</del><ins>+ENABLE_WEBGL2 = ;
+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 class="lines">@@ -197,6 +197,6 @@
</span><span class="cx"> ENABLE_FTL_JIT[sdk=macosx*] = ENABLE_FTL_JIT;
</span><span class="cx"> ENABLE_FTL_JIT[sdk=iphoneos*] = ENABLE_FTL_JIT;
</span><span class="cx">
</span><del>-ENABLE_CUSTOM_ELEMENTS = ENABLE_CUSTOM_ELEMENTS;
</del><ins>+ENABLE_CUSTOM_ELEMENTS = ;
</ins><span class="cx">
</span><span class="cx"> FEATURE_DEFINES = $(ENABLE_3D_TRANSFORMS) $(ENABLE_ACCELERATED_2D_CANVAS) $(ENABLE_ACCELERATED_OVERFLOW_SCROLLING) $(ENABLE_APPLE_PAY) $(ENABLE_AVF_CAPTIONS) $(ENABLE_ATTACHMENT_ELEMENT) $(ENABLE_CACHE_PARTITIONING) $(ENABLE_CANVAS_PATH) $(ENABLE_CANVAS_PROXY) $(ENABLE_CHANNEL_MESSAGING) $(ENABLE_ES6_MODULES) $(ENABLE_CONTENT_FILTERING) $(ENABLE_CSP_NEXT) $(ENABLE_CSS_ANIMATIONS_LEVEL_2) $(ENABLE_CSS_BOX_DECORATION_BREAK) $(ENABLE_CSS_COMPOSITING) $(ENABLE_CSS_DEVICE_ADAPTATION) $(ENABLE_CSS_GRID_LAYOUT) $(ENABLE_CSS_IMAGE_ORIENTATION) $(ENABLE_CSS_IMAGE_RESOLUTION) $(ENABLE_CSS_REGIONS) $(ENABLE_CSS_SELECTORS_LEVEL4) $(ENABLE_CSS_SHAPES) $(ENABLE_CSS3_TEXT) $(ENABLE_CSS3_TEXT_LINE_BREAK) $(ENABLE_CURSOR_VISIBILITY) $(ENABLE_CUSTOM_SCHEME_HANDLER) $(ENABLE_DASHBOARD_SUPPORT) $(ENABLE_DATALIST_ELEMENT) $(ENABLE_DATA_TRANSFER_ITEMS) $(ENABLE_DETAILS_ELEMENT) $(ENABLE_DEVICE_ORIENTATION) $(ENABLE_DOM4_EVENTS_CONSTRUCTOR) $(ENABLE_ENCRYPTED_MEDIA) $(ENABL
E_ENCRYPTED_MEDIA_V2) $(ENABLE_FETCH_API) $(ENABLE_FILTERS_LEVEL_2) $(ENABLE_FONT_LOAD_EVENTS) $(ENABLE_FULLSCREEN_API) $(ENABLE_GAMEPAD) $(ENABLE_GAMEPAD_DEPRECATED) $(ENABLE_GEOLOCATION) $(ENABLE_ICONDATABASE) $(ENABLE_SERVICE_CONTROLS) $(ENABLE_INDEXED_DATABASE) $(ENABLE_INDEXED_DATABASE_IN_WORKERS) $(ENABLE_INDIE_UI) $(ENABLE_INPUT_TYPE_COLOR) $(ENABLE_INPUT_TYPE_COLOR_POPOVER) $(ENABLE_INPUT_TYPE_DATE) $(ENABLE_INPUT_TYPE_DATETIME_INCOMPLETE) $(ENABLE_INPUT_TYPE_DATETIMELOCAL) $(ENABLE_INPUT_TYPE_MONTH) $(ENABLE_INPUT_TYPE_TIME) $(ENABLE_INPUT_TYPE_WEEK) $(ENABLE_WIRELESS_PLAYBACK_TARGET) $(ENABLE_INTL) $(ENABLE_IOS_GESTURE_EVENTS) $(ENABLE_IOS_TEXT_AUTOSIZING) $(ENABLE_IOS_TOUCH_EVENTS) $(ENABLE_LEGACY_CSS_VENDOR_PREFIXES) $(ENABLE_LEGACY_NOTIFICATIONS) $(ENABLE_LEGACY_VENDOR_PREFIXES) $(ENABLE_LEGACY_WEB_AUDIO) $(ENABLE_LETTERPRESS) $(ENABLE_LINK_PREFETCH) $(ENABLE_MAC_GESTURE_EVENTS) $(ENABLE_MATHML) $(ENABLE_MEDIA_CONTROLS_SCRIPT) $(ENABLE_MEDIA_SESSION) $(ENABLE_ME
DIA_SOURCE) $(ENABLE_MEDIA_STATISTICS) $(ENABLE_MEDIA_STREAM) $(ENABLE_METER_ELEMENT) $(ENABLE_MHTML) $(ENABLE_MOUSE_CURSOR_SCALE) $(ENABLE_NAVIGATOR_CONTENT_UTILS) $(ENABLE_NAVIGATOR_HWCONCURRENCY) $(ENABLE_NOTIFICATIONS) $(ENABLE_PDFKIT_PLUGIN) $(ENABLE_POINTER_LOCK) $(ENABLE_PROXIMITY_EVENTS) $(ENABLE_PUBLIC_SUFFIX_LIST) $(ENABLE_QUOTA) $(ENABLE_REQUEST_ANIMATION_FRAME) $(ENABLE_REQUEST_AUTOCOMPLETE) $(ENABLE_REMOTE_INSPECTOR) $(ENABLE_RESOLUTION_MEDIA_QUERY) $(ENABLE_RESOURCE_USAGE) $(ENABLE_RUBBER_BANDING) $(ENABLE_CSS_SCROLL_SNAP) $(ENABLE_SPEECH_SYNTHESIS) $(ENABLE_STREAMS_API) $(ENABLE_SUBTLE_CRYPTO) $(ENABLE_SVG_FONTS) $(ENABLE_TELEPHONE_NUMBER_DETECTION) $(ENABLE_TEXT_AUTOSIZING) $(ENABLE_TOUCH_EVENTS) $(ENABLE_TOUCH_ICON_LOADING) $(ENABLE_CSS_TRAILING_WORD) $(ENABLE_USERSELECT_ALL) $(ENABLE_VIDEO) $(ENABLE_VIDEO_TRACK) $(ENABLE_DATACUE_VALUE) $(ENABLE_VIEW_MODE_CSS_MEDIA) $(ENABLE_WEBASSEMBLY) $(ENABLE_WEBGL) $(ENABLE_WEBGL2) $(ENABLE_WEB_ANIMATIONS) $(ENABLE_WEB_
AUDIO) $(ENABLE_WEB_REPLAY) $(ENABLE_WEB_SOCKETS) $(ENABLE_WEB_TIMING) $(ENABLE_XSLT) $(ENABLE_FTL_JIT) $(ENABLE_JIT) $(ENABLE_CUSTOM_ELEMENTS) $(ENABLE_VIDEO_PRESENTATION_MODE);
</span></span></pre></div>
<a id="branchessafari602138branchSourceWebKit2ChangeLog"></a>
<div class="modfile"><h4>Modified: branches/safari-602.1.38-branch/Source/WebKit2/ChangeLog (202390 => 202391)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-602.1.38-branch/Source/WebKit2/ChangeLog 2016-06-23 19:17:49 UTC (rev 202390)
+++ branches/safari-602.1.38-branch/Source/WebKit2/ChangeLog 2016-06-23 19:20:11 UTC (rev 202391)
</span><span class="lines">@@ -1,3 +1,14 @@
</span><ins>+2016-06-23 Babak Shafiei <bshafiei@apple.com>
+
+ Merge patch for rdar://problem/26831566.
+
+ 2016-06-23 Dean Jackson <dino@apple.com>
+
+ Disable some features on safari-602.1.38-branch.
+ <rdar://problem/26831566>
+
+ * Configurations/FeatureDefines.xcconfig:
+
</ins><span class="cx"> 2016-06-23 Commit Queue <commit-queue@webkit.org>
</span><span class="cx">
</span><span class="cx"> Unreviewed, rolling out r201194.
</span></span></pre></div>
<a id="branchessafari602138branchSourceWebKit2ConfigurationsFeatureDefinesxcconfig"></a>
<div class="modfile"><h4>Modified: branches/safari-602.1.38-branch/Source/WebKit2/Configurations/FeatureDefines.xcconfig (202390 => 202391)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-602.1.38-branch/Source/WebKit2/Configurations/FeatureDefines.xcconfig 2016-06-23 19:17:49 UTC (rev 202390)
+++ branches/safari-602.1.38-branch/Source/WebKit2/Configurations/FeatureDefines.xcconfig 2016-06-23 19:20:11 UTC (rev 202391)
</span><span class="lines">@@ -53,15 +53,15 @@
</span><span class="cx"> ENABLE_ES6_MODULES = ;
</span><span class="cx"> ENABLE_CONTENT_FILTERING = 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><del>-ENABLE_CSS_GRID_LAYOUT = ENABLE_CSS_GRID_LAYOUT;
</del><ins>+ENABLE_CSS_GRID_LAYOUT = ;
</ins><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_CSS_SHAPES = ENABLE_CSS_SHAPES;
</span><span class="cx"> ENABLE_CSS3_TEXT = ;
</span><span class="cx"> ENABLE_CSS3_TEXT_LINE_BREAK = ;
</span><span class="lines">@@ -75,11 +75,11 @@
</span><span class="cx"> ENABLE_DOM4_EVENTS_CONSTRUCTOR = ENABLE_DOM4_EVENTS_CONSTRUCTOR;
</span><span class="cx"> ENABLE_ENCRYPTED_MEDIA[sdk=macosx*] = ENABLE_ENCRYPTED_MEDIA;
</span><span class="cx"> ENABLE_ENCRYPTED_MEDIA_V2[sdk=macosx*] = ENABLE_ENCRYPTED_MEDIA_V2;
</span><del>-ENABLE_FETCH_API = ENABLE_FETCH_API;
</del><ins>+ENABLE_FETCH_API = ;
</ins><span class="cx"> ENABLE_FILTERS_LEVEL_2 = ENABLE_FILTERS_LEVEL_2;
</span><span class="cx"> ENABLE_FONT_LOAD_EVENTS = ;
</span><span class="cx"> ENABLE_FULLSCREEN_API[sdk=macosx*] = ENABLE_FULLSCREEN_API;
</span><del>-ENABLE_GAMEPAD[sdk=macosx*] = ENABLE_GAMEPAD;
</del><ins>+ENABLE_GAMEPAD[sdk=macosx*] = ;
</ins><span class="cx"> ENABLE_GAMEPAD_DEPRECATED = ;
</span><span class="cx"> ENABLE_GEOLOCATION = ENABLE_GEOLOCATION;
</span><span class="cx"> ENABLE_ICONDATABASE[sdk=macosx*] = ENABLE_ICONDATABASE;
</span><span class="lines">@@ -86,9 +86,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">@@ -134,12 +134,12 @@
</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[sdk=macosx*] = 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="cx"> ENABLE_NAVIGATOR_CONTENT_UTILS = ;
</span><del>-ENABLE_NAVIGATOR_HWCONCURRENCY = ENABLE_NAVIGATOR_HWCONCURRENCY;
</del><ins>+ENABLE_NAVIGATOR_HWCONCURRENCY = ;
</ins><span class="cx"> ENABLE_NOSNIFF = ;
</span><span class="cx"> ENABLE_NOTIFICATIONS[sdk=macosx*] = ENABLE_NOTIFICATIONS;
</span><span class="cx"> ENABLE_PDFKIT_PLUGIN[sdk=macosx*] = ENABLE_PDFKIT_PLUGIN;
</span><span class="lines">@@ -155,7 +155,7 @@
</span><span class="cx"> ENABLE_RUBBER_BANDING[sdk=macosx*] = ENABLE_RUBBER_BANDING;
</span><span class="cx"> ENABLE_CSS_SCROLL_SNAP = ENABLE_CSS_SCROLL_SNAP;
</span><span class="cx"> ENABLE_SPEECH_SYNTHESIS = ENABLE_SPEECH_SYNTHESIS;
</span><del>-ENABLE_STREAMS_API = ENABLE_STREAMS_API;
</del><ins>+ENABLE_STREAMS_API = ;
</ins><span class="cx"> ENABLE_SUBTLE_CRYPTO = ENABLE_SUBTLE_CRYPTO;
</span><span class="cx"> ENABLE_SVG_FONTS = ENABLE_SVG_FONTS;
</span><span class="cx">
</span><span class="lines">@@ -182,12 +182,12 @@
</span><span class="cx"> ENABLE_VIEW_MODE_CSS_MEDIA = ;
</span><span class="cx"> ENABLE_WEBASSEMBLY = ;
</span><span class="cx"> ENABLE_WEBGL = ENABLE_WEBGL;
</span><del>-ENABLE_WEBGL2 = ENABLE_WEBGL2;
-ENABLE_WEB_ANIMATIONS = ENABLE_WEB_ANIMATIONS;
</del><ins>+ENABLE_WEBGL2 = ;
+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 class="lines">@@ -197,6 +197,6 @@
</span><span class="cx"> ENABLE_FTL_JIT[sdk=macosx*] = ENABLE_FTL_JIT;
</span><span class="cx"> ENABLE_FTL_JIT[sdk=iphoneos*] = ENABLE_FTL_JIT;
</span><span class="cx">
</span><del>-ENABLE_CUSTOM_ELEMENTS = ENABLE_CUSTOM_ELEMENTS;
</del><ins>+ENABLE_CUSTOM_ELEMENTS = ;
</ins><span class="cx">
</span><span class="cx"> FEATURE_DEFINES = $(ENABLE_3D_TRANSFORMS) $(ENABLE_ACCELERATED_2D_CANVAS) $(ENABLE_ACCELERATED_OVERFLOW_SCROLLING) $(ENABLE_APPLE_PAY) $(ENABLE_AVF_CAPTIONS) $(ENABLE_ATTACHMENT_ELEMENT) $(ENABLE_CACHE_PARTITIONING) $(ENABLE_CANVAS_PATH) $(ENABLE_CANVAS_PROXY) $(ENABLE_CHANNEL_MESSAGING) $(ENABLE_ES6_MODULES) $(ENABLE_CONTENT_FILTERING) $(ENABLE_CSP_NEXT) $(ENABLE_CSS_ANIMATIONS_LEVEL_2) $(ENABLE_CSS_BOX_DECORATION_BREAK) $(ENABLE_CSS_COMPOSITING) $(ENABLE_CSS_DEVICE_ADAPTATION) $(ENABLE_CSS_GRID_LAYOUT) $(ENABLE_CSS_IMAGE_ORIENTATION) $(ENABLE_CSS_IMAGE_RESOLUTION) $(ENABLE_CSS_REGIONS) $(ENABLE_CSS_SELECTORS_LEVEL4) $(ENABLE_CSS_SHAPES) $(ENABLE_CSS3_TEXT) $(ENABLE_CSS3_TEXT_LINE_BREAK) $(ENABLE_CURSOR_VISIBILITY) $(ENABLE_CUSTOM_SCHEME_HANDLER) $(ENABLE_DASHBOARD_SUPPORT) $(ENABLE_DATALIST_ELEMENT) $(ENABLE_DATA_TRANSFER_ITEMS) $(ENABLE_DETAILS_ELEMENT) $(ENABLE_DEVICE_ORIENTATION) $(ENABLE_DOM4_EVENTS_CONSTRUCTOR) $(ENABLE_ENCRYPTED_MEDIA) $(ENABL
E_ENCRYPTED_MEDIA_V2) $(ENABLE_FETCH_API) $(ENABLE_FILTERS_LEVEL_2) $(ENABLE_FONT_LOAD_EVENTS) $(ENABLE_FULLSCREEN_API) $(ENABLE_GAMEPAD) $(ENABLE_GAMEPAD_DEPRECATED) $(ENABLE_GEOLOCATION) $(ENABLE_ICONDATABASE) $(ENABLE_SERVICE_CONTROLS) $(ENABLE_INDEXED_DATABASE) $(ENABLE_INDEXED_DATABASE_IN_WORKERS) $(ENABLE_INDIE_UI) $(ENABLE_INPUT_TYPE_COLOR) $(ENABLE_INPUT_TYPE_COLOR_POPOVER) $(ENABLE_INPUT_TYPE_DATE) $(ENABLE_INPUT_TYPE_DATETIME_INCOMPLETE) $(ENABLE_INPUT_TYPE_DATETIMELOCAL) $(ENABLE_INPUT_TYPE_MONTH) $(ENABLE_INPUT_TYPE_TIME) $(ENABLE_INPUT_TYPE_WEEK) $(ENABLE_WIRELESS_PLAYBACK_TARGET) $(ENABLE_INTL) $(ENABLE_IOS_GESTURE_EVENTS) $(ENABLE_IOS_TEXT_AUTOSIZING) $(ENABLE_IOS_TOUCH_EVENTS) $(ENABLE_LEGACY_CSS_VENDOR_PREFIXES) $(ENABLE_LEGACY_NOTIFICATIONS) $(ENABLE_LEGACY_VENDOR_PREFIXES) $(ENABLE_LEGACY_WEB_AUDIO) $(ENABLE_LETTERPRESS) $(ENABLE_LINK_PREFETCH) $(ENABLE_MAC_GESTURE_EVENTS) $(ENABLE_MATHML) $(ENABLE_MEDIA_CONTROLS_SCRIPT) $(ENABLE_MEDIA_SESSION) $(ENABLE_ME
DIA_SOURCE) $(ENABLE_MEDIA_STATISTICS) $(ENABLE_MEDIA_STREAM) $(ENABLE_METER_ELEMENT) $(ENABLE_MHTML) $(ENABLE_MOUSE_CURSOR_SCALE) $(ENABLE_NAVIGATOR_CONTENT_UTILS) $(ENABLE_NAVIGATOR_HWCONCURRENCY) $(ENABLE_NOTIFICATIONS) $(ENABLE_PDFKIT_PLUGIN) $(ENABLE_POINTER_LOCK) $(ENABLE_PROXIMITY_EVENTS) $(ENABLE_PUBLIC_SUFFIX_LIST) $(ENABLE_QUOTA) $(ENABLE_REQUEST_ANIMATION_FRAME) $(ENABLE_REQUEST_AUTOCOMPLETE) $(ENABLE_REMOTE_INSPECTOR) $(ENABLE_RESOLUTION_MEDIA_QUERY) $(ENABLE_RESOURCE_USAGE) $(ENABLE_RUBBER_BANDING) $(ENABLE_CSS_SCROLL_SNAP) $(ENABLE_SPEECH_SYNTHESIS) $(ENABLE_STREAMS_API) $(ENABLE_SUBTLE_CRYPTO) $(ENABLE_SVG_FONTS) $(ENABLE_TELEPHONE_NUMBER_DETECTION) $(ENABLE_TEXT_AUTOSIZING) $(ENABLE_TOUCH_EVENTS) $(ENABLE_TOUCH_ICON_LOADING) $(ENABLE_CSS_TRAILING_WORD) $(ENABLE_USERSELECT_ALL) $(ENABLE_VIDEO) $(ENABLE_VIDEO_TRACK) $(ENABLE_DATACUE_VALUE) $(ENABLE_VIEW_MODE_CSS_MEDIA) $(ENABLE_WEBASSEMBLY) $(ENABLE_WEBGL) $(ENABLE_WEBGL2) $(ENABLE_WEB_ANIMATIONS) $(ENABLE_WEB_
AUDIO) $(ENABLE_WEB_REPLAY) $(ENABLE_WEB_SOCKETS) $(ENABLE_WEB_TIMING) $(ENABLE_XSLT) $(ENABLE_FTL_JIT) $(ENABLE_JIT) $(ENABLE_CUSTOM_ELEMENTS) $(ENABLE_VIDEO_PRESENTATION_MODE);
</span></span></pre></div>
<a id="branchessafari602138branchSourceWebKit2SharedWebPreferencesDefinitionsh"></a>
<div class="modfile"><h4>Modified: branches/safari-602.1.38-branch/Source/WebKit2/Shared/WebPreferencesDefinitions.h (202390 => 202391)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-602.1.38-branch/Source/WebKit2/Shared/WebPreferencesDefinitions.h 2016-06-23 19:17:49 UTC (rev 202390)
+++ branches/safari-602.1.38-branch/Source/WebKit2/Shared/WebPreferencesDefinitions.h 2016-06-23 19:20:11 UTC (rev 202391)
</span><span class="lines">@@ -292,10 +292,10 @@
</span><span class="cx"> // - They should be false by default, although they are currently set to true while we develop client UI.
</span><span class="cx">
</span><span class="cx"> #define FOR_EACH_WEBKIT_EXPERIMENTAL_FEATURE_PREFERENCE(macro) \
</span><del>- macro(CSSGridLayoutEnabled, cssGridLayoutEnabled, Bool, bool, true, "CSS Grid", "CSS Grid Layout Module support") \
- macro(CustomElementsEnabled, customElementsEnabled, Bool, bool, true, "Custom Elements", "HTML Custom Elements prototype") \
- macro(WebGL2Enabled, webGL2Enabled, Bool, bool, true, "WebGL 2.0", "WebGL 2 prototype") \
- macro(SpringTimingFunctionEnabled, springTimingFunctionEnabled, Bool, bool, true, "CSS Spring Animations", "CSS Spring Animation prototype") \
</del><ins>+ macro(CSSGridLayoutEnabled, cssGridLayoutEnabled, Bool, bool, false, "CSS Grid", "CSS Grid Layout Module support") \
+ macro(CustomElementsEnabled, customElementsEnabled, Bool, bool, false, "Custom Elements", "HTML Custom Elements prototype") \
+ macro(WebGL2Enabled, webGL2Enabled, Bool, bool, false, "WebGL 2.0", "WebGL 2 prototype") \
+ macro(SpringTimingFunctionEnabled, springTimingFunctionEnabled, Bool, bool, false, "CSS Spring Animations", "CSS Spring Animation prototype") \
</ins><span class="cx"> \
</span><span class="cx">
</span><span class="cx"> #if PLATFORM(COCOA)
</span></span></pre>
</div>
</div>
</body>
</html>