Changeset 248501 in webkit

Timestamp:

Aug 10, 2019 3:25:48 PM (5 years ago)

Author:

commit-queue@webkit.org

Message:

[iOS] Add a quirk for gmail.com messages on iPhone iOS13
​https://bugs.webkit.org/show_bug.cgi?id=200605

Patch by Said Abou-Hallawa <​sabouhallawa@apple.com> on 2019-08-10
Reviewed by Maciej Stachowiak.

Source/WebCore:

Add a quirk which sets the user agent for gmail.com messages on iPhone
OS 13 to be iPhone OS 12. This is a workaround for a gmail.com bug till
it is fixed.

• page/Quirks.cpp:

(WebCore::Quirks::shouldAvoidUsingIOS13ForGmail const):

• page/Quirks.h:
• platform/UserAgent.h:
• platform/ios/UserAgentIOS.mm:

(WebCore::osNameForUserAgent):
(WebCore::standardUserAgentWithApplicationName):

• platform/mac/UserAgentMac.mm:

(WebCore::standardUserAgentWithApplicationName):

Source/WebKit:

Use WebPage::platformUserAgent() to add the gmail.com quirk.

• UIProcess/ios/WebPageProxyIOS.mm:

(WebKit::WebPageProxy::effectiveContentModeAfterAdjustingPolicies):

• WebProcess/WebPage/ios/WebPageIOS.mm:

(WebKit::WebPage::platformUserAgent const):

Location:

trunk/Source

Files:

• WebCore/ChangeLog (modified) (1 diff)
• WebCore/page/Quirks.cpp (modified) (2 diffs)
• WebCore/page/Quirks.h (modified) (1 diff)
• WebCore/platform/UserAgent.h (modified) (1 diff)
• WebCore/platform/ios/UserAgentIOS.mm (modified) (3 diffs)
• WebCore/platform/mac/UserAgentMac.mm (modified) (1 diff)
• WebKit/ChangeLog (modified) (1 diff)
• WebKit/UIProcess/ios/WebPageProxyIOS.mm (modified) (1 diff)
• WebKit/WebProcess/WebPage/ios/WebPageIOS.mm (modified) (2 diffs)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2019-08-10  Said Abou-Hallawa  <sabouhallawa@apple.com>
+
+        [iOS] Add a quirk for gmail.com messages on iPhone iOS13
+        https://bugs.webkit.org/show_bug.cgi?id=200605
+
+        Reviewed by Maciej Stachowiak.
+
+        Add a quirk which sets the user agent for gmail.com messages on iPhone
+        OS 13 to be iPhone OS 12. This is a workaround for a gmail.com bug till
+        it is fixed.
+
+        * page/Quirks.cpp:
+        (WebCore::Quirks::shouldAvoidUsingIOS13ForGmail const):
+        * page/Quirks.h:
+        * platform/UserAgent.h:
+        * platform/ios/UserAgentIOS.mm:
+        (WebCore::osNameForUserAgent):
+        (WebCore::standardUserAgentWithApplicationName):
+        * platform/mac/UserAgentMac.mm:
+        (WebCore::standardUserAgentWithApplicationName):
+
 2019-08-10  Thibault Saunier  <tsaunier@igalia.com>
 

trunk/Source/WebCore/page/Quirks.cpp

@@ -37 +37 @@
 #include "RuntimeEnabledFeatures.h"
 #include "Settings.h"
