<!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>[184509] branches/safari-601.1.32.2-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/184509">184509</a></dd>
<dt>Author</dt> <dd>matthew_hanson@apple.com</dd>
<dt>Date</dt> <dd>2015-05-18 13:15:49 -0700 (Mon, 18 May 2015)</dd>
</dl>

<h3>Log Message</h3>
<pre>Merge custom patch. rdar://problem/20950052</pre>

<h3>Modified Paths</h3>
<ul>
<li><a href="#branchessafari6011322branchSourceJavaScriptCoreChangeLog">branches/safari-601.1.32.2-branch/Source/JavaScriptCore/ChangeLog</a></li>
<li><a href="#branchessafari6011322branchSourceJavaScriptCoreConfigurationsFeatureDefinesxcconfig">branches/safari-601.1.32.2-branch/Source/JavaScriptCore/Configurations/FeatureDefines.xcconfig</a></li>
<li><a href="#branchessafari6011322branchSourceWTFChangeLog">branches/safari-601.1.32.2-branch/Source/WTF/ChangeLog</a></li>
<li><a href="#branchessafari6011322branchSourceWTFwtfFeatureDefinesh">branches/safari-601.1.32.2-branch/Source/WTF/wtf/FeatureDefines.h</a></li>
<li><a href="#branchessafari6011322branchSourceWebCoreChangeLog">branches/safari-601.1.32.2-branch/Source/WebCore/ChangeLog</a></li>
<li><a href="#branchessafari6011322branchSourceWebCoreConfigurationsFeatureDefinesxcconfig">branches/safari-601.1.32.2-branch/Source/WebCore/Configurations/FeatureDefines.xcconfig</a></li>
<li><a href="#branchessafari6011322branchSourceWebKitmacConfigurationsFeatureDefinesxcconfig">branches/safari-601.1.32.2-branch/Source/WebKit/mac/Configurations/FeatureDefines.xcconfig</a></li>
<li><a href="#branchessafari6011322branchSourceWebKit2ChangeLog">branches/safari-601.1.32.2-branch/Source/WebKit2/ChangeLog</a></li>
<li><a href="#branchessafari6011322branchSourceWebKit2ConfigurationsFeatureDefinesxcconfig">branches/safari-601.1.32.2-branch/Source/WebKit2/Configurations/FeatureDefines.xcconfig</a></li>
</ul>

