Remove shouldDisableContentChangeObserverTouchEventAdjustment on Yout…

…ube.com https://bugs.webkit.org/show_bug.cgi?id=255275 rdar://107484040 Reviewed by Tim Horton. After disabling the Site Specific Quirks on iOS, and testing the touch on Autoplay feature everything is working the same in both scenarios. The quirk is not necessary anymore. This also removes allowContentChangeObserverQuirk associated to this quirk. It was enabled on https://webkit.org/b/200609 This is also a followup on https://webkit.org/b/264234 * Source/WebCore/page/Quirks.cpp: (WebCore::Quirks::shouldDisableContentChangeObserverTouchEventAdjustment const): Deleted. * Source/WebCore/page/Quirks.h: * Source/WebCore/page/ios/ContentChangeObserver.cpp: (WebCore::ContentChangeObserver::touchEventDidStart): * Source/WebCore/loader/DocumentLoader.h: (WebCore::DocumentLoader::setAllowContentChangeObserverQuirk): Deleted. (WebCore::DocumentLoader::allowContentChangeObserverQuirk const): Deleted. * Source/WebKit/Shared/WebsitePoliciesData.cpp: (WebKit::WebsitePoliciesData::applyToDocumentLoader): * Source/WebKit/Shared/WebsitePoliciesData.h: * Source/WebKit/Shared/WebsitePoliciesData.serialization.in: * Source/WebKit/UIProcess/API/APIWebsitePolicies.h: * Source/WebKit/UIProcess/ios/WebPageProxyIOS.mm: (WebKit::WebPageProxy::effectiveContentModeAfterAdjustingPolicies): Canonical link: https://commits.webkit.org/278481@main
WebKit · May 7, 2024 · de000c7 · de000c7
1 parent ba6e612
commit de000c7
Show file tree

Hide file tree

Showing 9 changed files with 1 addition and 27 deletions.
diff --git a/Source/WebCore/loader/DocumentLoader.h b/Source/WebCore/loader/DocumentLoader.h
@@ -472,9 +472,6 @@ class DocumentLoader
 
     WEBCORE_EXPORT void applyPoliciesToSettings();
 
-    void setAllowContentChangeObserverQuirk(bool allow) { m_allowContentChangeObserverQuirk = allow; }
-    bool allowContentChangeObserverQuirk() const { return m_allowContentChangeObserverQuirk; }
-
     void setAdvancedPrivacyProtections(OptionSet<AdvancedPrivacyProtections> policy) { m_advancedPrivacyProtections = policy; }
     OptionSet<AdvancedPrivacyProtections> advancedPrivacyProtections() const { return m_advancedPrivacyProtections; }
 
@@ -733,7 +730,6 @@ class DocumentLoader
     ColorSchemePreference m_colorSchemePreference { ColorSchemePreference::NoPreference };
     ShouldOpenExternalURLsPolicy m_shouldOpenExternalURLsPolicy { ShouldOpenExternalURLsPolicy::ShouldNotAllow };
 
-    bool m_allowContentChangeObserverQuirk { false };
     bool m_idempotentModeAutosizingOnlyHonorsPercentages { false };
 
     bool m_isRequestFromClientOrUserInput { false };

diff --git a/Source/WebCore/page/Quirks.cpp b/Source/WebCore/page/Quirks.cpp
@@ -221,20 +221,6 @@ bool Quirks::hasBrokenEncryptedMediaAPISupportQuirk() const
 #endif
 }
 
