Remove ResizeObserverEnabled preference

https://bugs.webkit.org/show_bug.cgi?id=264561 Reviewed by Simon Fraser. This has been enabled for a long enough that we no longer need the branching. * LayoutTests/imported/w3c/web-platform-tests/resize-observer/eventloop.html: * LayoutTests/imported/w3c/web-platform-tests/resize-observer/idlharness.window.html: * LayoutTests/imported/w3c/web-platform-tests/resize-observer/notify.html: * LayoutTests/imported/w3c/web-platform-tests/resize-observer/observe.html: * LayoutTests/imported/w3c/web-platform-tests/resize-observer/svg.html: * LayoutTests/resize-observer/delete-observers-in-callbacks.html: * LayoutTests/resize-observer/element-leak.html: * LayoutTests/resize-observer/modify-frametree-in-callback.html: * LayoutTests/resize-observer/multi-frames.html: * LayoutTests/resize-observer/observe-disconnected-target-crash.html: * LayoutTests/resize-observer/observe-element-from-other-frame.html: * LayoutTests/resize-observer/observe-then-disconnect-target.html: * LayoutTests/resize-observer/resize-observer-callback-leak.html: * LayoutTests/resize-observer/resize-observer-entry-keeps-js-wrapper-of-target-alive.html: * LayoutTests/resize-observer/resize-observer-keeps-element-of-queued-entry-alive.html: * LayoutTests/resize-observer/resize-observer-keeps-js-wrapper-of-target-alive.html: * LayoutTests/resize-observer/resize-observer-should-not-leak-observed-nodes.html: * LayoutTests/resize-observer/resize-observer-with-zoom.html: * Source/WTF/Scripts/Preferences/UnifiedWebPreferences.yaml: * Source/WebCore/page/ResizeObserver.idl: * Source/WebCore/page/ResizeObserverEntry.idl: * Source/WebKitLegacy/mac/WebView/WebPreferenceKeysPrivate.h: * Source/WebKitLegacy/mac/WebView/WebPreferences.mm: (-[WebPreferences resizeObserverEnabled]): (-[WebPreferences setResizeObserverEnabled:]): * Source/WebKitLegacy/mac/WebView/WebPreferencesPrivate.h: Canonical link: https://commits.webkit.org/270549@main
WebKit · Nov 10, 2023 · 24772eb · 24772eb
1 parent 57afaa9
commit 24772eb
Show file tree

Hide file tree

Showing 24 changed files with 30 additions and 46 deletions.
diff --git a/LayoutTests/imported/w3c/web-platform-tests/resize-observer/eventloop.html b/LayoutTests/imported/w3c/web-platform-tests/resize-observer/eventloop.html
@@ -1,4 +1,4 @@
-<!doctype html><!-- webkit-test-runner [ ResizeObserverEnabled=true ] -->
+<!doctype html>
 <title>ResizeObserver notification event loop tests</title>
 <script src="/resources/testharness.js"></script>
 <script src="/resources/testharnessreport.js"></script>

diff --git a/LayoutTests/imported/w3c/web-platform-tests/resize-observer/idlharness.window.html b/LayoutTests/imported/w3c/web-platform-tests/resize-observer/idlharness.window.html
@@ -1 +1 @@
-<!-- This file is required for WebKit test infrastructure to run the templated test --><!-- webkit-test-runner [ ResizeObserverEnabled=true ] -->
+<!-- This file is required for WebKit test infrastructure to run the templated test -->
diff --git a/LayoutTests/imported/w3c/web-platform-tests/resize-observer/notify.html b/LayoutTests/imported/w3c/web-platform-tests/resize-observer/notify.html
@@ -1,4 +1,4 @@
-<!doctype html><!-- webkit-test-runner [ ResizeObserverEnabled=true ] -->
+<!doctype html>
 <script src="/resources/testharness.js"></script>
 <script src="/resources/testharnessreport.js"></script>
 <script src="./resources/resizeTestHelper.js"></script>

diff --git a/LayoutTests/imported/w3c/web-platform-tests/resize-observer/observe.html b/LayoutTests/imported/w3c/web-platform-tests/resize-observer/observe.html
@@ -1,4 +1,4 @@
-<!doctype html><!-- webkit-test-runner [ ResizeObserverEnabled=true ] -->
+<!doctype html>
 <title>ResizeObserver tests</title>
 <script src="/resources/testharness.js"></script>
 <script src="/resources/testharnessreport.js"></script>

