Changeset 243525 in webkit

Timestamp:

Mar 26, 2019, 4:41:42 PM (7 years ago)

Author:

Wenson Hsieh

Message:

[Cocoa] Refactor some helper functions for building UserAgent strings
​https://bugs.webkit.org/show_bug.cgi?id=195990

Reviewed by Brent Fulgham.

Add an optional argument to standardUserAgentWithApplicationName to request the desktop version of the user
agent in Cocoa platforms. Work towards refactoring some codepaths to make the implementation of the "Request
Desktop Site" feature in Safari a bit more straightforward.

No change in behavior.

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

(WebCore::standardUserAgentWithApplicationName):

The corresponding macOS version is currently hard-coded — the followup bug webkit.org/b/196275 tracks making
this dynamically fetch the paired macOS version when building for iOS.

• platform/mac/UserAgentMac.mm:

(WebCore::standardUserAgentWithApplicationName):

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• platform/UserAgent.h (modified) (1 diff)
• platform/ios/UserAgentIOS.mm (modified) (1 diff)
• platform/mac/UserAgentMac.mm (modified) (1 diff)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2019-03-26  Wenson Hsieh  <wenson_hsieh@apple.com>
+
+        [Cocoa] Refactor some helper functions for building UserAgent strings
+        https://bugs.webkit.org/show_bug.cgi?id=195990
+
+        Reviewed by Brent Fulgham.
+
+        Add an optional argument to standardUserAgentWithApplicationName to request the desktop version of the user
+        agent in Cocoa platforms. Work towards refactoring some codepaths to make the implementation of the "Request
+        Desktop Site" feature in Safari a bit more straightforward.
+
+        No change in behavior.
+
+        * platform/UserAgent.h:
+        * platform/ios/UserAgentIOS.mm:
+        (WebCore::standardUserAgentWithApplicationName):
+
+        The corresponding macOS version is currently hard-coded — the followup bug webkit.org/b/196275 tracks making
+        this dynamically fetch the paired macOS version when building for iOS.
+
+        * platform/mac/UserAgentMac.mm:
+        (WebCore::standardUserAgentWithApplicationName):
+
 2019-03-26  Said Abou-Hallawa  <said@apple.com>
 

trunk/Source/WebCore/platform/UserAgent.h

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

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

@@ -77 +77 @@
 }
 
-String standardUserAgentWithApplicationName(const String& applicationName)
+String standardUserAgentWithApplicationName(const String& applicationName, UserAgentType type)
 {
+    if (type == UserAgentType::Desktop) {
+        String appNameSuffix = applicationName.isEmpty() ? "" : makeString(" ", applicationName);
+        return makeString("Mozilla/5.0 (Macintosh; Intel Mac OS X 10_14) AppleWebKit/605.1.15 (KHTML, like Gecko)", appNameSuffix);
+    }
+
     // FIXME: Is this needed any more? Mac doesn't have this check,
     // Check to see if there is a user agent override for all WebKit clients.

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

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