Diff
Modified: branches/safari-612.1.27.0-branch/LayoutTests/TestExpectations (280921 => 280922)
--- branches/safari-612.1.27.0-branch/LayoutTests/TestExpectations 2021-08-11 18:28:44 UTC (rev 280921)
+++ branches/safari-612.1.27.0-branch/LayoutTests/TestExpectations 2021-08-11 18:42:37 UTC (rev 280922)
@@ -5117,3 +5117,12 @@
webkit.org/b/227849 imported/w3c/web-platform-tests/css/css-overflow/webkit-line-clamp-037.html [ Skip ]
webkit.org/b/227849 imported/w3c/web-platform-tests/css/css-overflow/parsing/scrollbar-gutter-invalid.html [ Skip ]
webkit.org/b/227849 imported/w3c/web-platform-tests/css/css-overflow/parsing/scrollbar-gutter-valid.html [ Skip ]
+
+# 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 ]
+
Modified: branches/safari-612.1.27.0-branch/LayoutTests/fast/dom/navigator-detached-no-crash-expected.txt (280921 => 280922)
--- branches/safari-612.1.27.0-branch/LayoutTests/fast/dom/navigator-detached-no-crash-expected.txt 2021-08-11 18:28:44 UTC (rev 280921)
+++ branches/safari-612.1.27.0-branch/LayoutTests/fast/dom/navigator-detached-no-crash-expected.txt 2021-08-11 18:42:37 UTC (rev 280922)
@@ -29,7 +29,6 @@
navigator.vendor is OK
navigator.vendorSub is OK
navigator.webdriver is OK
-navigator.xr is OK
navigator.appCodeName is OK
navigator.appName is OK
navigator.appVersion is OK
@@ -57,5 +56,4 @@
navigator.vendor is OK
navigator.vendorSub is OK
navigator.webdriver is OK
-navigator.xr is OK
Modified: branches/safari-612.1.27.0-branch/LayoutTests/platform/mac/fast/dom/navigator-detached-no-crash-expected.txt (280921 => 280922)
--- branches/safari-612.1.27.0-branch/LayoutTests/platform/mac/fast/dom/navigator-detached-no-crash-expected.txt 2021-08-11 18:28:44 UTC (rev 280921)
+++ branches/safari-612.1.27.0-branch/LayoutTests/platform/mac/fast/dom/navigator-detached-no-crash-expected.txt 2021-08-11 18:42:37 UTC (rev 280922)
@@ -26,7 +26,6 @@
navigator.vendor is OK
navigator.vendorSub is OK
navigator.webdriver is OK
-navigator.xr is OK
navigator.appCodeName is OK
navigator.appName is OK
navigator.appVersion is OK
@@ -52,5 +51,4 @@
navigator.vendor is OK
navigator.vendorSub is OK
navigator.webdriver is OK
-navigator.xr is OK
Modified: branches/safari-612.1.27.0-branch/LayoutTests/platform/mac-wk1/fast/dom/navigator-detached-no-crash-expected.txt (280921 => 280922)
--- branches/safari-612.1.27.0-branch/LayoutTests/platform/mac-wk1/fast/dom/navigator-detached-no-crash-expected.txt 2021-08-11 18:28:44 UTC (rev 280921)
+++ branches/safari-612.1.27.0-branch/LayoutTests/platform/mac-wk1/fast/dom/navigator-detached-no-crash-expected.txt 2021-08-11 18:42:37 UTC (rev 280922)
@@ -22,7 +22,6 @@
navigator.vendor is OK
navigator.vendorSub is OK
navigator.webdriver is OK
-navigator.xr is OK
navigator.appCodeName is OK
navigator.appName is OK
navigator.appVersion is OK
@@ -45,5 +44,4 @@
navigator.vendor is OK
navigator.vendorSub is OK
navigator.webdriver is OK
-navigator.xr is OK
Modified: branches/safari-612.1.27.0-branch/LayoutTests/platform/mac-wk2/fast/dom/navigator-detached-no-crash-expected.txt (280921 => 280922)
--- branches/safari-612.1.27.0-branch/LayoutTests/platform/mac-wk2/fast/dom/navigator-detached-no-crash-expected.txt 2021-08-11 18:28:44 UTC (rev 280921)
+++ branches/safari-612.1.27.0-branch/LayoutTests/platform/mac-wk2/fast/dom/navigator-detached-no-crash-expected.txt 2021-08-11 18:42:37 UTC (rev 280922)
@@ -32,7 +32,6 @@
navigator.vendor is OK
navigator.vendorSub is OK
navigator.webdriver is OK
-navigator.xr is OK
navigator.appCodeName is OK
navigator.appName is OK
navigator.appVersion is OK
@@ -65,5 +64,4 @@
navigator.vendor is OK
navigator.vendorSub is OK
navigator.webdriver is OK
-navigator.xr is OK
Modified: branches/safari-612.1.27.0-branch/LayoutTests/platform/wpe/fast/dom/navigator-detached-no-crash-expected.txt (280921 => 280922)
--- branches/safari-612.1.27.0-branch/LayoutTests/platform/wpe/fast/dom/navigator-detached-no-crash-expected.txt 2021-08-11 18:28:44 UTC (rev 280921)
+++ branches/safari-612.1.27.0-branch/LayoutTests/platform/wpe/fast/dom/navigator-detached-no-crash-expected.txt 2021-08-11 18:42:37 UTC (rev 280922)
@@ -25,7 +25,6 @@
navigator.vendor is OK
navigator.vendorSub is OK
navigator.webdriver is OK
-navigator.xr is OK
navigator.appCodeName is OK
navigator.appName is OK
navigator.appVersion is OK
@@ -51,5 +50,4 @@
navigator.vendor is OK
navigator.vendorSub is OK
navigator.webdriver is OK
-navigator.xr is OK
Modified: branches/safari-612.1.27.0-branch/Source/WTF/wtf/PlatformEnableCocoa.h (280921 => 280922)
--- branches/safari-612.1.27.0-branch/Source/WTF/wtf/PlatformEnableCocoa.h 2021-08-11 18:28:44 UTC (rev 280921)
+++ branches/safari-612.1.27.0-branch/Source/WTF/wtf/PlatformEnableCocoa.h 2021-08-11 18:42:37 UTC (rev 280922)
@@ -628,7 +628,7 @@
#endif
#if !defined(ENABLE_WEBXR)
-#define ENABLE_WEBXR 1
+#define ENABLE_WEBXR 0
#endif
#if !defined(ENABLE_WEB_API_STATISTICS)
Modified: branches/safari-612.1.27.0-branch/Source/WebKit/Shared/WebPreferencesDefaultValues.cpp (280921 => 280922)
--- branches/safari-612.1.27.0-branch/Source/WebKit/Shared/WebPreferencesDefaultValues.cpp 2021-08-11 18:28:44 UTC (rev 280921)
+++ branches/safari-612.1.27.0-branch/Source/WebKit/Shared/WebPreferencesDefaultValues.cpp 2021-08-11 18:42:37 UTC (rev 280922)
@@ -287,11 +287,7 @@
bool defaultWebXREnabled()
{
-#if HAVE(WEBXR_INTERNALS)
- return true;
-#else
return false;
-#endif
}
#endif // ENABLE(WEBXR)
Modified: branches/safari-612.1.27.0-branch/Source/WebKitLegacy/mac/WebView/WebPreferencesDefaultValues.mm (280921 => 280922)
--- branches/safari-612.1.27.0-branch/Source/WebKitLegacy/mac/WebView/WebPreferencesDefaultValues.mm 2021-08-11 18:28:44 UTC (rev 280921)
+++ branches/safari-612.1.27.0-branch/Source/WebKitLegacy/mac/WebView/WebPreferencesDefaultValues.mm 2021-08-11 18:42:37 UTC (rev 280922)
@@ -79,10 +79,6 @@
bool defaultWebXREnabled()
{
-#if HAVE(SYSTEM_FEATURE_FLAGS)
- return isFeatureFlagEnabled("WebXR");
-#endif
-
return false;
}