<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[242375] trunk/Source/WebKit</title>
</head>
<body>

<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt;  }
#msg dl a { font-weight: bold}
#msg dl a:link    { color:#fc3; }
#msg dl a:active  { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff  {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://trac.webkit.org/projects/webkit/changeset/242375">242375</a></dd>
<dt>Author</dt> <dd>cdumez@apple.com</dd>
<dt>Date</dt> <dd>2019-03-04 12:36:32 -0800 (Mon, 04 Mar 2019)</dd>
</dl>

<h3>Log Message</h3>
<pre>Drop legacy userAgentForURL injected bundle SPI
https://bugs.webkit.org/show_bug.cgi?id=195222
<rdar://problem/46734147>

Reviewed by Darin Adler.

Drop legacy userAgentForURL injected bundle SPI. There are no longer any clients, and using
WebsitePolicies.customUserAgent is the way to go nowadays.

* WebProcess/InjectedBundle/API/APIInjectedBundlePageLoaderClient.h:
(API::InjectedBundle::PageLoaderClient::willDestroyFrame):
(API::InjectedBundle::PageLoaderClient::userAgentForURL const): Deleted.
* WebProcess/InjectedBundle/API/Cocoa/WKWebProcessPlugInLoadDelegate.h:
* WebProcess/InjectedBundle/API/c/WKBundlePageLoaderClient.h:
* WebProcess/InjectedBundle/API/mac/WKWebProcessPlugInBrowserContextController.mm:
(setUpPageLoaderClient):
(userAgentForURL): Deleted.
* WebProcess/InjectedBundle/InjectedBundlePageLoaderClient.cpp:
(WebKit::InjectedBundlePageLoaderClient::userAgentForURL const): Deleted.
* WebProcess/InjectedBundle/InjectedBundlePageLoaderClient.h:
* WebProcess/WebPage/WebPage.cpp:
(WebKit::WebPage::userAgent const):</pre>

<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebKitChangeLog">trunk/Source/WebKit/ChangeLog</a></li>
<li><a href="#trunkSourceWebKitWebProcessInjectedBundleAPIAPIInjectedBundlePageLoaderClienth">trunk/Source/WebKit/WebProcess/InjectedBundle/API/APIInjectedBundlePageLoaderClient.h</a></li>
<li><a href="#trunkSourceWebKitWebProcessInjectedBundleAPICocoaWKWebProcessPlugInLoadDelegateh">trunk/Source/WebKit/WebProcess/InjectedBundle/API/Cocoa/WKWebProcessPlugInLoadDelegate.h</a></li>
<li><a href="#trunkSourceWebKitWebProcessInjectedBundleAPIcWKBundlePageLoaderClienth">trunk/Source/WebKit/WebProcess/InjectedBundle/API/c/WKBundlePageLoaderClient.h</a></li>
<li><a href="#trunkSourceWebKitWebProcessInjectedBundleAPImacWKWebProcessPlugInBrowserContextControllermm">trunk/Source/WebKit/WebProcess/InjectedBundle/API/mac/WKWebProcessPlugInBrowserContextController.mm</a></li>
<li><a href="#trunkSourceWebKitWebProcessInjectedBundleInjectedBundlePageLoaderClientcpp">trunk/Source/WebKit/WebProcess/InjectedBundle/InjectedBundlePageLoaderClient.cpp</a></li>
<li><a href="#trunkSourceWebKitWebProcessInjectedBundleInjectedBundlePageLoaderClienth">trunk/Source/WebKit/WebProcess/InjectedBundle/InjectedBundlePageLoaderClient.h</a></li>
<li><a href="#trunkSourceWebKitWebProcessWebCoreSupportWebFrameLoaderClientcpp">trunk/Source/WebKit/WebProcess/WebCoreSupport/WebFrameLoaderClient.cpp</a></li>
<li><a href="#trunkSourceWebKitWebProcessWebPageWebPagecpp">trunk/Source/WebKit/WebProcess/WebPage/WebPage.cpp</a></li>
<li><a href="#trunkSourceWebKitWebProcessWebPageWebPageh">trunk/Source/WebKit/WebProcess/WebPage/WebPage.h</a></li>
</ul>

