Changeset 248502 in webkit

Timestamp:

Aug 10, 2019 3:45:43 PM (5 years ago)

Author:

achristensen@apple.com

Message:

Disable ContentChangeObserver TouchEvent adjustment on youtube.com on iOS in mobile browsing mode
​https://bugs.webkit.org/show_bug.cgi?id=200609
<rdar://problem/54015403>

Reviewed by Maciej Stachowiak.

Source/WebCore:

When watching a youtube video on iOS with "Autoplay" switched to off,
upon finishing the video all clicks anywhere on the page are effectively ignored.
Disabling ContentChangeObserver's TouchEvent adjustment fixes this bug. I verified this manually.
This switch was introduced in r242621, and it disables part of a new feature, so there is low risk of fallout.

• loader/DocumentLoader.h:

(WebCore::DocumentLoader::setAllowContentChangeObserverQuirk):
(WebCore::DocumentLoader::allowContentChangeObserverQuirk const):

• page/Quirks.cpp:

(WebCore::Quirks::shouldDisableContentChangeObserverTouchEventAdjustment const):

• page/Quirks.h:
• page/ios/ContentChangeObserver.cpp:

(WebCore::ContentChangeObserver::touchEventDidStart):

Source/WebKit:

• Shared/WebsitePoliciesData.cpp:

(WebKit::WebsitePoliciesData::encode const):
(WebKit::WebsitePoliciesData::decode):
(WebKit::WebsitePoliciesData::applyToDocumentLoader):

• Shared/WebsitePoliciesData.h:
• UIProcess/API/APIWebsitePolicies.cpp:

(API::WebsitePolicies::copy const):
(API::WebsitePolicies::data):

• UIProcess/API/APIWebsitePolicies.h:
• UIProcess/ios/WebPageProxyIOS.mm:

(WebKit::WebPageProxy::effectiveContentModeAfterAdjustingPolicies):

Location:

trunk/Source

Files:

• WebCore/ChangeLog (modified) (1 diff)
• WebCore/loader/DocumentLoader.h (modified) (2 diffs)
• WebCore/page/Quirks.cpp (modified) (1 diff)
• WebCore/page/Quirks.h (modified) (1 diff)
• WebCore/page/ios/ContentChangeObserver.cpp (modified) (1 diff)
• WebKit/ChangeLog (modified) (1 diff)
• WebKit/Shared/WebsitePoliciesData.cpp (modified) (4 diffs)
• WebKit/Shared/WebsitePoliciesData.h (modified) (1 diff)
• WebKit/UIProcess/API/APIWebsitePolicies.cpp (modified) (2 diffs)
• WebKit/UIProcess/API/APIWebsitePolicies.h (modified) (2 diffs)
• WebKit/UIProcess/ios/WebPageProxyIOS.mm (modified) (1 diff)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2019-08-10  Alex Christensen  <achristensen@webkit.org>
+
+        Disable ContentChangeObserver TouchEvent adjustment on youtube.com on iOS in mobile browsing mode
+        https://bugs.webkit.org/show_bug.cgi?id=200609
+        <rdar://problem/54015403>
+
+        Reviewed by Maciej Stachowiak.
+
+        When watching a youtube video on iOS with "Autoplay" switched to off,
+        upon finishing the video all clicks anywhere on the page are effectively ignored.
+        Disabling ContentChangeObserver's TouchEvent adjustment fixes this bug.  I verified this manually.
+        This switch was introduced in r242621, and it disables part of a new feature, so there is low risk of fallout.
+
+        * loader/DocumentLoader.h:
+        (WebCore::DocumentLoader::setAllowContentChangeObserverQuirk):
+        (WebCore::DocumentLoader::allowContentChangeObserverQuirk const):
+        * page/Quirks.cpp:
+        (WebCore::Quirks::shouldDisableContentChangeObserverTouchEventAdjustment const):
+        * page/Quirks.h:
+        * page/ios/ContentChangeObserver.cpp:
+        (WebCore::ContentChangeObserver::touchEventDidStart):
+
 2019-08-10  Said Abou-Hallawa  <sabouhallawa@apple.com>
 