+#include "UserAgent.h"
 
 namespace WebCore {
@@ -227 +228 @@
 
     return equalLettersIgnoringASCIICase(m_document->url().host(), "www.youtube.com");
+#else
+    return false;
+#endif
+}
+
+bool Quirks::shouldAvoidUsingIOS13ForGmail() const
+{
+#if PLATFORM(IOS_FAMILY)
+    if (!needsQuirks())
+        return false;
+
+    auto& url = m_document->topDocument().url();
+    return equalLettersIgnoringASCIICase(url.host(), "mail.google.com");
 #else
     return false;

trunk/Source/WebCore/page/Quirks.h

@@ -71 +71 @@
 
     WEBCORE_EXPORT bool needsYouTubeMouseOutQuirk() const;
+    
+    WEBCORE_EXPORT bool shouldAvoidUsingIOS13ForGmail() const;
 
     bool needsGMailOverflowScrollQuirk() const;

trunk/Source/WebCore/platform/UserAgent.h

@@ -33 +33 @@
 #if PLATFORM(COCOA)
 enum class UserAgentType { Default, Desktop };
-WEBCORE_EXPORT String standardUserAgentWithApplicationName(const String& applicationName, UserAgentType = UserAgentType::Default);
+WEBCORE_EXPORT String standardUserAgentWithApplicationName(const String& applicationName, const String& userAgentOSVersion = emptyString(), UserAgentType = UserAgentType::Default);
 
-String systemMarketingVersionForUserAgentString();
+WEBCORE_EXPORT String osNameForUserAgent();
+WEBCORE_EXPORT String systemMarketingVersionForUserAgentString();
 #else
 

trunk/Source/WebCore/platform/ios/UserAgentIOS.mm

@@ -53 +53 @@
 }
 
-static inline String osNameForUserAgent()
+String osNameForUserAgent()
 {
     if (deviceHasIPadCapability() && !isClassicPhone())
@@ -80 +80 @@
 }
 
-String standardUserAgentWithApplicationName(const String& applicationName, UserAgentType type)
+String standardUserAgentWithApplicationName(const String& applicationName, const String& userAgentOSVersion, UserAgentType type)
 {
     if (type == UserAgentType::Desktop) {
@@ -96 +96 @@
     }
 
-    String osVersion = systemMarketingVersionForUserAgentString();
+    String osVersion = userAgentOSVersion.isEmpty()  ? systemMarketingVersionForUserAgentString() : userAgentOSVersion;
     String appNameSuffix = applicationName.isEmpty() ? "" : makeString(" ", applicationName);
 

trunk/Source/WebCore/platform/mac/UserAgentMac.mm

@@ -33 +33 @@
 namespace WebCore {
 
-String standardUserAgentWithApplicationName(const String& applicationName, UserAgentType)
+String standardUserAgentWithApplicationName(const String& applicationName, const String&, UserAgentType)
 {
     String osVersion = systemMarketingVersionForUserAgentString();

trunk/Source/WebKit/ChangeLog

@@ +1 @@
+2019-08-10  Said Abou-Hallawa  <sabouhallawa@apple.com>
+
+        [iOS] Add a quirk for gmail.com messages on iPhone iOS13
+        https://bugs.webkit.org/show_bug.cgi?id=200605
+
+        Reviewed by Maciej Stachowiak.
+
+        Use WebPage::platformUserAgent() to add the gmail.com quirk.
+
+        * UIProcess/ios/WebPageProxyIOS.mm:
+        (WebKit::WebPageProxy::effectiveContentModeAfterAdjustingPolicies):
+        * WebProcess/WebPage/ios/WebPageIOS.mm:
+        (WebKit::WebPage::platformUserAgent const):
+
 2019-08-10  Tim Horton  <timothy_horton@apple.com>
 

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

@@ -1428 +1428 @@
         if (applicationName.isEmpty())
             applicationName = applicationNameForDesktopUserAgent();
-        policies.setCustomUserAgent(standardUserAgentWithApplicationName(applicationName, UserAgentType::Desktop));
+        policies.setCustomUserAgent(standardUserAgentWithApplicationName(applicationName, emptyString(), UserAgentType::Desktop));
     }
 

trunk/Source/WebKit/WebProcess/WebPage/ios/WebPageIOS.mm

@@ -124 +124 @@
 #import <WebCore/TextIndicator.h>
 #import <WebCore/TextIterator.h>
+#import <WebCore/UserAgent.h>
 #import <WebCore/VisibleUnits.h>
 #import <WebCore/WebEvent.h>
@@ -3783 +3784 @@
 String WebPage::platformUserAgent(const URL&) const
 {
+    if (!m_page->settings().needsSiteSpecificQuirks())
+        return String();
+
+    auto document = m_mainFrame->coreFrame()->document();
+    if (!document)
+        return String();
+
+    if (document->quirks().shouldAvoidUsingIOS13ForGmail() && osNameForUserAgent() == "iPhone OS" && systemMarketingVersionForUserAgentString() == "13_1")
+        return standardUserAgentWithApplicationName({ }, "12_1_3");
+
     return String();
 }