Attachment 369558 Details for Bug 197782 – Patch

[patch] Patch

bug-197782-20190510095319.patch (text/plain), 5.40 KB, created by Wenson Hsieh on 2019-05-10 09:53:20 PDT

(hide)

Description:

Filename:

MIME Type:

Creator: Wenson Hsieh

Created: 2019-05-10 09:53:20 PDT

Size: 5.40 KB

patch

obsolete

>Subversion Revision: 245167
>diff --git a/Source/WebKit/ChangeLog b/Source/WebKit/ChangeLog
>index 362afc26ece1f6a68682a9116447fcbb11a0982a..c9897a93649e64de9208e6cc61e3f7edd61816b3 100644
>--- a/Source/WebKit/ChangeLog
>+++ b/Source/WebKit/ChangeLog
>@@ -1,3 +1,21 @@
>+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 NOBODY (OOPS!).
>+
>+        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-09  Alex Christensen  <achristensen@webkit.org>
> 
>         Unreviewed, rolling out most of r245151.
>diff --git a/Source/WebKit/UIProcess/API/APIWebsitePolicies.cpp b/Source/WebKit/UIProcess/API/APIWebsitePolicies.cpp
>index 7e44338141341f901fcfdbac395125ca91c1cb36..99e830ce8d4d613cf9da850b21ca812819823690 100644
>--- a/Source/WebKit/UIProcess/API/APIWebsitePolicies.cpp
>+++ b/Source/WebKit/UIProcess/API/APIWebsitePolicies.cpp
>@@ -66,6 +66,7 @@ Ref<WebsitePolicies> WebsitePolicies::copy() const
>         customHeaderFields.append(WebCore::HTTPHeaderField(field));
>     policies->setCustomHeaderFields(WTFMove(customHeaderFields));
>     policies->setAllowSiteSpecificQuirksToOverrideCompatibilityMode(m_allowSiteSpecificQuirksToOverrideCompatibilityMode);
>+    policies->setApplicationNameForUserAgentWithModernCompatibility(m_applicationNameForUserAgentWithModernCompatibility);
>     return policies;
> }
> 
>diff --git a/Source/WebKit/UIProcess/API/APIWebsitePolicies.h b/Source/WebKit/UIProcess/API/APIWebsitePolicies.h
>index f290b69b73b7ed64144c68d9bf6576be16881ce0..4d49269a84ad8d8d454fa670a375aec4fddf6a70 100644
>--- a/Source/WebKit/UIProcess/API/APIWebsitePolicies.h
>+++ b/Source/WebKit/UIProcess/API/APIWebsitePolicies.h
>@@ -104,6 +104,9 @@ public:
>     bool allowSiteSpecificQuirksToOverrideCompatibilityMode() const { return m_allowSiteSpecificQuirksToOverrideCompatibilityMode; }
>     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>&&);
> 
>@@ -124,6 +127,7 @@ private:
>     WebKit::WebsiteMediaSourcePolicy m_mediaSourcePolicy { WebKit::WebsiteMediaSourcePolicy::Default };
>     WebKit::WebsiteSimulatedMouseEventsDispatchPolicy m_simulatedMouseEventsDispatchPolicy { WebKit::WebsiteSimulatedMouseEventsDispatchPolicy::Default };
>     bool m_allowSiteSpecificQuirksToOverrideCompatibilityMode { false };
>+    WTF::String m_applicationNameForUserAgentWithModernCompatibility;
> };
> 
> } // namespace API
>diff --git a/Source/WebKit/UIProcess/API/Cocoa/WKWebpagePreferences.mm b/Source/WebKit/UIProcess/API/Cocoa/WKWebpagePreferences.mm
>index 3922f1c5e269110a7fc5a76499a65f2df1df22f4..6a36b1b5ad3e3819da66c75836aa3edc1ca2fbc5 100644
>--- a/Source/WebKit/UIProcess/API/Cocoa/WKWebpagePreferences.mm
>+++ b/Source/WebKit/UIProcess/API/Cocoa/WKWebpagePreferences.mm
>@@ -286,6 +286,16 @@ - (void)_setAllowSiteSpecificQuirksToOverrideCompatibilityMode:(BOOL)value
>     _websitePolicies->setAllowSiteSpecificQuirksToOverrideCompatibilityMode(value);
> }
> 
>+- (NSString *)_applicationNameForUserAgentWithModernCompatibility
>+{
>+    return _websitePolicies->applicationNameForUserAgentWithModernCompatibility();
>+}
>+
>+- (void)_setApplicationNameForUserAgentWithModernCompatibility:(NSString *)applicationName
>+{
>+    _websitePolicies->setApplicationNameForUserAgentWithModernCompatibility(applicationName);
>+}
>+
> - (API::Object&)_apiObject
> {
>     return *_websitePolicies;
>diff --git a/Source/WebKit/UIProcess/API/Cocoa/WKWebpagePreferencesPrivate.h b/Source/WebKit/UIProcess/API/Cocoa/WKWebpagePreferencesPrivate.h
>index 692f3296d7a9097c3dfd0b2fd87fde26b4454500..0bd0fac67c22fbbc29ab9a32cb8d89c85b8c6f3c 100644
>--- a/Source/WebKit/UIProcess/API/Cocoa/WKWebpagePreferencesPrivate.h
>+++ b/Source/WebKit/UIProcess/API/Cocoa/WKWebpagePreferencesPrivate.h
>@@ -69,4 +69,6 @@ typedef NS_OPTIONS(NSUInteger, _WKWebsiteDeviceOrientationAndMotionAccessPolicy)
> @property (nonatomic, setter=_setDeviceOrientationAndMotionAccessPolicy:) _WKWebsiteDeviceOrientationAndMotionAccessPolicy _deviceOrientationAndMotionAccessPolicy;
> @property (nonatomic, setter=_setAllowSiteSpecificQuirksToOverrideCompatibilityMode:) BOOL _allowSiteSpecificQuirksToOverrideCompatibilityMode;
> 
>+@property (nonatomic, copy, setter=_setApplicationNameForUserAgentWithModernCompatibility:) NSString *_applicationNameForUserAgentWithModernCompatibility;
>+
> @end

Actions: View | Formatted Diff | Diff

Attachments on bug 197782: 369558