trunk/Source/WebCore/loader/DocumentLoader.h

@@ -392 +392 @@
     WEBCORE_EXPORT void applyPoliciesToSettings();
 
+    void setAllowContentChangeObserverQuirk(bool allow) { m_allowContentChangeObserverQuirk = allow; }
+    bool allowContentChangeObserverQuirk() const { return m_allowContentChangeObserverQuirk; }
+
 protected:
     WEBCORE_EXPORT DocumentLoader(const ResourceRequest&, const SubstituteData&);
@@ -595 +598 @@
     String m_customUserAgent;
     String m_customJavaScriptUserAgentAsSiteSpecificQuirks;
+    bool m_allowContentChangeObserverQuirk { false };
     String m_customNavigatorPlatform;
     bool m_userContentExtensionsEnabled { true };

trunk/Source/WebCore/page/Quirks.cpp

@@ -140 +140 @@
 }
 
+bool Quirks::shouldDisableContentChangeObserverTouchEventAdjustment() const
+{
+    if (!needsQuirks())
+        return false;
+
+    auto& topDocument = m_document->topDocument();
+    auto* topDocumentLoader = topDocument.loader();
+    if (!topDocumentLoader || !topDocumentLoader->allowContentChangeObserverQuirk())
+        return false;
+
+    auto host = m_document->topDocument().url().host();
+    return host.endsWith(".youtube.com") || host == "youtube.com";
+}
+
 bool Quirks::shouldStripQuotationMarkInFontFaceSetFamily() const
 {

trunk/Source/WebCore/page/Quirks.h

@@ -62 +62 @@
     bool needsDeferKeyDownAndKeyPressTimersUntilNextEditingCommand() const;
     bool shouldLightenJapaneseBoldSansSerif() const;
+    bool shouldDisableContentChangeObserverTouchEventAdjustment() const;
 
     WEBCORE_EXPORT bool shouldDispatchSyntheticMouseEventsWhenModifyingSelection() const;

trunk/Source/WebCore/page/ios/ContentChangeObserver.cpp

@@ -424 +424 @@
 {
 #if ENABLE(TOUCH_EVENTS)
-    if (!m_document.settings().contentChangeObserverEnabled())
+    if (!m_document.settings().contentChangeObserverEnabled() || m_document.quirks().shouldDisableContentChangeObserverTouchEventAdjustment())
         return;
     if (eventType != PlatformEvent::Type::TouchStart)

trunk/Source/WebKit/ChangeLog

@@ +1 @@
+2019-08-10  Alex Christensen  <achristensen@webkit.org>
+
+        Disable ContentChangeObserver TouchEvent adjustment on youtube.com on iOS in mobile browsing mode
+        https://bugs.webkit.org/show_bug.cgi?id=200609
+        <rdar://problem/54015403>
+
+        Reviewed by Maciej Stachowiak.
+
+        * Shared/WebsitePoliciesData.cpp:
+        (WebKit::WebsitePoliciesData::encode const):
+        (WebKit::WebsitePoliciesData::decode):
+        (WebKit::WebsitePoliciesData::applyToDocumentLoader):
+        * Shared/WebsitePoliciesData.h:
+        * UIProcess/API/APIWebsitePolicies.cpp:
+        (API::WebsitePolicies::copy const):
+        (API::WebsitePolicies::data):
+        * UIProcess/API/APIWebsitePolicies.h:
+        * UIProcess/ios/WebPageProxyIOS.mm:
+        (WebKit::WebPageProxy::effectiveContentModeAfterAdjustingPolicies):
+
 2019-08-10  Said Abou-Hallawa  <sabouhallawa@apple.com>
 

trunk/Source/WebKit/Shared/WebsitePoliciesData.cpp

@@ -54 +54 @@
     encoder << simulatedMouseEventsDispatchPolicy;
     encoder << legacyOverflowScrollingTouchPolicy;
+    encoder << allowContentChangeObserverQuirk;
 }
 
@@ -130 +131 @@
         return WTF::nullopt;
 
+    Optional<bool> allowContentChangeObserverQuirk;
+    decoder >> allowContentChangeObserverQuirk;
+    if (!allowContentChangeObserverQuirk)
+        return WTF::nullopt;
+    
     return { {
         WTFMove(*contentBlockersEnabled),
@@ -147 +153 @@
         WTFMove(*simulatedMouseEventsDispatchPolicy),
         WTFMove(*legacyOverflowScrollingTouchPolicy),
+        WTFMove(*allowContentChangeObserverQuirk),
     } };
 }
