Changeset 206517 in webkit

Timestamp:

Sep 28, 2016 7:49:14 AM (8 years ago)

Author:

Michael Catanzaro

Message:

[GTK] User agent should always claim to be Intel
​https://bugs.webkit.org/show_bug.cgi?id=162610

Reviewed by Carlos Garcia Campos.

We should always claim to be running on Intel regardless of actual CPU type. See discussion
in bug #162548 for details. In particular, we can never advertise ARM because it causes dumb
websites to send mobile pages.

• platform/gtk/UserAgentGtk.cpp:

(WebCore::platformVersionForUAString):
(WebCore::buildUserAgentString):
(WebCore::cpuDescriptionForUAString): Deleted.

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• platform/gtk/UserAgentGtk.cpp (modified) (3 diffs)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2016-09-28  Michael Catanzaro  <mcatanzaro@igalia.com>
+
+        [GTK] User agent should always claim to be Intel
+        https://bugs.webkit.org/show_bug.cgi?id=162610
+
+        Reviewed by Carlos Garcia Campos.
+
+        We should always claim to be running on Intel regardless of actual CPU type. See discussion
+        in bug #162548 for details. In particular, we can never advertise ARM because it causes dumb
+        websites to send mobile pages.
+
+        * platform/gtk/UserAgentGtk.cpp:
+        (WebCore::platformVersionForUAString):
+        (WebCore::buildUserAgentString):
+        (WebCore::cpuDescriptionForUAString): Deleted.
+
 2016-09-28  Michael Catanzaro  <mcatanzaro@igalia.com>
 

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

@@ -77 +77 @@
 };
 
-static const char* cpuDescriptionForUAString()
-{
-#if CPU(PPC) || CPU(PPC64)
-    return "PPC";
-#elif CPU(X86) || CPU(X86_64)
-    return "Intel";
-#elif CPU(ARM) || CPU(ARM64)
-    return "ARM";
-#else
-    return "Unknown";
-#endif
-}
-
 static const char* platformForUAString()
 {
@@ -108 +95 @@
 #else
     // We will always claim to be Safari in Mac OS X, since Safari in Linux triggers the iOS path on some websites.
-    static NeverDestroyed<const String> uaOSVersion(String::format("%s Mac OS X", cpuDescriptionForUAString()));
+    // And we always claim to be Intel since ARM triggers mobile versions of some websites.
+    static NeverDestroyed<const String> uaOSVersion(ASCIILiteral("Intel Mac OS X"));
     return uaOSVersion;
 #endif
@@ -131 +119 @@
     uaString.appendLiteral("; ");
 
-    if (quirks.contains(UserAgentQuirks::NeedsMacintoshPlatform)) {
-        uaString.append(cpuDescriptionForUAString());
-        uaString.appendLiteral(" Mac OS X");
-    } else
+    if (quirks.contains(UserAgentQuirks::NeedsMacintoshPlatform))
+        uaString.appendLiteral("Intel Mac OS X");
+    else
         uaString.append(platformVersionForUAString());