</div>
<div id="patch">
<h3>Diff</h3>
<a id="branchessafari6011322branchSourceJavaScriptCoreChangeLog"></a>
<div class="modfile"><h4>Modified: branches/safari-601.1.32.2-branch/Source/JavaScriptCore/ChangeLog (184508 => 184509)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601.1.32.2-branch/Source/JavaScriptCore/ChangeLog        2015-05-18 19:53:28 UTC (rev 184508)
+++ branches/safari-601.1.32.2-branch/Source/JavaScriptCore/ChangeLog        2015-05-18 20:15:49 UTC (rev 184509)
</span><span class="lines">@@ -1,5 +1,34 @@
</span><span class="cx"> 2015-05-18  Matthew Hanson  &lt;matthew_hanson@apple.com&gt;
</span><span class="cx"> 
</span><ins>+        Merge custom patch. rdar://problem/20950052
+
+    2015-05-15  Dean Jackson  &lt;dino@apple.com&gt;
+
+            Disable some features on the safari-601.1.32.2-branch
+            https://bugs.webkit.org/show_bug.cgi?id=145077
+            &lt;rdar://problem/20950052&gt;
+
+            Reviewed by Tim Horton.
+
+            Disable the following features:
+
+            - ATTACHMENT_ELEMENT
+            - CSS_ANIMATIONS_LEVEL_2
+            - CSS_GRID_LAYOUT
+            - CSS_SELECTORS_LEVEL4
+            - GAMEPAD
+            - INDIE_UI
+            - INPUT_TYPE_COLOR
+            - INPUT_TYPE_COLOR_POPOVER
+            - NAVIGATOR_HWCONCURRENCY
+            - STREAMS_API
+            - WEB_REPLAY
+            - WILL_REVEAL_EDGE_EVENTS
+
+            * Configurations/FeatureDefines.xcconfig:
+
+2015-05-18  Matthew Hanson  &lt;matthew_hanson@apple.com&gt;
+
</ins><span class="cx">         Merge r184445. rdar://problem/20979071
</span><span class="cx"> 
</span><span class="cx">     2015-05-17  Filip Pizlo  &lt;fpizlo@apple.com&gt;
</span></span></pre></div>
<a id="branchessafari6011322branchSourceJavaScriptCoreConfigurationsFeatureDefinesxcconfig"></a>
<div class="modfile"><h4>Modified: branches/safari-601.1.32.2-branch/Source/JavaScriptCore/Configurations/FeatureDefines.xcconfig (184508 => 184509)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601.1.32.2-branch/Source/JavaScriptCore/Configurations/FeatureDefines.xcconfig        2015-05-18 19:53:28 UTC (rev 184508)
+++ branches/safari-601.1.32.2-branch/Source/JavaScriptCore/Configurations/FeatureDefines.xcconfig        2015-05-18 20:15:49 UTC (rev 184509)
</span><span class="lines">@@ -34,7 +34,7 @@
</span><span class="cx"> ENABLE_3D_TRANSFORMS = ENABLE_3D_TRANSFORMS;
</span><span class="cx"> ENABLE_ACCELERATED_2D_CANVAS = ;
</span><span class="cx"> ENABLE_ACCELERATED_OVERFLOW_SCROLLING[sdk=iphone*] = ENABLE_ACCELERATED_OVERFLOW_SCROLLING;
</span><del>-ENABLE_ATTACHMENT_ELEMENT = ENABLE_ATTACHMENT_ELEMENT;
</del><ins>+ENABLE_ATTACHMENT_ELEMENT = ;
</ins><span class="cx"> ENABLE_AVF_CAPTIONS[sdk=iphone*] = ENABLE_AVF_CAPTIONS;
</span><span class="cx"> ENABLE_AVF_CAPTIONS[sdk=macosx*] = $(ENABLE_AVF_CAPTIONS_macosx_$(TARGET_MAC_OS_X_VERSION_MAJOR));
</span><span class="cx"> ENABLE_AVF_CAPTIONS_macosx_1090 = ;
</span><span class="lines">@@ -48,15 +48,15 @@
</span><span class="cx"> ENABLE_ES6_TEMPLATE_LITERAL_SYNTAX = ENABLE_ES6_TEMPLATE_LITERAL_SYNTAX;
</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">@@ -77,7 +77,7 @@
</span><span class="cx"> ENABLE_FILTERS_LEVEL_2_macosx_101100 = 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_HIDDEN_PAGE_DOM_TIMER_THROTTLING[sdk=macosx*] = ENABLE_HIDDEN_PAGE_DOM_TIMER_THROTTLING;
</span><span class="lines">@@ -88,9 +88,9 @@
</span><span class="cx"> ENABLE_SERVICE_CONTROLS_macosx_101100 = ENABLE_SERVICE_CONTROLS;
</span><span class="cx"> ENABLE_INDEXED_DATABASE = ENABLE_INDEXED_DATABASE;
</span><span class="cx"> 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">@@ -137,7 +137,7 @@
</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">@@ -158,7 +158,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"> ENABLE_SVG_OTF_CONVERTER = ENABLE_SVG_OTF_CONVERTER;
</span><span class="lines">@@ -189,8 +189,8 @@
</span><span class="cx"> ENABLE_WEBGL = ENABLE_WEBGL;
</span><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[sdk=iphone*] = ENABLE_WEB_TIMING;
</span></span></pre></div>
<a id="branchessafari6011322branchSourceWTFChangeLog"></a>
<div class="modfile"><h4>Modified: branches/safari-601.1.32.2-branch/Source/WTF/ChangeLog (184508 => 184509)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601.1.32.2-branch/Source/WTF/ChangeLog        2015-05-18 19:53:28 UTC (rev 184508)
+++ branches/safari-601.1.32.2-branch/Source/WTF/ChangeLog        2015-05-18 20:15:49 UTC (rev 184509)
</span><span class="lines">@@ -1,5 +1,34 @@
</span><span class="cx"> 2015-05-18  Matthew Hanson  &lt;matthew_hanson@apple.com&gt;
</span><span class="cx"> 
</span><ins>+        Merge custom patch. rdar://problem/20950052
+
+    2015-05-15  Dean Jackson  &lt;dino@apple.com&gt;
+
+            Disable some features on the safari-601.1.32.2-branch
+            https://bugs.webkit.org/show_bug.cgi?id=145077
+            &lt;rdar://problem/20950052&gt;
+
+            Reviewed by Tim Horton.
+
+            Disable the following features:
+
+            - ATTACHMENT_ELEMENT
+            - CSS_ANIMATIONS_LEVEL_2
+            - CSS_GRID_LAYOUT
+            - CSS_SELECTORS_LEVEL4
+            - GAMEPAD
+            - INDIE_UI
+            - INPUT_TYPE_COLOR
+            - INPUT_TYPE_COLOR_POPOVER
+            - NAVIGATOR_HWCONCURRENCY
+            - STREAMS_API
+            - WEB_REPLAY
+            - WILL_REVEAL_EDGE_EVENTS
+
+            * Configurations/FeatureDefines.xcconfig:
+
+2015-05-18  Matthew Hanson  &lt;matthew_hanson@apple.com&gt;
+
</ins><span class="cx">         Merge r184341. rdar://problem/20809399
</span><span class="cx"> 
</span><span class="cx">     2015-05-14  Myles C. Maxfield  &lt;mmaxfield@apple.com&gt;
</span></span></pre></div>
<a id="branchessafari6011322branchSourceWTFwtfFeatureDefinesh"></a>
<div class="modfile"><h4>Modified: branches/safari-601.1.32.2-branch/Source/WTF/wtf/FeatureDefines.h (184508 => 184509)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601.1.32.2-branch/Source/WTF/wtf/FeatureDefines.h        2015-05-18 19:53:28 UTC (rev 184508)
+++ branches/safari-601.1.32.2-branch/Source/WTF/wtf/FeatureDefines.h        2015-05-18 20:15:49 UTC (rev 184509)
</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">@@ -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">@@ -682,7 +682,7 @@
</span><span class="cx"> #endif
</span><span class="cx"> 
</span><span class="cx"> #if !defined(ENABLE_STREAMS_API)
</span><del>-#define ENABLE_STREAMS_API 1
</del><ins>+#define ENABLE_STREAMS_API 0
</ins><span class="cx"> #endif
</span><span class="cx"> 
</span><span class="cx"> #if !defined(ENABLE_SVG_FONTS)
</span><span class="lines">@@ -774,7 +774,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_XHR_TIMEOUT)
</span></span></pre></div>
<a id="branchessafari6011322branchSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: branches/safari-601.1.32.2-branch/Source/WebCore/ChangeLog (184508 => 184509)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601.1.32.2-branch/Source/WebCore/ChangeLog        2015-05-18 19:53:28 UTC (rev 184508)
+++ branches/safari-601.1.32.2-branch/Source/WebCore/ChangeLog        2015-05-18 20:15:49 UTC (rev 184509)
</span><span class="lines">@@ -1,5 +1,34 @@
</span><span class="cx"> 2015-05-18  Matthew Hanson  &lt;matthew_hanson@apple.com&gt;
</span><span class="cx"> 
</span><ins>+        Merge custom patch. rdar://problem/20950052
+
+    2015-05-15  Dean Jackson  &lt;dino@apple.com&gt;
+
+            Disable some features on the safari-601.1.32.2-branch
+            https://bugs.webkit.org/show_bug.cgi?id=145077
+            &lt;rdar://problem/20950052&gt;
+
+            Reviewed by Tim Horton.
+
+            Disable the following features:
+
+            - ATTACHMENT_ELEMENT
+            - CSS_ANIMATIONS_LEVEL_2
+            - CSS_GRID_LAYOUT
+            - CSS_SELECTORS_LEVEL4
+            - GAMEPAD
+            - INDIE_UI
+            - INPUT_TYPE_COLOR
+            - INPUT_TYPE_COLOR_POPOVER
+            - NAVIGATOR_HWCONCURRENCY
+            - STREAMS_API
+            - WEB_REPLAY
+            - WILL_REVEAL_EDGE_EVENTS
+
+            * Configurations/FeatureDefines.xcconfig:
+
+2015-05-18  Matthew Hanson  &lt;matthew_hanson@apple.com&gt;
+
</ins><span class="cx">         Merge r184360. rdar://problem/20865442
</span><span class="cx"> 
</span><span class="cx">     2015-05-14  Dean Jackson  &lt;dino@apple.com&gt;
</span></span></pre></div>
<a id="branchessafari6011322branchSourceWebCoreConfigurationsFeatureDefinesxcconfig"></a>
<div class="modfile"><h4>Modified: branches/safari-601.1.32.2-branch/Source/WebCore/Configurations/FeatureDefines.xcconfig (184508 => 184509)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601.1.32.2-branch/Source/WebCore/Configurations/FeatureDefines.xcconfig        2015-05-18 19:53:28 UTC (rev 184508)
+++ branches/safari-601.1.32.2-branch/Source/WebCore/Configurations/FeatureDefines.xcconfig        2015-05-18 20:15:49 UTC (rev 184509)
</span><span class="lines">@@ -34,7 +34,7 @@
</span><span class="cx"> ENABLE_3D_TRANSFORMS = ENABLE_3D_TRANSFORMS;
</span><span class="cx"> ENABLE_ACCELERATED_2D_CANVAS = ;
</span><span class="cx"> ENABLE_ACCELERATED_OVERFLOW_SCROLLING[sdk=iphone*] = ENABLE_ACCELERATED_OVERFLOW_SCROLLING;
</span><del>-ENABLE_ATTACHMENT_ELEMENT = ENABLE_ATTACHMENT_ELEMENT;
</del><ins>+ENABLE_ATTACHMENT_ELEMENT = ;
</ins><span class="cx"> ENABLE_AVF_CAPTIONS[sdk=iphone*] = ENABLE_AVF_CAPTIONS;
</span><span class="cx"> ENABLE_AVF_CAPTIONS[sdk=macosx*] = $(ENABLE_AVF_CAPTIONS_macosx_$(TARGET_MAC_OS_X_VERSION_MAJOR));
</span><span class="cx"> ENABLE_AVF_CAPTIONS_macosx_1090 = ;
</span><span class="lines">@@ -48,15 +48,15 @@
</span><span class="cx"> ENABLE_ES6_TEMPLATE_LITERAL_SYNTAX = ENABLE_ES6_TEMPLATE_LITERAL_SYNTAX;
</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">@@ -77,7 +77,7 @@
</span><span class="cx"> ENABLE_FILTERS_LEVEL_2_macosx_101100 = 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_HIDDEN_PAGE_DOM_TIMER_THROTTLING[sdk=macosx*] = ENABLE_HIDDEN_PAGE_DOM_TIMER_THROTTLING;
</span><span class="lines">@@ -88,9 +88,9 @@
</span><span class="cx"> ENABLE_SERVICE_CONTROLS_macosx_101100 = ENABLE_SERVICE_CONTROLS;
</span><span class="cx"> ENABLE_INDEXED_DATABASE = ENABLE_INDEXED_DATABASE;
</span><span class="cx"> 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">@@ -137,7 +137,7 @@
</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">@@ -158,7 +158,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"> ENABLE_SVG_OTF_CONVERTER = ENABLE_SVG_OTF_CONVERTER;
</span><span class="lines">@@ -189,8 +189,8 @@
</span><span class="cx"> ENABLE_WEBGL = ENABLE_WEBGL;
</span><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[sdk=iphone*] = ENABLE_WEB_TIMING;
</span></span></pre></div>
<a id="branchessafari6011322branchSourceWebKitmacConfigurationsFeatureDefinesxcconfig"></a>
<div class="modfile"><h4>Modified: branches/safari-601.1.32.2-branch/Source/WebKit/mac/Configurations/FeatureDefines.xcconfig (184508 => 184509)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601.1.32.2-branch/Source/WebKit/mac/Configurations/FeatureDefines.xcconfig        2015-05-18 19:53:28 UTC (rev 184508)
+++ branches/safari-601.1.32.2-branch/Source/WebKit/mac/Configurations/FeatureDefines.xcconfig        2015-05-18 20:15:49 UTC (rev 184509)
</span><span class="lines">@@ -34,7 +34,7 @@
</span><span class="cx"> ENABLE_3D_TRANSFORMS = ENABLE_3D_TRANSFORMS;
</span><span class="cx"> ENABLE_ACCELERATED_2D_CANVAS = ;
</span><span class="cx"> ENABLE_ACCELERATED_OVERFLOW_SCROLLING[sdk=iphone*] = ENABLE_ACCELERATED_OVERFLOW_SCROLLING;
</span><del>-ENABLE_ATTACHMENT_ELEMENT = ENABLE_ATTACHMENT_ELEMENT;
</del><ins>+ENABLE_ATTACHMENT_ELEMENT = ;
</ins><span class="cx"> ENABLE_AVF_CAPTIONS[sdk=iphone*] = ENABLE_AVF_CAPTIONS;
</span><span class="cx"> ENABLE_AVF_CAPTIONS[sdk=macosx*] = $(ENABLE_AVF_CAPTIONS_macosx_$(TARGET_MAC_OS_X_VERSION_MAJOR));
</span><span class="cx"> ENABLE_AVF_CAPTIONS_macosx_1090 = ;
</span><span class="lines">@@ -48,15 +48,15 @@
</span><span class="cx"> ENABLE_ES6_TEMPLATE_LITERAL_SYNTAX = ENABLE_ES6_TEMPLATE_LITERAL_SYNTAX;
</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">@@ -77,7 +77,7 @@
</span><span class="cx"> ENABLE_FILTERS_LEVEL_2_macosx_101100 = 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_HIDDEN_PAGE_DOM_TIMER_THROTTLING[sdk=macosx*] = ENABLE_HIDDEN_PAGE_DOM_TIMER_THROTTLING;
</span><span class="lines">@@ -88,9 +88,9 @@
</span><span class="cx"> ENABLE_SERVICE_CONTROLS_macosx_101100 = ENABLE_SERVICE_CONTROLS;
</span><span class="cx"> ENABLE_INDEXED_DATABASE = ENABLE_INDEXED_DATABASE;
</span><span class="cx"> 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">@@ -137,7 +137,7 @@
</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">@@ -158,7 +158,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"> ENABLE_SVG_OTF_CONVERTER = ENABLE_SVG_OTF_CONVERTER;
</span><span class="lines">@@ -189,8 +189,8 @@
</span><span class="cx"> ENABLE_WEBGL = ENABLE_WEBGL;
</span><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[sdk=iphone*] = ENABLE_WEB_TIMING;
</span></span></pre></div>
<a id="branchessafari6011322branchSourceWebKit2ChangeLog"></a>
<div class="modfile"><h4>Modified: branches/safari-601.1.32.2-branch/Source/WebKit2/ChangeLog (184508 => 184509)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601.1.32.2-branch/Source/WebKit2/ChangeLog        2015-05-18 19:53:28 UTC (rev 184508)
+++ branches/safari-601.1.32.2-branch/Source/WebKit2/ChangeLog        2015-05-18 20:15:49 UTC (rev 184509)
</span><span class="lines">@@ -1,5 +1,34 @@
</span><span class="cx"> 2015-05-18  Matthew Hanson  &lt;matthew_hanson@apple.com&gt;
</span><span class="cx"> 
</span><ins>+        Merge custom patch. rdar://problem/20950052
+
+    2015-05-15  Dean Jackson  &lt;dino@apple.com&gt;
+
+            Disable some features on the safari-601.1.32.2-branch
+            https://bugs.webkit.org/show_bug.cgi?id=145077
+            &lt;rdar://problem/20950052&gt;
+
+            Reviewed by Tim Horton.
+
+            Disable the following features:
+
+            - ATTACHMENT_ELEMENT
+            - CSS_ANIMATIONS_LEVEL_2
+            - CSS_GRID_LAYOUT
+            - CSS_SELECTORS_LEVEL4
+            - GAMEPAD
+            - INDIE_UI
+            - INPUT_TYPE_COLOR
+            - INPUT_TYPE_COLOR_POPOVER
+            - NAVIGATOR_HWCONCURRENCY
+            - STREAMS_API
+            - WEB_REPLAY
+            - WILL_REVEAL_EDGE_EVENTS
+
+            * Configurations/FeatureDefines.xcconfig:
+
+2015-05-18  Matthew Hanson  &lt;matthew_hanson@apple.com&gt;
+
</ins><span class="cx">         Merge r184422. rdar://problem/20410944
</span><span class="cx"> 
</span><span class="cx">     2015-05-15  James Savage  &lt;james.savage@apple.com&gt;
</span></span></pre></div>
<a id="branchessafari6011322branchSourceWebKit2ConfigurationsFeatureDefinesxcconfig"></a>
<div class="modfile"><h4>Modified: branches/safari-601.1.32.2-branch/Source/WebKit2/Configurations/FeatureDefines.xcconfig (184508 => 184509)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601.1.32.2-branch/Source/WebKit2/Configurations/FeatureDefines.xcconfig        2015-05-18 19:53:28 UTC (rev 184508)
+++ branches/safari-601.1.32.2-branch/Source/WebKit2/Configurations/FeatureDefines.xcconfig        2015-05-18 20:15:49 UTC (rev 184509)
</span><span class="lines">@@ -34,7 +34,7 @@
</span><span class="cx"> ENABLE_3D_TRANSFORMS = ENABLE_3D_TRANSFORMS;
</span><span class="cx"> ENABLE_ACCELERATED_2D_CANVAS = ;
</span><span class="cx"> ENABLE_ACCELERATED_OVERFLOW_SCROLLING[sdk=iphone*] = ENABLE_ACCELERATED_OVERFLOW_SCROLLING;
</span><del>-ENABLE_ATTACHMENT_ELEMENT = ENABLE_ATTACHMENT_ELEMENT;
</del><ins>+ENABLE_ATTACHMENT_ELEMENT = ;
</ins><span class="cx"> ENABLE_AVF_CAPTIONS[sdk=iphone*] = ENABLE_AVF_CAPTIONS;
</span><span class="cx"> ENABLE_AVF_CAPTIONS[sdk=macosx*] = $(ENABLE_AVF_CAPTIONS_macosx_$(TARGET_MAC_OS_X_VERSION_MAJOR));
</span><span class="cx"> ENABLE_AVF_CAPTIONS_macosx_1090 = ;
</span><span class="lines">@@ -48,15 +48,15 @@
</span><span class="cx"> ENABLE_ES6_TEMPLATE_LITERAL_SYNTAX = ENABLE_ES6_TEMPLATE_LITERAL_SYNTAX;
</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">@@ -77,7 +77,7 @@
</span><span class="cx"> ENABLE_FILTERS_LEVEL_2_macosx_101100 = 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_HIDDEN_PAGE_DOM_TIMER_THROTTLING[sdk=macosx*] = ENABLE_HIDDEN_PAGE_DOM_TIMER_THROTTLING;
</span><span class="lines">@@ -88,9 +88,9 @@
</span><span class="cx"> ENABLE_SERVICE_CONTROLS_macosx_101100 = ENABLE_SERVICE_CONTROLS;
</span><span class="cx"> ENABLE_INDEXED_DATABASE = ENABLE_INDEXED_DATABASE;
</span><span class="cx"> 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">@@ -137,7 +137,7 @@
</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">@@ -158,7 +158,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"> ENABLE_SVG_OTF_CONVERTER = ENABLE_SVG_OTF_CONVERTER;
</span><span class="lines">@@ -189,8 +189,8 @@
</span><span class="cx"> ENABLE_WEBGL = ENABLE_WEBGL;
</span><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[sdk=iphone*] = ENABLE_WEB_TIMING;
</span></span></pre>
</div>
</div>

</body>
</html>