<!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>[280942] branches/safari-612.1.27.2-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/280942">280942</a></dd>
<dt>Author</dt> <dd>alancoon@apple.com</dd>
<dt>Date</dt> <dd>2021-08-11 17:27:07 -0700 (Wed, 11 Aug 2021)</dd>
</dl>

<h3>Log Message</h3>
<pre>Cherry-pick <a href="http://trac.webkit.org/projects/webkit/changeset/280922">r280922</a>. rdar://problem/81804209

    Apply patch. rdar://problem/81804209

    git-svn-id: https://svn.webkit.org/repository/webkit/branches/safari-612.1.27.0-branch@280922 268f45cc-cd09-0410-ab3c-d52691b4dbfc</pre>

<h3>Modified Paths</h3>
<ul>
<li><a href="#branchessafari6121272branchLayoutTestsTestExpectations">branches/safari-612.1.27.2-branch/LayoutTests/TestExpectations</a></li>
<li><a href="#branchessafari6121272branchLayoutTestsfastdomnavigatordetachednocrashexpectedtxt">branches/safari-612.1.27.2-branch/LayoutTests/fast/dom/navigator-detached-no-crash-expected.txt</a></li>
<li><a href="#branchessafari6121272branchLayoutTestsplatformmacfastdomnavigatordetachednocrashexpectedtxt">branches/safari-612.1.27.2-branch/LayoutTests/platform/mac/fast/dom/navigator-detached-no-crash-expected.txt</a></li>
<li><a href="#branchessafari6121272branchLayoutTestsplatformmacwk1fastdomnavigatordetachednocrashexpectedtxt">branches/safari-612.1.27.2-branch/LayoutTests/platform/mac-wk1/fast/dom/navigator-detached-no-crash-expected.txt</a></li>
<li><a href="#branchessafari6121272branchLayoutTestsplatformmacwk2fastdomnavigatordetachednocrashexpectedtxt">branches/safari-612.1.27.2-branch/LayoutTests/platform/mac-wk2/fast/dom/navigator-detached-no-crash-expected.txt</a></li>
<li><a href="#branchessafari6121272branchLayoutTestsplatformwpefastdomnavigatordetachednocrashexpectedtxt">branches/safari-612.1.27.2-branch/LayoutTests/platform/wpe/fast/dom/navigator-detached-no-crash-expected.txt</a></li>
<li><a href="#branchessafari6121272branchSourceWTFwtfPlatformEnableCocoah">branches/safari-612.1.27.2-branch/Source/WTF/wtf/PlatformEnableCocoa.h</a></li>
<li><a href="#branchessafari6121272branchSourceWebKitSharedWebPreferencesDefaultValuescpp">branches/safari-612.1.27.2-branch/Source/WebKit/Shared/WebPreferencesDefaultValues.cpp</a></li>
<li><a href="#branchessafari6121272branchSourceWebKitLegacymacWebViewWebPreferencesDefaultValuesmm">branches/safari-612.1.27.2-branch/Source/WebKitLegacy/mac/WebView/WebPreferencesDefaultValues.mm</a></li>
</ul>