</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebKitChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/ChangeLog (242374 => 242375)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/ChangeLog    2019-03-04 20:35:54 UTC (rev 242374)
+++ trunk/Source/WebKit/ChangeLog       2019-03-04 20:36:32 UTC (rev 242375)
</span><span class="lines">@@ -1,5 +1,30 @@
</span><span class="cx"> 2019-03-04  Chris Dumez  <cdumez@apple.com>
</span><span class="cx"> 
</span><ins>+        Drop legacy userAgentForURL injected bundle SPI
+        https://bugs.webkit.org/show_bug.cgi?id=195222
+        <rdar://problem/46734147>
+
+        Reviewed by Darin Adler.
+
+        Drop legacy userAgentForURL injected bundle SPI. There are no longer any clients, and using
+        WebsitePolicies.customUserAgent is the way to go nowadays.
+
+        * WebProcess/InjectedBundle/API/APIInjectedBundlePageLoaderClient.h:
+        (API::InjectedBundle::PageLoaderClient::willDestroyFrame):
+        (API::InjectedBundle::PageLoaderClient::userAgentForURL const): Deleted.
+        * WebProcess/InjectedBundle/API/Cocoa/WKWebProcessPlugInLoadDelegate.h:
+        * WebProcess/InjectedBundle/API/c/WKBundlePageLoaderClient.h:
+        * WebProcess/InjectedBundle/API/mac/WKWebProcessPlugInBrowserContextController.mm:
+        (setUpPageLoaderClient):
+        (userAgentForURL): Deleted.
+        * WebProcess/InjectedBundle/InjectedBundlePageLoaderClient.cpp:
+        (WebKit::InjectedBundlePageLoaderClient::userAgentForURL const): Deleted.
+        * WebProcess/InjectedBundle/InjectedBundlePageLoaderClient.h:
+        * WebProcess/WebPage/WebPage.cpp:
+        (WebKit::WebPage::userAgent const):
+
+2019-03-04  Chris Dumez  <cdumez@apple.com>
+
</ins><span class="cx">         Do not share WebProcesses between private and regular sessions
</span><span class="cx">         https://bugs.webkit.org/show_bug.cgi?id=195189
</span><span class="cx">         <rdar://problem/48421064>
</span></span></pre></div>
<a id="trunkSourceWebKitWebProcessInjectedBundleAPIAPIInjectedBundlePageLoaderClienth"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/WebProcess/InjectedBundle/API/APIInjectedBundlePageLoaderClient.h (242374 => 242375)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/WebProcess/InjectedBundle/API/APIInjectedBundlePageLoaderClient.h    2019-03-04 20:35:54 UTC (rev 242374)
+++ trunk/Source/WebKit/WebProcess/InjectedBundle/API/APIInjectedBundlePageLoaderClient.h       2019-03-04 20:36:32 UTC (rev 242375)
</span><span class="lines">@@ -95,7 +95,6 @@
</span><span class="cx">     virtual void featuresUsedInPage(WebKit::WebPage&, const Vector<WTF::String>&) { }
</span><span class="cx"> 
</span><span class="cx">     virtual void willDestroyFrame(WebKit::WebPage&, WebKit::WebFrame&) { }
</span><del>-    virtual WTF::String userAgentForURL(WebKit::WebFrame&, const WTF::URL&) const { return WTF::String(); }
</del><span class="cx"> 
</span><span class="cx">     virtual OptionSet<WebCore::LayoutMilestone> layoutMilestones() const { return { }; }
</span><span class="cx"> };
</span></span></pre></div>
<a id="trunkSourceWebKitWebProcessInjectedBundleAPICocoaWKWebProcessPlugInLoadDelegateh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/WebProcess/InjectedBundle/API/Cocoa/WKWebProcessPlugInLoadDelegate.h (242374 => 242375)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/WebProcess/InjectedBundle/API/Cocoa/WKWebProcessPlugInLoadDelegate.h 2019-03-04 20:35:54 UTC (rev 242374)
+++ trunk/Source/WebKit/WebProcess/InjectedBundle/API/Cocoa/WKWebProcessPlugInLoadDelegate.h    2019-03-04 20:36:32 UTC (rev 242375)
</span><span class="lines">@@ -64,6 +64,4 @@
</span><span class="cx"> - (void)webProcessPlugInBrowserContextController:(WKWebProcessPlugInBrowserContextController *)controller frame:(WKWebProcessPlugInFrame *)frame didFinishLoadForResource:(uint64_t)resource;
</span><span class="cx"> - (void)webProcessPlugInBrowserContextController:(WKWebProcessPlugInBrowserContextController *)controller frame:(WKWebProcessPlugInFrame *)frame didFailLoadForResource:(uint64_t)resource error:(NSError *)error;
</span><span class="cx"> 
</span><del>-- (NSString *)webProcessPlugInBrowserContextController:(WKWebProcessPlugInBrowserContextController *)controller frame:(WKWebProcessPlugInFrame *)frame userAgentForURL:(NSURL *)url;
-
</del><span class="cx"> @end
</span></span></pre></div>
<a id="trunkSourceWebKitWebProcessInjectedBundleAPIcWKBundlePageLoaderClienth"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/WebProcess/InjectedBundle/API/c/WKBundlePageLoaderClient.h (242374 => 242375)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/WebProcess/InjectedBundle/API/c/WKBundlePageLoaderClient.h   2019-03-04 20:35:54 UTC (rev 242374)
+++ trunk/Source/WebKit/WebProcess/InjectedBundle/API/c/WKBundlePageLoaderClient.h      2019-03-04 20:36:32 UTC (rev 242375)
</span><span class="lines">@@ -62,7 +62,6 @@
</span><span class="cx"> typedef void (*WKBundlePageFeaturesUsedInPageCallback)(WKBundlePageRef page, WKArrayRef featureStrings, const void *clientInfo);
</span><span class="cx"> typedef void (*WKBundlePageWillLoadURLRequestCallback)(WKBundlePageRef page, WKURLRequestRef request, WKTypeRef userData, const void *clientInfo);
</span><span class="cx"> typedef void (*WKBundlePageWillLoadDataRequestCallback)(WKBundlePageRef page, WKURLRequestRef request, WKDataRef data, WKStringRef MIMEType, WKStringRef encodingName, WKURLRef unreachableURL, WKTypeRef userData, const void *clientInfo);
</span><del>-typedef WKStringRef (*WKBundlePageUserAgentForURLCallback)(WKBundleFrameRef frame, WKURLRef url, const void *clientInfo);
</del><span class="cx"> typedef WKLayoutMilestones (*WKBundlePageLayoutMilestonesCallback)(const void* clientInfo);
</span><span class="cx"> 
</span><span class="cx"> typedef struct WKBundlePageLoaderClientBase {
</span><span class="lines">@@ -463,7 +462,7 @@
</span><span class="cx">     void *                                                                  willDestroyFrame_unavailable;
</span><span class="cx">     
</span><span class="cx">     // Version 8
</span><del>-    WKBundlePageUserAgentForURLCallback                                     userAgentForURL;
</del><ins>+    void*                                                                   userAgentForURL_unavailable;
</ins><span class="cx"> } WKBundlePageLoaderClientV8;
</span><span class="cx"> 
</span><span class="cx"> typedef struct WKBundlePageLoaderClientV9 {
</span><span class="lines">@@ -521,7 +520,7 @@
</span><span class="cx">     void *                                                                  willDestroyFrame_unavailable;
</span><span class="cx"> 
</span><span class="cx">     // Version 8
</span><del>-    WKBundlePageUserAgentForURLCallback                                     userAgentForURL;
</del><ins>+    void*                                                                   userAgentForURL_unavailable;
</ins><span class="cx"> 
</span><span class="cx">     // Version 9
</span><span class="cx">     WKBundlePageWillInjectUserScriptForFrameCallback                        willInjectUserScriptForFrame;
</span><span class="lines">@@ -582,7 +581,7 @@
</span><span class="cx">     void *                                                                  willDestroyFrame_unavailable;
</span><span class="cx"> 
</span><span class="cx">     // Version 8
</span><del>-    WKBundlePageUserAgentForURLCallback                                     userAgentForURL;
</del><ins>+    void*                                                                   userAgentForURL_unavailable;
</ins><span class="cx"> 
</span><span class="cx">     // Version 9
</span><span class="cx">     WKBundlePageWillInjectUserScriptForFrameCallback                        willInjectUserScriptForFrame;
</span></span></pre></div>
<a id="trunkSourceWebKitWebProcessInjectedBundleAPImacWKWebProcessPlugInBrowserContextControllermm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/WebProcess/InjectedBundle/API/mac/WKWebProcessPlugInBrowserContextController.mm (242374 => 242375)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/WebProcess/InjectedBundle/API/mac/WKWebProcessPlugInBrowserContextController.mm      2019-03-04 20:35:54 UTC (rev 242374)
+++ trunk/Source/WebKit/WebProcess/InjectedBundle/API/mac/WKWebProcessPlugInBrowserContextController.mm 2019-03-04 20:36:32 UTC (rev 242375)
</span><span class="lines">@@ -220,23 +220,6 @@
</span><span class="cx">         [loadDelegate webProcessPlugInBrowserContextController:pluginContextController didHandleOnloadEventsForFrame:wrapper(*WebKit::toImpl(frame))];
</span><span class="cx"> }
</span><span class="cx"> 
</span><del>-static WKStringRef userAgentForURL(WKBundleFrameRef frame, WKURLRef url, const void* clientInfo)
-{
-    auto pluginContextController = (__bridge WKWebProcessPlugInBrowserContextController *)clientInfo;
-    auto loadDelegate = pluginContextController->_loadDelegate.get();
-    
-    if ([loadDelegate respondsToSelector:@selector(webProcessPlugInBrowserContextController:frame:userAgentForURL:)]) {
-        WKWebProcessPlugInFrame *newFrame = wrapper(*WebKit::toImpl(frame));
-        NSString *string = [loadDelegate webProcessPlugInBrowserContextController:pluginContextController frame:newFrame userAgentForURL:wrapper(*WebKit::toImpl(url))];
-        if (!string)
-            return nullptr;
-
-        return WKStringCreateWithCFString((__bridge CFStringRef)string);
-    }
-    
-    return nullptr;
-}
-
</del><span class="cx"> static void setUpPageLoaderClient(WKWebProcessPlugInBrowserContextController *contextController, WebKit::WebPage& page)
</span><span class="cx"> {
</span><span class="cx">     WKBundlePageLoaderClientV10 client;
</span><span class="lines">@@ -256,7 +239,6 @@
</span><span class="cx">     client.didRemoveFrameFromHierarchy = didRemoveFrameFromHierarchy;
</span><span class="cx">     client.didHandleOnloadEventsForFrame = didHandleOnloadEventsForFrame;
</span><span class="cx">     client.didFirstVisuallyNonEmptyLayoutForFrame = didFirstVisuallyNonEmptyLayoutForFrame;
</span><del>-    client.userAgentForURL = userAgentForURL;
</del><span class="cx"> 
</span><span class="cx">     client.didLayoutForFrame = didLayoutForFrame;
</span><span class="cx">     client.didLayout = didReachLayoutMilestone;
</span></span></pre></div>
<a id="trunkSourceWebKitWebProcessInjectedBundleInjectedBundlePageLoaderClientcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/WebProcess/InjectedBundle/InjectedBundlePageLoaderClient.cpp (242374 => 242375)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/WebProcess/InjectedBundle/InjectedBundlePageLoaderClient.cpp 2019-03-04 20:35:54 UTC (rev 242374)
+++ trunk/Source/WebKit/WebProcess/InjectedBundle/InjectedBundlePageLoaderClient.cpp    2019-03-04 20:36:32 UTC (rev 242375)
</span><span class="lines">@@ -353,16 +353,6 @@
</span><span class="cx">     return m_client.featuresUsedInPage(toAPI(&page), toAPI(API::Array::createStringArray(features).ptr()), m_client.base.clientInfo);
</span><span class="cx"> }
</span><span class="cx"> 
</span><del>-String InjectedBundlePageLoaderClient::userAgentForURL(WebFrame& frame, const URL& url) const
-{
-    if (!m_client.userAgentForURL)
-        return String();
-    WKStringRef userAgent = m_client.userAgentForURL(toAPI(&frame), toAPI(API::URL::create(url).ptr()), m_client.base.clientInfo);
-    if (!userAgent)
-        return String();
-    return toImpl(userAgent)->string();
-}
-
</del><span class="cx"> OptionSet<WebCore::LayoutMilestone> InjectedBundlePageLoaderClient::layoutMilestones() const
</span><span class="cx"> {
</span><span class="cx">     if (m_client.layoutMilestones) {
</span></span></pre></div>
<a id="trunkSourceWebKitWebProcessInjectedBundleInjectedBundlePageLoaderClienth"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/WebProcess/InjectedBundle/InjectedBundlePageLoaderClient.h (242374 => 242375)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/WebProcess/InjectedBundle/InjectedBundlePageLoaderClient.h   2019-03-04 20:35:54 UTC (rev 242374)
+++ trunk/Source/WebKit/WebProcess/InjectedBundle/InjectedBundlePageLoaderClient.h      2019-03-04 20:36:32 UTC (rev 242375)
</span><span class="lines">@@ -85,8 +85,6 @@
</span><span class="cx"> 
</span><span class="cx">     void featuresUsedInPage(WebPage&, const Vector<WTF::String>&) override;
</span><span class="cx"> 
</span><del>-    WTF::String userAgentForURL(WebFrame&, const URL&) const override;
-
</del><span class="cx">     OptionSet<WebCore::LayoutMilestone> layoutMilestones() const override;
</span><span class="cx"> };
</span><span class="cx"> 
</span></span></pre></div>
<a id="trunkSourceWebKitWebProcessWebCoreSupportWebFrameLoaderClientcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/WebProcess/WebCoreSupport/WebFrameLoaderClient.cpp (242374 => 242375)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/WebProcess/WebCoreSupport/WebFrameLoaderClient.cpp   2019-03-04 20:35:54 UTC (rev 242374)
+++ trunk/Source/WebKit/WebProcess/WebCoreSupport/WebFrameLoaderClient.cpp      2019-03-04 20:36:32 UTC (rev 242375)
</span><span class="lines">@@ -1370,11 +1370,11 @@
</span><span class="cx"> 
</span><span class="cx"> String WebFrameLoaderClient::userAgent(const URL& url)
</span><span class="cx"> {
</span><del>-    WebPage* webPage = m_frame->page();
</del><ins>+    auto* webPage = m_frame->page();
</ins><span class="cx">     if (!webPage)
</span><span class="cx">         return String();
</span><span class="cx"> 
</span><del>-    return webPage->userAgent(m_frame, url);
</del><ins>+    return webPage->userAgent(url);
</ins><span class="cx"> }
</span><span class="cx"> 
</span><span class="cx"> String WebFrameLoaderClient::overrideContentSecurityPolicy() const
</span></span></pre></div>
<a id="trunkSourceWebKitWebProcessWebPageWebPagecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/WebProcess/WebPage/WebPage.cpp (242374 => 242375)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/WebProcess/WebPage/WebPage.cpp       2019-03-04 20:35:54 UTC (rev 242374)
+++ trunk/Source/WebKit/WebProcess/WebPage/WebPage.cpp  2019-03-04 20:36:32 UTC (rev 242375)
</span><span class="lines">@@ -3164,23 +3164,12 @@
</span><span class="cx"> 
</span><span class="cx"> String WebPage::userAgent(const URL& webCoreURL) const
</span><span class="cx"> {
</span><del>-    return userAgent(nullptr, webCoreURL);
-}
-
-String WebPage::userAgent(WebFrame* frame, const URL& webcoreURL) const
-{
-    if (frame) {
-        String userAgent = m_loaderClient->userAgentForURL(*frame, webcoreURL);
-        if (!userAgent.isEmpty())
-            return userAgent;
-    }
-
-    String userAgent = platformUserAgent(webcoreURL);
</del><ins>+    String userAgent = platformUserAgent(webCoreURL);
</ins><span class="cx">     if (!userAgent.isEmpty())
</span><span class="cx">         return userAgent;
</span><span class="cx">     return m_userAgent;
</span><span class="cx"> }
</span><del>-    
</del><ins>+
</ins><span class="cx"> void WebPage::setUserAgent(const String& userAgent)
</span><span class="cx"> {
</span><span class="cx">     if (m_userAgent == userAgent)
</span></span></pre></div>
<a id="trunkSourceWebKitWebProcessWebPageWebPageh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/WebProcess/WebPage/WebPage.h (242374 => 242375)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/WebProcess/WebPage/WebPage.h 2019-03-04 20:35:54 UTC (rev 242374)
+++ trunk/Source/WebKit/WebProcess/WebPage/WebPage.h    2019-03-04 20:36:32 UTC (rev 242375)
</span><span class="lines">@@ -347,7 +347,6 @@
</span><span class="cx">     void didFinishLoad(WebFrame*);
</span><span class="cx">     void show();
</span><span class="cx">     String userAgent(const URL&) const;
</span><del>-    String userAgent(WebFrame*, const URL&) const;
</del><span class="cx">     String platformUserAgent(const URL&) const;
</span><span class="cx">     WebCore::KeyboardUIMode keyboardUIMode();
</span><span class="cx"> 
</span></span></pre>
</div>
</div>

</body>
</html>