@@ -257 +264 @@
     }
 
+    documentLoader.setAllowContentChangeObserverQuirk(websitePolicies.allowContentChangeObserverQuirk);
+
     auto* frame = documentLoader.frame();
     if (!frame)

trunk/Source/WebKit/Shared/WebsitePoliciesData.h

@@ -68 +68 @@
     WebsiteSimulatedMouseEventsDispatchPolicy simulatedMouseEventsDispatchPolicy { WebsiteSimulatedMouseEventsDispatchPolicy::Default };
     WebsiteLegacyOverflowScrollingTouchPolicy legacyOverflowScrollingTouchPolicy { WebsiteLegacyOverflowScrollingTouchPolicy::Default };
+    bool allowContentChangeObserverQuirk { false };
 
     void encode(IPC::Encoder&) const;

trunk/Source/WebKit/UIProcess/API/APIWebsitePolicies.cpp

@@ -63 +63 @@
     policies->setSimulatedMouseEventsDispatchPolicy(m_simulatedMouseEventsDispatchPolicy);
     policies->setLegacyOverflowScrollingTouchPolicy(m_legacyOverflowScrollingTouchPolicy);
+    policies->setAllowContentChangeObserverQuirk(m_allowContentChangeObserverQuirk);
     
     Vector<WebCore::HTTPHeaderField> legacyCustomHeaderFields;
@@ -116 +117 @@
         m_simulatedMouseEventsDispatchPolicy,
         m_legacyOverflowScrollingTouchPolicy,
+        m_allowContentChangeObserverQuirk,
     };
 }

trunk/Source/WebKit/UIProcess/API/APIWebsitePolicies.h

@@ -115 +115 @@
     void setApplicationNameForDesktopUserAgent(const WTF::String& applicationName) { m_applicationNameForDesktopUserAgent = applicationName; }
 
+    bool allowContentChangeObserverQuirk() const { return m_allowContentChangeObserverQuirk; }
+    void setAllowContentChangeObserverQuirk(bool allow) { m_allowContentChangeObserverQuirk = allow; }
+
 private:
     WebsitePolicies(bool contentBlockersEnabled, OptionSet<WebKit::WebsiteAutoplayQuirk>, WebKit::WebsiteAutoplayPolicy, Vector<WebCore::HTTPHeaderField>&&, Vector<WebCore::CustomHeaderFields>&&, WebKit::WebsitePopUpPolicy, RefPtr<WebsiteDataStore>&&);
@@ -138 +141 @@
     bool m_allowSiteSpecificQuirksToOverrideContentMode { false };
     WTF::String m_applicationNameForDesktopUserAgent;
+    bool m_allowContentChangeObserverQuirk { false };
 };
 

trunk/Source/WebKit/UIProcess/ios/WebPageProxyIOS.mm

@@ -1421 +1421 @@
     m_allowsFastClicksEverywhere = false;
 
-    if (!useDesktopBrowsingMode)
+    if (!useDesktopBrowsingMode) {
+        policies.setAllowContentChangeObserverQuirk(true);
         return WebContentMode::Mobile;
+    }
 
     if (policies.customUserAgent().isEmpty() && customUserAgent().isEmpty()) {