diff --git a/LayoutTests/imported/w3c/web-platform-tests/resize-observer/svg.html b/LayoutTests/imported/w3c/web-platform-tests/resize-observer/svg.html
@@ -1,4 +1,4 @@
-<!doctype html><!-- webkit-test-runner [ ResizeObserverEnabled=true ] -->
+<!doctype html>
 <script src="/resources/testharness.js"></script>
 <script src="/resources/testharnessreport.js"></script>
 <script src="./resources/resizeTestHelper.js"></script>

diff --git a/LayoutTests/resize-observer/delete-observers-in-callbacks.html b/LayoutTests/resize-observer/delete-observers-in-callbacks.html
@@ -1,4 +1,4 @@
-<!DOCTYPE html><!-- webkit-test-runner [ ResizeObserverEnabled=true ] -->
+<!DOCTYPE html>
 <html>
 <head>
 <script src="../resources/testharness.js"></script>

diff --git a/LayoutTests/resize-observer/element-leak.html b/LayoutTests/resize-observer/element-leak.html
@@ -1,4 +1,4 @@
-<!DOCTYPE html><!-- webkit-test-runner [ ResizeObserverEnabled=true ] -->
+<!DOCTYPE html>
 <html>
 <meta name="timeout" content="long">
 <head>

diff --git a/LayoutTests/resize-observer/modify-frametree-in-callback.html b/LayoutTests/resize-observer/modify-frametree-in-callback.html
@@ -1,4 +1,4 @@
-<!doctype html><!-- webkit-test-runner [ ResizeObserverEnabled=true ] -->
+<!doctype html>
 <script src="../resources/testharness.js"></script>
 <script src="../resources/testharnessreport.js"></script>
 

diff --git a/LayoutTests/resize-observer/multi-frames.html b/LayoutTests/resize-observer/multi-frames.html
@@ -1,4 +1,4 @@
-<!doctype html><!-- webkit-test-runner [ ResizeObserverEnabled=true ] -->
+<!doctype html>
 <script src="../resources/testharness.js"></script>
 <script src="../resources/testharnessreport.js"></script>
 <script src="./resources/resizeTestHelper.js"></script>

