<!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>[209992] 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/209992">209992</a></dd>
<dt>Author</dt> <dd>dino@apple.com</dd>
<dt>Date</dt> <dd>2016-12-19 11:34:57 -0800 (Mon, 19 Dec 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>Merge another patch for rdar://problem/29466493.
2016-12-19 Dean Jackson <dino@apple.com>
Disable some features on the safari-603-branch.
<rdar://problem/29466493>
Source/JavaScriptCore:
* Configurations/FeatureDefines.xcconfig:
Source/WebCore:
* Configurations/FeatureDefines.xcconfig:
* css/SelectorChecker.cpp:
(WebCore::SelectorChecker::matchRecursively):
* css/SelectorFilter.cpp:
(WebCore::SelectorFilter::collectIdentifierHashes):
* css/parser/CSSSelectorParser.cpp:
(WebCore::isOnlyPseudoClassFunction):
(WebCore::CSSSelectorParser::consumePseudo):
(WebCore::CSSSelectorParser::consumeCombinator):
* cssjit/SelectorCompiler.cpp:
(WebCore::SelectorCompiler::fragmentRelationForSelectorRelation):
Source/WebKit/mac:
* Configurations/FeatureDefines.xcconfig:
Source/WebKit2:
* Configurations/FeatureDefines.xcconfig:
Tools:
* TestWebKitAPI/Configurations/FeatureDefines.xcconfig:</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="#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="#branchessafari603branchSourceWebCorecssSelectorCheckercpp">branches/safari-603-branch/Source/WebCore/css/SelectorChecker.cpp</a></li>
<li><a href="#branchessafari603branchSourceWebCorecssSelectorFiltercpp">branches/safari-603-branch/Source/WebCore/css/SelectorFilter.cpp</a></li>
<li><a href="#branchessafari603branchSourceWebCorecssparserCSSSelectorParsercpp">branches/safari-603-branch/Source/WebCore/css/parser/CSSSelectorParser.cpp</a></li>
<li><a href="#branchessafari603branchSourceWebCorecssjitSelectorCompilercpp">branches/safari-603-branch/Source/WebCore/cssjit/SelectorCompiler.cpp</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="#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 (209991 => 209992)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-603-branch/Source/JavaScriptCore/ChangeLog 2016-12-19 19:12:38 UTC (rev 209991)
+++ branches/safari-603-branch/Source/JavaScriptCore/ChangeLog 2016-12-19 19:34:57 UTC (rev 209992)
</span><span class="lines">@@ -1,3 +1,14 @@
</span><ins>+2016-12-19 Dean Jackson <dino@apple.com>
+
+ Merge another patch for rdar://problem/29466493.
+
+ 2016-12-19 Dean Jackson <dino@apple.com>
+
+ Disable some features on the safari-603-branch.
+ <rdar://problem/29466493>
+
+ * Configurations/FeatureDefines.xcconfig:
+
</ins><span class="cx"> 2016-12-19 Babak Shafiei <bshafiei@apple.com>
</span><span class="cx">
</span><span class="cx"> Merge patch for rdar://problem/29466493.
</span></span></pre></div>
<a id="branchessafari603branchSourceJavaScriptCoreConfigurationsFeatureDefinesxcconfig"></a>
<div class="modfile"><h4>Modified: branches/safari-603-branch/Source/JavaScriptCore/Configurations/FeatureDefines.xcconfig (209991 => 209992)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-603-branch/Source/JavaScriptCore/Configurations/FeatureDefines.xcconfig 2016-12-19 19:12:38 UTC (rev 209991)
+++ branches/safari-603-branch/Source/JavaScriptCore/Configurations/FeatureDefines.xcconfig 2016-12-19 19:34:57 UTC (rev 209992)
</span><span class="lines">@@ -88,7 +88,7 @@
</span><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><del>-ENABLE_INTERSECTION_OBSERVER = ENABLE_INTERSECTION_OBSERVER;
</del><ins>+ENABLE_INTERSECTION_OBSERVER = ;
</ins><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></span></pre></div>
<a id="branchessafari603branchSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: branches/safari-603-branch/Source/WebCore/ChangeLog (209991 => 209992)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-603-branch/Source/WebCore/ChangeLog 2016-12-19 19:12:38 UTC (rev 209991)
+++ branches/safari-603-branch/Source/WebCore/ChangeLog 2016-12-19 19:34:57 UTC (rev 209992)
</span><span class="lines">@@ -1,3 +1,24 @@
</span><ins>+2016-12-19 Dean Jackson <dino@apple.com>
+
+ Merge another patch for rdar://problem/29466493.
+
+ 2016-12-19 Dean Jackson <dino@apple.com>
+
+ Disable some features on the safari-603-branch.
+ <rdar://problem/29466493>
+
+ * Configurations/FeatureDefines.xcconfig:
+ * css/SelectorChecker.cpp:
+ (WebCore::SelectorChecker::matchRecursively):
+ * css/SelectorFilter.cpp:
+ (WebCore::SelectorFilter::collectIdentifierHashes):
+ * css/parser/CSSSelectorParser.cpp:
+ (WebCore::isOnlyPseudoClassFunction):
+ (WebCore::CSSSelectorParser::consumePseudo):
+ (WebCore::CSSSelectorParser::consumeCombinator):
+ * cssjit/SelectorCompiler.cpp:
+ (WebCore::SelectorCompiler::fragmentRelationForSelectorRelation):
+
</ins><span class="cx"> 2016-12-19 Babak Shafiei <bshafiei@apple.com>
</span><span class="cx">
</span><span class="cx"> Merge patch for rdar://problem/29466493.
</span></span></pre></div>
<a id="branchessafari603branchSourceWebCoreConfigurationsFeatureDefinesxcconfig"></a>
<div class="modfile"><h4>Modified: branches/safari-603-branch/Source/WebCore/Configurations/FeatureDefines.xcconfig (209991 => 209992)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-603-branch/Source/WebCore/Configurations/FeatureDefines.xcconfig 2016-12-19 19:12:38 UTC (rev 209991)
+++ branches/safari-603-branch/Source/WebCore/Configurations/FeatureDefines.xcconfig 2016-12-19 19:34:57 UTC (rev 209992)
</span><span class="lines">@@ -88,7 +88,7 @@
</span><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><del>-ENABLE_INTERSECTION_OBSERVER = ENABLE_INTERSECTION_OBSERVER;
</del><ins>+ENABLE_INTERSECTION_OBSERVER = ;
</ins><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></span></pre></div>
<a id="branchessafari603branchSourceWebCorecssSelectorCheckercpp"></a>
<div class="modfile"><h4>Modified: branches/safari-603-branch/Source/WebCore/css/SelectorChecker.cpp (209991 => 209992)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-603-branch/Source/WebCore/css/SelectorChecker.cpp 2016-12-19 19:12:38 UTC (rev 209991)
+++ branches/safari-603-branch/Source/WebCore/css/SelectorChecker.cpp 2016-12-19 19:34:57 UTC (rev 209992)
</span><span class="lines">@@ -333,7 +333,7 @@
</span><span class="cx">
</span><span class="cx"> switch (relation) {
</span><span class="cx"> case CSSSelector::DescendantSpace:
</span><del>-#if ENABLE_CSS_SELECTORS_LEVEL4
</del><ins>+#if ENABLE(CSS_SELECTORS_LEVEL4)
</ins><span class="cx"> case CSSSelector::DescendantDoubleChild:
</span><span class="cx"> #endif
</span><span class="cx"> nextContext = localContextForParent(nextContext);
</span></span></pre></div>
<a id="branchessafari603branchSourceWebCorecssSelectorFiltercpp"></a>
<div class="modfile"><h4>Modified: branches/safari-603-branch/Source/WebCore/css/SelectorFilter.cpp (209991 => 209992)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-603-branch/Source/WebCore/css/SelectorFilter.cpp 2016-12-19 19:12:38 UTC (rev 209991)
+++ branches/safari-603-branch/Source/WebCore/css/SelectorFilter.cpp 2016-12-19 19:34:57 UTC (rev 209992)
</span><span class="lines">@@ -139,7 +139,7 @@
</span><span class="cx"> skipOverSubselectors = true;
</span><span class="cx"> break;
</span><span class="cx"> case CSSSelector::DescendantSpace:
</span><del>-#if ENABLE_CSS_SELECTORS_LEVEL4
</del><ins>+#if ENABLE(CSS_SELECTORS_LEVEL4)
</ins><span class="cx"> case CSSSelector::DescendantDoubleChild:
</span><span class="cx"> #endif
</span><span class="cx"> case CSSSelector::Child:
</span></span></pre></div>
<a id="branchessafari603branchSourceWebCorecssparserCSSSelectorParsercpp"></a>
<div class="modfile"><h4>Modified: branches/safari-603-branch/Source/WebCore/css/parser/CSSSelectorParser.cpp (209991 => 209992)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-603-branch/Source/WebCore/css/parser/CSSSelectorParser.cpp 2016-12-19 19:12:38 UTC (rev 209991)
+++ branches/safari-603-branch/Source/WebCore/css/parser/CSSSelectorParser.cpp 2016-12-19 19:34:57 UTC (rev 209992)
</span><span class="lines">@@ -459,7 +459,7 @@
</span><span class="cx"> case CSSSelector::PseudoClassNthLastOfType:
</span><span class="cx"> case CSSSelector::PseudoClassLang:
</span><span class="cx"> case CSSSelector::PseudoClassAny:
</span><del>-#if ENABLE_CSS_SELECTORS_LEVEL4
</del><ins>+#if ENABLE(CSS_SELECTORS_LEVEL4)
</ins><span class="cx"> case CSSSelector::PseudoClassDir:
</span><span class="cx"> case CSSSelector::PseudoClassRole:
</span><span class="cx"> #endif
</span><span class="lines">@@ -600,7 +600,7 @@
</span><span class="cx"> selector->setSelectorList(WTFMove(selectorList));
</span><span class="cx"> return selector;
</span><span class="cx"> }
</span><del>-#if ENABLE_CSS_SELECTORS_LEVEL4
</del><ins>+#if ENABLE(CSS_SELECTORS_LEVEL4)
</ins><span class="cx"> case CSSSelector::PseudoClassDir:
</span><span class="cx"> case CSSSelector::PseudoClassRole: {
</span><span class="cx"> const CSSParserToken& ident = block.consumeIncludingWhitespace();
</span><span class="lines">@@ -673,7 +673,7 @@
</span><span class="cx"> return CSSSelector::IndirectAdjacent;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-#if ENABLE_CSS_SELECTORS_LEVEL4
</del><ins>+#if ENABLE(CSS_SELECTORS_LEVEL4)
</ins><span class="cx"> range.consume();
</span><span class="cx"> if (range.peek().type() == DelimiterToken && range.peek().delimiter() == '>') {
</span><span class="cx"> range.consumeIncludingWhitespace();
</span></span></pre></div>
<a id="branchessafari603branchSourceWebCorecssjitSelectorCompilercpp"></a>
<div class="modfile"><h4>Modified: branches/safari-603-branch/Source/WebCore/cssjit/SelectorCompiler.cpp (209991 => 209992)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-603-branch/Source/WebCore/cssjit/SelectorCompiler.cpp 2016-12-19 19:12:38 UTC (rev 209991)
+++ branches/safari-603-branch/Source/WebCore/cssjit/SelectorCompiler.cpp 2016-12-19 19:34:57 UTC (rev 209992)
</span><span class="lines">@@ -402,7 +402,7 @@
</span><span class="cx"> {
</span><span class="cx"> switch (relation) {
</span><span class="cx"> case CSSSelector::DescendantSpace:
</span><del>-#if ENABLE_CSS_SELECTORS_LEVEL4
</del><ins>+#if ENABLE(CSS_SELECTORS_LEVEL4)
</ins><span class="cx"> case CSSSelector::DescendantDoubleChild:
</span><span class="cx"> #endif
</span><span class="cx"> return FragmentRelation::Descendant;
</span></span></pre></div>
<a id="branchessafari603branchSourceWebKitmacChangeLog"></a>
<div class="modfile"><h4>Modified: branches/safari-603-branch/Source/WebKit/mac/ChangeLog (209991 => 209992)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-603-branch/Source/WebKit/mac/ChangeLog 2016-12-19 19:12:38 UTC (rev 209991)
+++ branches/safari-603-branch/Source/WebKit/mac/ChangeLog 2016-12-19 19:34:57 UTC (rev 209992)
</span><span class="lines">@@ -1,3 +1,14 @@
</span><ins>+2016-12-19 Dean Jackson <dino@apple.com>
+
+ Merge another patch for rdar://problem/29466493.
+
+ 2016-12-19 Dean Jackson <dino@apple.com>
+
+ Disable some features on the safari-603-branch.
+ <rdar://problem/29466493>
+
+ * Configurations/FeatureDefines.xcconfig:
+
</ins><span class="cx"> 2016-12-19 Babak Shafiei <bshafiei@apple.com>
</span><span class="cx">
</span><span class="cx"> Merge patch for rdar://problem/29466493.
</span></span></pre></div>
<a id="branchessafari603branchSourceWebKitmacConfigurationsFeatureDefinesxcconfig"></a>
<div class="modfile"><h4>Modified: branches/safari-603-branch/Source/WebKit/mac/Configurations/FeatureDefines.xcconfig (209991 => 209992)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-603-branch/Source/WebKit/mac/Configurations/FeatureDefines.xcconfig 2016-12-19 19:12:38 UTC (rev 209991)
+++ branches/safari-603-branch/Source/WebKit/mac/Configurations/FeatureDefines.xcconfig 2016-12-19 19:34:57 UTC (rev 209992)
</span><span class="lines">@@ -88,7 +88,7 @@
</span><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><del>-ENABLE_INTERSECTION_OBSERVER = ENABLE_INTERSECTION_OBSERVER;
</del><ins>+ENABLE_INTERSECTION_OBSERVER = ;
</ins><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></span></pre></div>
<a id="branchessafari603branchSourceWebKit2ChangeLog"></a>
<div class="modfile"><h4>Modified: branches/safari-603-branch/Source/WebKit2/ChangeLog (209991 => 209992)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-603-branch/Source/WebKit2/ChangeLog 2016-12-19 19:12:38 UTC (rev 209991)
+++ branches/safari-603-branch/Source/WebKit2/ChangeLog 2016-12-19 19:34:57 UTC (rev 209992)
</span><span class="lines">@@ -1,3 +1,14 @@
</span><ins>+2016-12-19 Dean Jackson <dino@apple.com>
+
+ Merge another patch for rdar://problem/29466493.
+
+ 2016-12-19 Dean Jackson <dino@apple.com>
+
+ Disable some features on the safari-603-branch.
+ <rdar://problem/29466493>
+
+ * Configurations/FeatureDefines.xcconfig:
+
</ins><span class="cx"> 2016-12-19 Babak Shafiei <bshafiei@apple.com>
</span><span class="cx">
</span><span class="cx"> Merge patch for rdar://problem/29466493.
</span></span></pre></div>
<a id="branchessafari603branchSourceWebKit2ConfigurationsFeatureDefinesxcconfig"></a>
<div class="modfile"><h4>Modified: branches/safari-603-branch/Source/WebKit2/Configurations/FeatureDefines.xcconfig (209991 => 209992)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-603-branch/Source/WebKit2/Configurations/FeatureDefines.xcconfig 2016-12-19 19:12:38 UTC (rev 209991)
+++ branches/safari-603-branch/Source/WebKit2/Configurations/FeatureDefines.xcconfig 2016-12-19 19:34:57 UTC (rev 209992)
</span><span class="lines">@@ -88,7 +88,7 @@
</span><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><del>-ENABLE_INTERSECTION_OBSERVER = ENABLE_INTERSECTION_OBSERVER;
</del><ins>+ENABLE_INTERSECTION_OBSERVER = ;
</ins><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></span></pre></div>
<a id="branchessafari603branchToolsChangeLog"></a>
<div class="modfile"><h4>Modified: branches/safari-603-branch/Tools/ChangeLog (209991 => 209992)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-603-branch/Tools/ChangeLog 2016-12-19 19:12:38 UTC (rev 209991)
+++ branches/safari-603-branch/Tools/ChangeLog 2016-12-19 19:34:57 UTC (rev 209992)
</span><span class="lines">@@ -1,3 +1,14 @@
</span><ins>+2016-12-19 Dean Jackson <dino@apple.com>
+
+ Merge another patch for rdar://problem/29466493.
+
+ 2016-12-19 Dean Jackson <dino@apple.com>
+
+ Disable some features on the safari-603-branch.
+ <rdar://problem/29466493>
+
+ * TestWebKitAPI/Configurations/FeatureDefines.xcconfig:
+
</ins><span class="cx"> 2016-12-19 Babak Shafiei <bshafiei@apple.com>
</span><span class="cx">
</span><span class="cx"> Merge patch for rdar://problem/29466493.
</span></span></pre></div>
<a id="branchessafari603branchToolsTestWebKitAPIConfigurationsFeatureDefinesxcconfig"></a>
<div class="modfile"><h4>Modified: branches/safari-603-branch/Tools/TestWebKitAPI/Configurations/FeatureDefines.xcconfig (209991 => 209992)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-603-branch/Tools/TestWebKitAPI/Configurations/FeatureDefines.xcconfig 2016-12-19 19:12:38 UTC (rev 209991)
+++ branches/safari-603-branch/Tools/TestWebKitAPI/Configurations/FeatureDefines.xcconfig 2016-12-19 19:34:57 UTC (rev 209992)
</span><span class="lines">@@ -88,7 +88,7 @@
</span><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><del>-ENABLE_INTERSECTION_OBSERVER = ENABLE_INTERSECTION_OBSERVER;
</del><ins>+ENABLE_INTERSECTION_OBSERVER = ;
</ins><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></span></pre>
</div>
</div>
</body>
</html>