Changeset 245229 in webkit

Timestamp:

May 12, 2019, 11:51:16 PM (7 years ago)

Author:

bshafiei@apple.com

Message:

Cherry-pick r245189. rdar://problem/50646747

Let WebKit clients supply an application name for user agent in modern compatibility mode
​https://bugs.webkit.org/show_bug.cgi?id=197782
<rdar://problem/50646747>

Reviewed by Beth Dakin.

Add plumbing for a new private property on WKWebpagePreferences.

• UIProcess/API/APIWebsitePolicies.cpp: (API::WebsitePolicies::copy const):
• UIProcess/API/APIWebsitePolicies.h:
• UIProcess/API/Cocoa/WKWebpagePreferences.mm: (-[WKWebpagePreferences _applicationNameForUserAgentWithModernCompatibility]): (-[WKWebpagePreferences _setApplicationNameForUserAgentWithModernCompatibility:]):
• UIProcess/API/Cocoa/WKWebpagePreferencesPrivate.h:

git-svn-id: ​https://svn.webkit.org/repository/webkit/trunk@245189 268f45cc-cd09-0410-ab3c-d52691b4dbfc

Location:

branches/safari-608.1.24-branch/Source/WebKit

Files:

• ChangeLog (modified) (1 diff)
• UIProcess/API/APIWebsitePolicies.cpp (modified) (1 diff)
• UIProcess/API/APIWebsitePolicies.h (modified) (2 diffs)
• UIProcess/API/Cocoa/WKWebpagePreferences.mm (modified) (1 diff)
• UIProcess/API/Cocoa/WKWebpagePreferencesPrivate.h (modified) (1 diff)

branches/safari-608.1.24-branch/Source/WebKit/ChangeLog

@@ +1 @@
+2019-05-12  Babak Shafiei  <bshafiei@apple.com>
+
+        Cherry-pick r245189. rdar://problem/50646747
+
+    Let WebKit clients supply an application name for user agent in modern compatibility mode
+    https://bugs.webkit.org/show_bug.cgi?id=197782
+    <rdar://problem/50646747>
+    
+    Reviewed by Beth Dakin.
+    
+    Add plumbing for a new private property on WKWebpagePreferences.
+    
+    * UIProcess/API/APIWebsitePolicies.cpp:
+    (API::WebsitePolicies::copy const):
+    * UIProcess/API/APIWebsitePolicies.h:
+    * UIProcess/API/Cocoa/WKWebpagePreferences.mm:
+    (-[WKWebpagePreferences _applicationNameForUserAgentWithModernCompatibility]):
+    (-[WKWebpagePreferences _setApplicationNameForUserAgentWithModernCompatibility:]):
+    * UIProcess/API/Cocoa/WKWebpagePreferencesPrivate.h:
+    
+    
+    git-svn-id: https://svn.webkit.org/repository/webkit/trunk@245189 268f45cc-cd09-0410-ab3c-d52691b4dbfc
+
+    2019-05-10  Wenson Hsieh  <wenson_hsieh@apple.com>
+
+            Let WebKit clients supply an application name for user agent in modern compatibility mode
+            https://bugs.webkit.org/show_bug.cgi?id=197782
+            <rdar://problem/50646747>
+
+            Reviewed by Beth Dakin.
+
+            Add plumbing for a new private property on WKWebpagePreferences.
+
+            * UIProcess/API/APIWebsitePolicies.cpp:
+            (API::WebsitePolicies::copy const):
+            * UIProcess/API/APIWebsitePolicies.h:
+            * UIProcess/API/Cocoa/WKWebpagePreferences.mm:
+            (-[WKWebpagePreferences _applicationNameForUserAgentWithModernCompatibility]):
+            (-[WKWebpagePreferences _setApplicationNameForUserAgentWithModernCompatibility:]):
+            * UIProcess/API/Cocoa/WKWebpagePreferencesPrivate.h:
+
 2019-05-12  Babak Shafiei  <bshafiei@apple.com>
 

branches/safari-608.1.24-branch/Source/WebKit/UIProcess/API/APIWebsitePolicies.cpp

@@ -67 +67 @@
     policies->setCustomHeaderFields(WTFMove(customHeaderFields));
     policies->setAllowSiteSpecificQuirksToOverrideCompatibilityMode(m_allowSiteSpecificQuirksToOverrideCompatibilityMode);
+    policies->setApplicationNameForUserAgentWithModernCompatibility(m_applicationNameForUserAgentWithModernCompatibility);
     return policies;
 }

branches/safari-608.1.24-branch/Source/WebKit/UIProcess/API/APIWebsitePolicies.h

@@ -105 +105 @@
     void setAllowSiteSpecificQuirksToOverrideCompatibilityMode(bool value) { m_allowSiteSpecificQuirksToOverrideCompatibilityMode = value; }
 
+    WTF::String applicationNameForUserAgentWithModernCompatibility() const { return m_applicationNameForUserAgentWithModernCompatibility; }
+    void setApplicationNameForUserAgentWithModernCompatibility(const WTF::String& applicationName) { m_applicationNameForUserAgentWithModernCompatibility = applicationName; }
+
 private:
     WebsitePolicies(bool contentBlockersEnabled, OptionSet<WebKit::WebsiteAutoplayQuirk>, WebKit::WebsiteAutoplayPolicy, Vector<WebCore::HTTPHeaderField>&&, WebKit::WebsitePopUpPolicy, RefPtr<WebsiteDataStore>&&);
@@ -125 +128 @@
     WebKit::WebsiteSimulatedMouseEventsDispatchPolicy m_simulatedMouseEventsDispatchPolicy { WebKit::WebsiteSimulatedMouseEventsDispatchPolicy::Default };
     bool m_allowSiteSpecificQuirksToOverrideCompatibilityMode { false };
+    WTF::String m_applicationNameForUserAgentWithModernCompatibility;
 };
 

branches/safari-608.1.24-branch/Source/WebKit/UIProcess/API/Cocoa/WKWebpagePreferences.mm

@@ -287 +287 @@
 }
 
+- (NSString *)_applicationNameForUserAgentWithModernCompatibility
+{
+    return _websitePolicies->applicationNameForUserAgentWithModernCompatibility();
+}
+
+- (void)_setApplicationNameForUserAgentWithModernCompatibility:(NSString *)applicationName
+{
+    _websitePolicies->setApplicationNameForUserAgentWithModernCompatibility(applicationName);
+}
+
 - (API::Object&)_apiObject
 {

branches/safari-608.1.24-branch/Source/WebKit/UIProcess/API/Cocoa/WKWebpagePreferencesPrivate.h

@@ -70 +70 @@
 @property (nonatomic, setter=_setAllowSiteSpecificQuirksToOverrideCompatibilityMode:) BOOL _allowSiteSpecificQuirksToOverrideCompatibilityMode;
 
+@property (nonatomic, copy, setter=_setApplicationNameForUserAgentWithModernCompatibility:) NSString *_applicationNameForUserAgentWithModernCompatibility;
+
 @end