-// youtube.com https://bugs.webkit.org/show_bug.cgi?id=200609
-bool Quirks::shouldDisableContentChangeObserverTouchEventAdjustment() const
-{
-    if (!needsQuirks())
-        return false;
-
-    auto& topDocument = m_document->topDocument();
-    auto* topDocumentLoader = topDocument.loader();
-    if (!topDocumentLoader || !topDocumentLoader->allowContentChangeObserverQuirk())
-        return false;
-
-    return isDomain("youtube.com"_s);
-}
-
 // covid.cdc.gov https://bugs.webkit.org/show_bug.cgi?id=223620
 bool Quirks::shouldTooltipPreventFromProceedingWithClick(const Element& element) const
 {

diff --git a/Source/WebCore/page/Quirks.h b/Source/WebCore/page/Quirks.h
@@ -77,7 +77,6 @@ class Quirks {
 #endif
     bool shouldDisablePointerEventsQuirk() const;
     bool needsDeferKeyDownAndKeyPressTimersUntilNextEditingCommand() const;
-    bool shouldDisableContentChangeObserverTouchEventAdjustment() const;
     bool shouldTooltipPreventFromProceedingWithClick(const Element&) const;
     bool shouldHideSearchFieldResultsButton() const;
     bool shouldExposeShowModalDialog() const;

diff --git a/Source/WebCore/page/ios/ContentChangeObserver.cpp b/Source/WebCore/page/ios/ContentChangeObserver.cpp
@@ -488,7 +488,7 @@ void ContentChangeObserver::elementDidBecomeHidden(const Element& element)
 void ContentChangeObserver::touchEventDidStart(PlatformEvent::Type eventType)
 {
 #if ENABLE(TOUCH_EVENTS)
-    if (!isContentChangeObserverEnabled() || m_document.quirks().shouldDisableContentChangeObserverTouchEventAdjustment())
+    if (!isContentChangeObserverEnabled())
         return;
     if (eventType != PlatformEvent::Type::TouchStart)
         return;

diff --git a/Source/WebKit/Shared/WebsitePoliciesData.cpp b/Source/WebKit/Shared/WebsitePoliciesData.cpp
@@ -159,7 +159,6 @@ void WebsitePoliciesData::applyToDocumentLoader(WebsitePoliciesData&& websitePol
 
     documentLoader.setModalContainerObservationPolicy(websitePolicies.modalContainerObservationPolicy);
     documentLoader.setColorSchemePreference(websitePolicies.colorSchemePreference);
-    documentLoader.setAllowContentChangeObserverQuirk(websitePolicies.allowContentChangeObserverQuirk);
     documentLoader.setAdvancedPrivacyProtections(websitePolicies.advancedPrivacyProtections);
     documentLoader.setOriginatorAdvancedPrivacyProtections(websitePolicies.advancedPrivacyProtections);
     documentLoader.setIdempotentModeAutosizingOnlyHonorsPercentages(websitePolicies.idempotentModeAutosizingOnlyHonorsPercentages);

diff --git a/Source/WebKit/Shared/WebsitePoliciesData.h b/Source/WebKit/Shared/WebsitePoliciesData.h
@@ -81,7 +81,6 @@ struct WebsitePoliciesData {
 #if ENABLE(DEVICE_ORIENTATION)
     WebCore::DeviceOrientationOrMotionPermissionState deviceOrientationAndMotionAccessState { WebCore::DeviceOrientationOrMotionPermissionState::Prompt };
 #endif
-    bool allowContentChangeObserverQuirk { false };
     bool idempotentModeAutosizingOnlyHonorsPercentages { false };
     bool allowPrivacyProxy { true };
     bool allowSiteSpecificQuirksToOverrideContentMode { false };

diff --git a/Source/WebKit/Shared/WebsitePoliciesData.serialization.in b/Source/WebKit/Shared/WebsitePoliciesData.serialization.in
@@ -75,7 +75,6 @@ struct WebKit::WebsitePoliciesData {
 #if ENABLE(DEVICE_ORIENTATION)
     WebCore::DeviceOrientationOrMotionPermissionState deviceOrientationAndMotionAccessState;
 #endif
-    bool allowContentChangeObserverQuirk;
     bool idempotentModeAutosizingOnlyHonorsPercentages;
     bool allowPrivacyProxy;
     bool allowSiteSpecificQuirksToOverrideContentMode;

diff --git a/Source/WebKit/UIProcess/API/APIWebsitePolicies.h b/Source/WebKit/UIProcess/API/APIWebsitePolicies.h
@@ -107,9 +107,6 @@ class WebsitePolicies final : public API::ObjectImpl<API::Object::Type::WebsiteP
     WTF::String applicationNameForDesktopUserAgent() const { return m_data.applicationNameForDesktopUserAgent; }
     void setApplicationNameForDesktopUserAgent(const WTF::String& applicationName) { m_data.applicationNameForDesktopUserAgent = applicationName; }
 
-    bool allowContentChangeObserverQuirk() const { return m_data.allowContentChangeObserverQuirk; }
-    void setAllowContentChangeObserverQuirk(bool allow) { m_data.allowContentChangeObserverQuirk = allow; }
-
     WebCore::AllowsContentJavaScript allowsContentJavaScript() const { return m_data.allowsContentJavaScript; }
     void setAllowsContentJavaScript(WebCore::AllowsContentJavaScript allows) { m_data.allowsContentJavaScript = allows; }
 

diff --git a/Source/WebKit/UIProcess/ios/WebPageProxyIOS.mm b/Source/WebKit/UIProcess/ios/WebPageProxyIOS.mm
@@ -1435,7 +1435,6 @@ static RecommendDesktopClassBrowsingForRequest desktopClassBrowsingRecommendedFo
     m_preferFasterClickOverDoubleTap = false;
 
     if (!useDesktopBrowsingMode) {
-        policies.setAllowContentChangeObserverQuirk(true);
         policies.setIdempotentModeAutosizingOnlyHonorsPercentages(true);
         return WebContentMode::Mobile;
     }