Changeset 280943 in webkit

Timestamp:

Aug 11, 2021, 5:30:36 PM (5 years ago)

Author:

Alan Coon

Message:

Cherry-pick r280922. 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

Location:

branches/safari-612.1.27.3-branch

Files:

• LayoutTests/TestExpectations (modified) (1 diff)
• LayoutTests/fast/dom/navigator-detached-no-crash-expected.txt (modified) (2 diffs)
• LayoutTests/platform/mac-wk1/fast/dom/navigator-detached-no-crash-expected.txt (modified) (2 diffs)
• LayoutTests/platform/mac-wk2/fast/dom/navigator-detached-no-crash-expected.txt (modified) (2 diffs)
• LayoutTests/platform/mac/fast/dom/navigator-detached-no-crash-expected.txt (modified) (2 diffs)
• LayoutTests/platform/wpe/fast/dom/navigator-detached-no-crash-expected.txt (modified) (2 diffs)
• Source/WTF/wtf/PlatformEnableCocoa.h (modified) (1 diff)
• Source/WebKit/Shared/WebPreferencesDefaultValues.cpp (modified) (1 diff)
• Source/WebKitLegacy/mac/WebView/WebPreferencesDefaultValues.mm (modified) (1 diff)

branches/safari-612.1.27.3-branch/LayoutTests/TestExpectations

@@ -5118 +5118 @@
 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 ]
+

branches/safari-612.1.27.3-branch/LayoutTests/fast/dom/navigator-detached-no-crash-expected.txt

@@ -30 +30 @@
 navigator.vendorSub is OK
 navigator.webdriver is OK
-navigator.xr is OK
 navigator.appCodeName is OK
 navigator.appName is OK
@@ -58 +57 @@
 navigator.vendorSub is OK
 navigator.webdriver is OK
-navigator.xr is OK
 

branches/safari-612.1.27.3-branch/LayoutTests/platform/mac-wk1/fast/dom/navigator-detached-no-crash-expected.txt

@@ -23 +23 @@
 navigator.vendorSub is OK
 navigator.webdriver is OK
-navigator.xr is OK
 navigator.appCodeName is OK
 navigator.appName is OK
@@ -46 +45 @@
 navigator.vendorSub is OK
 navigator.webdriver is OK
-navigator.xr is OK
 

branches/safari-612.1.27.3-branch/LayoutTests/platform/mac-wk2/fast/dom/navigator-detached-no-crash-expected.txt

@@ -33 +33 @@
 navigator.vendorSub is OK
 navigator.webdriver is OK
-navigator.xr is OK
 navigator.appCodeName is OK
 navigator.appName is OK
@@ -66 +65 @@
 navigator.vendorSub is OK
 navigator.webdriver is OK
-navigator.xr is OK
 

branches/safari-612.1.27.3-branch/LayoutTests/platform/mac/fast/dom/navigator-detached-no-crash-expected.txt

@@ -27 +27 @@
 navigator.vendorSub is OK
 navigator.webdriver is OK
-navigator.xr is OK
 navigator.appCodeName is OK
 navigator.appName is OK
@@ -53 +52 @@
 navigator.vendorSub is OK
 navigator.webdriver is OK
-navigator.xr is OK
 

branches/safari-612.1.27.3-branch/LayoutTests/platform/wpe/fast/dom/navigator-detached-no-crash-expected.txt

@@ -26 +26 @@
 navigator.vendorSub is OK
 navigator.webdriver is OK
-navigator.xr is OK
 navigator.appCodeName is OK
 navigator.appName is OK
@@ -52 +51 @@
 navigator.vendorSub is OK
 navigator.webdriver is OK
-navigator.xr is OK
 

branches/safari-612.1.27.3-branch/Source/WTF/wtf/PlatformEnableCocoa.h

@@ -629 +629 @@
 
 #if !defined(ENABLE_WEBXR)
-#define ENABLE_WEBXR 1
+#define ENABLE_WEBXR 0
 #endif
 

branches/safari-612.1.27.3-branch/Source/WebKit/Shared/WebPreferencesDefaultValues.cpp

@@ -288 +288 @@
 bool defaultWebXREnabled()
 {
-#if HAVE(WEBXR_INTERNALS)
-    return true;
-#else
-    return false;
-#endif
+    return false;
 }
 

branches/safari-612.1.27.3-branch/Source/WebKitLegacy/mac/WebView/WebPreferencesDefaultValues.mm

@@ -80 +80 @@
 bool defaultWebXREnabled()
 {
-#if HAVE(SYSTEM_FEATURE_FLAGS)
-    return isFeatureFlagEnabled("WebXR");
-#endif
-
     return false;
 }