</div>
<div id="patch">
<h3>Diff</h3>
<a id="branchessafari6121272branchLayoutTestsTestExpectations"></a>
<div class="modfile"><h4>Modified: branches/safari-612.1.27.2-branch/LayoutTests/TestExpectations (280941 => 280942)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-612.1.27.2-branch/LayoutTests/TestExpectations   2021-08-12 00:24:15 UTC (rev 280941)
+++ branches/safari-612.1.27.2-branch/LayoutTests/TestExpectations      2021-08-12 00:27:07 UTC (rev 280942)
</span><span class="lines">@@ -5117,3 +5117,12 @@
</span><span class="cx"> webkit.org/b/227849 imported/w3c/web-platform-tests/css/css-overflow/webkit-line-clamp-037.html [ Skip ]
</span><span class="cx"> webkit.org/b/227849 imported/w3c/web-platform-tests/css/css-overflow/parsing/scrollbar-gutter-invalid.html [ Skip ]
</span><span class="cx"> webkit.org/b/227849 imported/w3c/web-platform-tests/css/css-overflow/parsing/scrollbar-gutter-valid.html [ Skip ]
</span><ins>+
+# Skipping for disabled feature flag for branch
+platform/wpe/http/wpt/webxr [ Skip ]
+platform/wpe/imported/w3c/web-platform-tests/webxr [ Skip ]
+platform/mac/imported/w3c/web-platform-tests/webxr [ Skip ]
+http/wpt/webxr [ Skip ]
+imported/w3c/web-platform-tests/webxr [ Skip ]
+webxr [ Skip ]
+
</ins></span></pre></div>
<a id="branchessafari6121272branchLayoutTestsfastdomnavigatordetachednocrashexpectedtxt"></a>
<div class="modfile"><h4>Modified: branches/safari-612.1.27.2-branch/LayoutTests/fast/dom/navigator-detached-no-crash-expected.txt (280941 => 280942)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-612.1.27.2-branch/LayoutTests/fast/dom/navigator-detached-no-crash-expected.txt  2021-08-12 00:24:15 UTC (rev 280941)
+++ branches/safari-612.1.27.2-branch/LayoutTests/fast/dom/navigator-detached-no-crash-expected.txt     2021-08-12 00:27:07 UTC (rev 280942)
</span><span class="lines">@@ -29,7 +29,6 @@
</span><span class="cx"> navigator.vendor is OK
</span><span class="cx"> navigator.vendorSub is OK
</span><span class="cx"> navigator.webdriver is OK
</span><del>-navigator.xr is OK
</del><span class="cx"> navigator.appCodeName is OK
</span><span class="cx"> navigator.appName is OK
</span><span class="cx"> navigator.appVersion is OK
</span><span class="lines">@@ -57,5 +56,4 @@
</span><span class="cx"> navigator.vendor is OK
</span><span class="cx"> navigator.vendorSub is OK
</span><span class="cx"> navigator.webdriver is OK
</span><del>-navigator.xr is OK
</del><span class="cx"> 
</span></span></pre></div>
<a id="branchessafari6121272branchLayoutTestsplatformmacfastdomnavigatordetachednocrashexpectedtxt"></a>
<div class="modfile"><h4>Modified: branches/safari-612.1.27.2-branch/LayoutTests/platform/mac/fast/dom/navigator-detached-no-crash-expected.txt (280941 => 280942)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-612.1.27.2-branch/LayoutTests/platform/mac/fast/dom/navigator-detached-no-crash-expected.txt     2021-08-12 00:24:15 UTC (rev 280941)
+++ branches/safari-612.1.27.2-branch/LayoutTests/platform/mac/fast/dom/navigator-detached-no-crash-expected.txt        2021-08-12 00:27:07 UTC (rev 280942)
</span><span class="lines">@@ -26,7 +26,6 @@
</span><span class="cx"> navigator.vendor is OK
</span><span class="cx"> navigator.vendorSub is OK
</span><span class="cx"> navigator.webdriver is OK
</span><del>-navigator.xr is OK
</del><span class="cx"> navigator.appCodeName is OK
</span><span class="cx"> navigator.appName is OK
</span><span class="cx"> navigator.appVersion is OK
</span><span class="lines">@@ -52,5 +51,4 @@
</span><span class="cx"> navigator.vendor is OK
</span><span class="cx"> navigator.vendorSub is OK
</span><span class="cx"> navigator.webdriver is OK
</span><del>-navigator.xr is OK
</del><span class="cx"> 
</span></span></pre></div>
<a id="branchessafari6121272branchLayoutTestsplatformmacwk1fastdomnavigatordetachednocrashexpectedtxt"></a>
<div class="modfile"><h4>Modified: branches/safari-612.1.27.2-branch/LayoutTests/platform/mac-wk1/fast/dom/navigator-detached-no-crash-expected.txt (280941 => 280942)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-612.1.27.2-branch/LayoutTests/platform/mac-wk1/fast/dom/navigator-detached-no-crash-expected.txt 2021-08-12 00:24:15 UTC (rev 280941)
+++ branches/safari-612.1.27.2-branch/LayoutTests/platform/mac-wk1/fast/dom/navigator-detached-no-crash-expected.txt    2021-08-12 00:27:07 UTC (rev 280942)
</span><span class="lines">@@ -22,7 +22,6 @@
</span><span class="cx"> navigator.vendor is OK
</span><span class="cx"> navigator.vendorSub is OK
</span><span class="cx"> navigator.webdriver is OK
</span><del>-navigator.xr is OK
</del><span class="cx"> navigator.appCodeName is OK
</span><span class="cx"> navigator.appName is OK
</span><span class="cx"> navigator.appVersion is OK
</span><span class="lines">@@ -45,5 +44,4 @@
</span><span class="cx"> navigator.vendor is OK
</span><span class="cx"> navigator.vendorSub is OK
</span><span class="cx"> navigator.webdriver is OK
</span><del>-navigator.xr is OK
</del><span class="cx"> 
</span></span></pre></div>
<a id="branchessafari6121272branchLayoutTestsplatformmacwk2fastdomnavigatordetachednocrashexpectedtxt"></a>
<div class="modfile"><h4>Modified: branches/safari-612.1.27.2-branch/LayoutTests/platform/mac-wk2/fast/dom/navigator-detached-no-crash-expected.txt (280941 => 280942)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-612.1.27.2-branch/LayoutTests/platform/mac-wk2/fast/dom/navigator-detached-no-crash-expected.txt 2021-08-12 00:24:15 UTC (rev 280941)
+++ branches/safari-612.1.27.2-branch/LayoutTests/platform/mac-wk2/fast/dom/navigator-detached-no-crash-expected.txt    2021-08-12 00:27:07 UTC (rev 280942)
</span><span class="lines">@@ -32,7 +32,6 @@
</span><span class="cx"> navigator.vendor is OK
</span><span class="cx"> navigator.vendorSub is OK
</span><span class="cx"> navigator.webdriver is OK
</span><del>-navigator.xr is OK
</del><span class="cx"> navigator.appCodeName is OK
</span><span class="cx"> navigator.appName is OK
</span><span class="cx"> navigator.appVersion is OK
</span><span class="lines">@@ -65,5 +64,4 @@
</span><span class="cx"> navigator.vendor is OK
</span><span class="cx"> navigator.vendorSub is OK
</span><span class="cx"> navigator.webdriver is OK
</span><del>-navigator.xr is OK
</del><span class="cx"> 
</span></span></pre></div>
<a id="branchessafari6121272branchLayoutTestsplatformwpefastdomnavigatordetachednocrashexpectedtxt"></a>
<div class="modfile"><h4>Modified: branches/safari-612.1.27.2-branch/LayoutTests/platform/wpe/fast/dom/navigator-detached-no-crash-expected.txt (280941 => 280942)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-612.1.27.2-branch/LayoutTests/platform/wpe/fast/dom/navigator-detached-no-crash-expected.txt     2021-08-12 00:24:15 UTC (rev 280941)
+++ branches/safari-612.1.27.2-branch/LayoutTests/platform/wpe/fast/dom/navigator-detached-no-crash-expected.txt        2021-08-12 00:27:07 UTC (rev 280942)
</span><span class="lines">@@ -25,7 +25,6 @@
</span><span class="cx"> navigator.vendor is OK
</span><span class="cx"> navigator.vendorSub is OK
</span><span class="cx"> navigator.webdriver is OK
</span><del>-navigator.xr is OK
</del><span class="cx"> navigator.appCodeName is OK
</span><span class="cx"> navigator.appName is OK
</span><span class="cx"> navigator.appVersion is OK
</span><span class="lines">@@ -51,5 +50,4 @@
</span><span class="cx"> navigator.vendor is OK
</span><span class="cx"> navigator.vendorSub is OK
</span><span class="cx"> navigator.webdriver is OK
</span><del>-navigator.xr is OK
</del><span class="cx"> 
</span></span></pre></div>
<a id="branchessafari6121272branchSourceWTFwtfPlatformEnableCocoah"></a>
<div class="modfile"><h4>Modified: branches/safari-612.1.27.2-branch/Source/WTF/wtf/PlatformEnableCocoa.h (280941 => 280942)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-612.1.27.2-branch/Source/WTF/wtf/PlatformEnableCocoa.h   2021-08-12 00:24:15 UTC (rev 280941)
+++ branches/safari-612.1.27.2-branch/Source/WTF/wtf/PlatformEnableCocoa.h      2021-08-12 00:27:07 UTC (rev 280942)
</span><span class="lines">@@ -628,7 +628,7 @@
</span><span class="cx"> #endif
</span><span class="cx"> 
</span><span class="cx"> #if !defined(ENABLE_WEBXR)
</span><del>-#define ENABLE_WEBXR 1
</del><ins>+#define ENABLE_WEBXR 0
</ins><span class="cx"> #endif
</span><span class="cx"> 
</span><span class="cx"> #if !defined(ENABLE_WEB_API_STATISTICS)
</span></span></pre></div>
<a id="branchessafari6121272branchSourceWebKitSharedWebPreferencesDefaultValuescpp"></a>
<div class="modfile"><h4>Modified: branches/safari-612.1.27.2-branch/Source/WebKit/Shared/WebPreferencesDefaultValues.cpp (280941 => 280942)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-612.1.27.2-branch/Source/WebKit/Shared/WebPreferencesDefaultValues.cpp   2021-08-12 00:24:15 UTC (rev 280941)
+++ branches/safari-612.1.27.2-branch/Source/WebKit/Shared/WebPreferencesDefaultValues.cpp      2021-08-12 00:27:07 UTC (rev 280942)
</span><span class="lines">@@ -287,11 +287,7 @@
</span><span class="cx"> 
</span><span class="cx"> bool defaultWebXREnabled()
</span><span class="cx"> {
</span><del>-#if HAVE(WEBXR_INTERNALS)
-    return true;
-#else
</del><span class="cx">     return false;
</span><del>-#endif
</del><span class="cx"> }
</span><span class="cx"> 
</span><span class="cx"> #endif // ENABLE(WEBXR)
</span></span></pre></div>
<a id="branchessafari6121272branchSourceWebKitLegacymacWebViewWebPreferencesDefaultValuesmm"></a>
<div class="modfile"><h4>Modified: branches/safari-612.1.27.2-branch/Source/WebKitLegacy/mac/WebView/WebPreferencesDefaultValues.mm (280941 => 280942)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-612.1.27.2-branch/Source/WebKitLegacy/mac/WebView/WebPreferencesDefaultValues.mm 2021-08-12 00:24:15 UTC (rev 280941)
+++ branches/safari-612.1.27.2-branch/Source/WebKitLegacy/mac/WebView/WebPreferencesDefaultValues.mm    2021-08-12 00:27:07 UTC (rev 280942)
</span><span class="lines">@@ -79,10 +79,6 @@
</span><span class="cx"> 
</span><span class="cx"> bool defaultWebXREnabled()
</span><span class="cx"> {
</span><del>-#if HAVE(SYSTEM_FEATURE_FLAGS)
-    return isFeatureFlagEnabled("WebXR");
-#endif
-
</del><span class="cx">     return false;
</span><span class="cx"> }
</span><span class="cx"> 
</span></span></pre>
</div>
</div>

</body>
</html>