diff --git a/LayoutTests/resize-observer/observe-disconnected-target-crash.html b/LayoutTests/resize-observer/observe-disconnected-target-crash.html
@@ -1,4 +1,4 @@
-<!DOCTYPE html><!-- webkit-test-runner [ ResizeObserverEnabled=true ] -->
+<!DOCTYPE html>
 <p>This test passes if it doesn't crash.</p>
 <script>
   if (window.testRunner) {

diff --git a/LayoutTests/resize-observer/observe-element-from-other-frame.html b/LayoutTests/resize-observer/observe-element-from-other-frame.html
@@ -1,4 +1,4 @@
-<!doctype html><!-- webkit-test-runner [ ResizeObserverEnabled=true ] -->
+<!doctype html>
 <script src="../resources/testharness.js"></script>
 <script src="../resources/testharnessreport.js"></script>
 

diff --git a/LayoutTests/resize-observer/observe-then-disconnect-target.html b/LayoutTests/resize-observer/observe-then-disconnect-target.html
@@ -1,4 +1,4 @@
-<!DOCTYPE html><!-- webkit-test-runner [ ResizeObserverEnabled=true ] -->
+<!DOCTYPE html>
 <html>
 <body>
 <script src="../resources/js-test.js"></script>

diff --git a/LayoutTests/resize-observer/resize-observer-callback-leak.html b/LayoutTests/resize-observer/resize-observer-callback-leak.html
@@ -1,4 +1,4 @@
-<!DOCTYPE html><!-- webkit-test-runner [ ResizeObserverEnabled=true ] -->
+<!DOCTYPE html>
 <html>
 <head>
 <script src="../resources/testharness.js"></script>

diff --git a/LayoutTests/resize-observer/resize-observer-entry-keeps-js-wrapper-of-target-alive.html b/LayoutTests/resize-observer/resize-observer-entry-keeps-js-wrapper-of-target-alive.html
@@ -1,4 +1,4 @@
-<!DOCTYPE html><!-- webkit-test-runner [ ResizeObserverEnabled=true ] -->
+<!DOCTYPE html>
 <html>
 <body>
 <p>This tests that JS wrappers of targets in an ResizeObserverEntry do not get collected.</p>

diff --git a/LayoutTests/resize-observer/resize-observer-keeps-element-of-queued-entry-alive.html b/LayoutTests/resize-observer/resize-observer-keeps-element-of-queued-entry-alive.html
@@ -1,4 +1,4 @@
-<!DOCTYPE html><!-- webkit-test-runner [ ResizeObserverEnabled=true ] -->
+<!DOCTYPE html>
 <html>
 <body>
 <pre id="log">This tests observing an element with an ResizeObserver and removing the element from the document while it is queued for delivery.

diff --git a/LayoutTests/resize-observer/resize-observer-keeps-js-wrapper-of-target-alive.html b/LayoutTests/resize-observer/resize-observer-keeps-js-wrapper-of-target-alive.html
@@ -1,4 +1,4 @@
-<!DOCTYPE html><!-- webkit-test-runner [ ResizeObserverEnabled=true ] -->
+<!DOCTYPE html>
 <html>
 <body>
 <p>This tests that JS wrappers of targets removed from document to be delivered to an resize observer do not get collected.</p>

diff --git a/LayoutTests/resize-observer/resize-observer-should-not-leak-observed-nodes.html b/LayoutTests/resize-observer/resize-observer-should-not-leak-observed-nodes.html
@@ -1,4 +1,4 @@
-<!DOCTYPE html><!-- webkit-test-runner [ ResizeObserverEnabled=true ] -->
+<!DOCTYPE html>
 <html>
 <body>
 <pre id="log">This tests observing an element with an ResizeObserver and removing the element from the document.

diff --git a/LayoutTests/resize-observer/resize-observer-with-zoom.html b/LayoutTests/resize-observer/resize-observer-with-zoom.html
@@ -1,4 +1,4 @@
-<!DOCTYPE html><!-- webkit-test-runner [ ResizeObserverEnabled=true ] -->
+<!DOCTYPE html>
 <script src="../resources/testharness.js"></script>
 <script src="../resources/testharnessreport.js"></script>
 <script src="./resources/resizeTestHelper.js"></script>

diff --git a/Source/WTF/Scripts/Preferences/UnifiedWebPreferences.yaml b/Source/WTF/Scripts/Preferences/UnifiedWebPreferences.yaml
@@ -5437,19 +5437,6 @@ RequiresUserGestureToLoadVideo:
       "PLATFORM(IOS_FAMILY)": true
       default: false
 
-ResizeObserverEnabled:
-  type: bool
-  status: mature
-  humanReadableName: "Resize Observer"
-  humanReadableDescription: "Enable Resize Observer support"
-  defaultValue:
-    WebKitLegacy:
-      default: true
-    WebKit:
-      default: true
-    WebCore:
-      default: true
-
 ResourceLoadSchedulingEnabled:
   type: bool
   status: internal

diff --git a/Source/WebCore/page/ResizeObserver.idl b/Source/WebCore/page/ResizeObserver.idl
@@ -26,7 +26,6 @@
 // https://wicg.github.io/ResizeObserver/
 
 [
-    EnabledBySetting=ResizeObserverEnabled,
     Exposed=Window,
     JSCustomMarkFunction,
     CustomIsReachable,

diff --git a/Source/WebCore/page/ResizeObserverEntry.idl b/Source/WebCore/page/ResizeObserverEntry.idl
@@ -25,7 +25,6 @@
 
 // https://drafts.csswg.org/resize-observer/#resize-observer-entry-interface
 [
-    EnabledBySetting=ResizeObserverEnabled,
     JSCustomMarkFunction,
     Exposed=Window
 ] interface ResizeObserverEntry {

diff --git a/Source/WebKitLegacy/mac/WebView/WebPreferenceKeysPrivate.h b/Source/WebKitLegacy/mac/WebView/WebPreferenceKeysPrivate.h
@@ -247,10 +247,8 @@
 #define WebKitMaskWebGLStringsEnabledPreferenceKey @"WebKitMaskWebGLStringsEnabled"
 #define WebKitServerTimingEnabledPreferenceKey @"WebKitServerTimingEnabled"
 #define WebKitCSSCustomPropertiesAndValuesEnabledPreferenceKey @"WebKitCSSCustomPropertiesAndValuesEnabled"
-#define WebKitResizeObserverEnabledPreferenceKey @"WebKitResizeObserverEnabled"
 #define WebKitPrivateClickMeasurementEnabledPreferenceKey @"WebKitPrivateClickMeasurementEnabled"
 #define WebKitGenericCueAPIEnabledKey @"WebKitGenericCueAPIEnabled"
-#define WebKitAspectRatioOfImgFromWidthAndHeightEnabledPreferenceKey @"WebKitAspectRatioOfImgFromWidthAndHeightEnabled"
 #define WebKitCoreMathMLEnabledPreferenceKey @"WebKitCoreMathMLEnabled"
 #define WebKitLinkPreloadResponsiveImagesEnabledPreferenceKey @"WebKitLinkPreloadResponsiveImagesEnabled"
 #define WebKitRemotePlaybackEnabledPreferenceKey @"WebKitRemotePlaybackEnabled"
@@ -263,6 +261,8 @@
 
 // The preference keys below this point are deprecated and have no effect. They should
 // be removed when it is considered safe to do so.
+#define WebKitAspectRatioOfImgFromWidthAndHeightEnabledPreferenceKey @"WebKitAspectRatioOfImgFromWidthAndHeightEnabled"
+#define WebKitResizeObserverEnabledPreferenceKey @"WebKitResizeObserverEnabled"
 #define WebKitShadowDOMEnabledPreferenceKey @"WebKitShadowDOMEnabled"
 #define WebKitHixie76WebSocketProtocolEnabledKey @"WebKitHixie76WebSocketProtocolEnabled"
 #define WebKitCustomElementsEnabledPreferenceKey @"WebKitCustomElementsEnabled"

diff --git a/Source/WebKitLegacy/mac/WebView/WebPreferences.mm b/Source/WebKitLegacy/mac/WebView/WebPreferences.mm
@@ -2996,16 +2996,6 @@ - (void)setCSSCustomPropertiesAndValuesEnabled:(BOOL)flag
     [self _setBoolValue:flag forKey:WebKitCSSCustomPropertiesAndValuesEnabledPreferenceKey];
 }
 
-- (BOOL)resizeObserverEnabled
-{
-    return [self _boolValueForKey:WebKitResizeObserverEnabledPreferenceKey];
-}
-
-- (void)setResizeObserverEnabled:(BOOL)flag
-{
-    [self _setBoolValue:flag forKey:WebKitResizeObserverEnabledPreferenceKey];
-}
-
 - (BOOL)privateClickMeasurementEnabled
 {
     return [self _boolValueForKey:WebKitPrivateClickMeasurementEnabledPreferenceKey];
@@ -3132,6 +3122,15 @@ - (void)setAspectRatioOfImgFromWidthAndHeightEnabled:(BOOL)flag
 {
 }
 
+- (BOOL)resizeObserverEnabled
+{
+    return YES;
+}
+
+- (void)setResizeObserverEnabled:(BOOL)flag
+{
+}
+
 - (void)setSubpixelCSSOMElementMetricsEnabled:(BOOL)enabled
 {
     [self _setBoolValue:enabled forKey:WebKitSubpixelCSSOMElementMetricsEnabledPreferenceKey];

diff --git a/Source/WebKitLegacy/mac/WebView/WebPreferencesPrivate.h b/Source/WebKitLegacy/mac/WebView/WebPreferencesPrivate.h
@@ -312,7 +312,6 @@ extern NSString *WebPreferencesCacheModelChangedInternalNotification WEBKIT_DEPR
 @property (nonatomic) BOOL maskWebGLStringsEnabled;
 @property (nonatomic) BOOL serverTimingEnabled;
 @property (nonatomic) BOOL CSSCustomPropertiesAndValuesEnabled;
-@property (nonatomic) BOOL resizeObserverEnabled;
 @property (nonatomic) BOOL privateClickMeasurementEnabled;
 @property (nonatomic) BOOL genericCueAPIEnabled;
 @property (nonatomic) BOOL coreMathMLEnabled;
@@ -333,6 +332,7 @@ extern NSString *WebPreferencesCacheModelChangedInternalNotification WEBKIT_DEPR
 // be removed when it is considered safe to do so.
 
 @property (nonatomic) BOOL aspectRatioOfImgFromWidthAndHeightEnabled;
+@property (nonatomic) BOOL resizeObserverEnabled;
 @property (nonatomic) BOOL subpixelCSSOMElementMetricsEnabled;
 @property (nonatomic) BOOL userTimingEnabled;
 @property (nonatomic) BOOL requestAnimationFrameEnabled;