Changeset 206515 in webkit

Timestamp:

Sep 28, 2016 7:40:31 AM (8 years ago)

Author:

Michael Catanzaro

Message:

[GTK] Adjust OS X UA quirks list
​https://bugs.webkit.org/show_bug.cgi?id=162616

Reviewed by Carlos Garcia Campos.

Remove the OS X quirk for yahoo.com as it's no longer needed. Add quirks for taobao.com and
whatsapp.com.

• platform/gtk/UserAgentGtk.cpp:

(WebCore::urlRequiresMacintoshPlatform):
(WebCore::standardUserAgentForURL):

Location:

trunk

Files:

• Source/WebCore/ChangeLog (modified) (1 diff)
• Source/WebCore/platform/gtk/UserAgentGtk.cpp (modified) (2 diffs)
• Tools/TestWebKitAPI/Tests/WebCore/gtk/UserAgentQuirks.cpp (modified) (1 diff)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2016-09-28  Michael Catanzaro  <mcatanzaro@igalia.com>
+
+        [GTK] Adjust OS X UA quirks list
+        https://bugs.webkit.org/show_bug.cgi?id=162616
+
+        Reviewed by Carlos Garcia Campos.
+
+        Remove the OS X quirk for yahoo.com as it's no longer needed. Add quirks for taobao.com and
+        whatsapp.com.
+
+        * platform/gtk/UserAgentGtk.cpp:
+        (WebCore::urlRequiresMacintoshPlatform):
+        (WebCore::standardUserAgentForURL):
+
 2016-09-28  Alejandro G. Castro  <alex@igalia.com>
 

trunk/Source/WebCore/platform/gtk/UserAgentGtk.cpp

@@ -27 +27 @@
 #include "UserAgentGtk.h"
 
+#include "PublicSuffix.h"
 #include "URL.h"
 #include <wtf/NeverDestroyed.h>
@@ -172 +173 @@
 }
 
+static bool urlRequiresMacintoshPlatform(const URL& url)
+{
+    String baseDomain = topPrivatelyControlledDomain(url.host());
+
+    // taobao.com displays a mobile version with our standard user agent.
+    if (baseDomain == "taobao.com")
+        return true;
+
+    // web.whatsapp.com completely blocks users with our standard user agent.
+    if (baseDomain == "whatsapp.com")
+        return true;
+
+    return false;
+}
+
 String standardUserAgentForURL(const URL& url)
 {
     ASSERT(!url.isNull());
     UserAgentQuirks quirks;
-    if (url.host().endsWith(".yahoo.com")) {
-        // www.yahoo.com redirects to the mobile version when Linux is present in the UA,
-        // use always Macintosh as platform. See https://bugs.webkit.org/show_bug.cgi?id=125444.
+    if (urlRequiresMacintoshPlatform(url)) {
         quirks.add(UserAgentQuirks::NeedsMacintoshPlatform);
     }

trunk/Tools/TestWebKitAPI/Tests/WebCore/gtk/UserAgentQuirks.cpp

@@ -39 +39 @@
     EXPECT_TRUE(uaString.isNull());
 
-    // www.yahoo.com requires MAC OS platform in the UA.
-    uaString = standardUserAgentForURL(URL(ParsedURLString, "http://www.yahoo.com/"));
+    // web.whatsapp.com requires MAC OS platform in the UA.
+    uaString = standardUserAgentForURL(URL(ParsedURLString, "http://web.whatsapp.com/"));
     EXPECT_TRUE(uaString.contains("Macintosh"));
     EXPECT_TRUE(uaString.contains("Mac OS X"));