Changeset 229100 in webkit


Ignore:
Timestamp:
Feb 28, 2018, 11:53:58 AM (7 years ago)
Author:
commit-queue@webkit.org
Message:

Reduce use of NetworkingContext in WebKit
​https://bugs.webkit.org/show_bug.cgi?id=183213

Patch by Alex Christensen <​achristensen@webkit.org> on 2018-02-28
Reviewed by Brady Eidson.

Source/WebCore:

NetworkingContext is intended to be used only with ResourceHandle, which is now only used in WebKitLegacy.
Now that we don't use ResourceHandle in the WebProcess, everything that was done through the NetworkingContext
can now be done a cleaner way with no change in behavior.

  • loader/FrameLoader.cpp:

(WebCore::FrameLoader::loadResourceSynchronously):

  • loader/LinkLoader.cpp:

(WebCore::LinkLoader::loadLink):

  • loader/LoaderStrategy.h:
  • platform/network/ProxyServer.h:
  • platform/network/cf/ProxyServerCFNet.cpp:

(WebCore::proxyServersForURL):

  • platform/network/curl/ProxyServerCurl.cpp:

(WebCore::proxyServersForURL):

  • platform/network/soup/ProxyServerSoup.cpp:

(WebCore::proxyServersForURL):

Source/WebKit:

  • NetworkProcess/RemoteNetworkingContext.h:
  • WebProcess/Network/WebLoaderStrategy.cpp:

(WebKit::WebLoaderStrategy::loadResourceSynchronously):
(WebKit::WebLoaderStrategy::preconnectTo):

  • WebProcess/Network/WebLoaderStrategy.h:
  • WebProcess/Plugins/PluginView.cpp:

(WebKit::PluginView::proxiesForURL):

  • WebProcess/WebCoreSupport/WebPlatformStrategies.cpp:
  • WebProcess/WebPage/WebFrame.cpp:

Source/WebKitLegacy:

  • WebCoreSupport/WebResourceLoadScheduler.cpp:

(WebResourceLoadScheduler::loadResourceSynchronously):
(WebResourceLoadScheduler::preconnectTo):

  • WebCoreSupport/WebResourceLoadScheduler.h:

Source/WebKitLegacy/mac:

  • Plugins/Hosted/NetscapePluginInstanceProxy.mm:

(WebKit::NetscapePluginInstanceProxy::getProxy):

  • Plugins/WebNetscapePluginView.mm:

(-[WebNetscapePluginView getVariable:forURL:value:length:]):

Source/WebKitLegacy/win:

  • Plugins/PluginView.cpp:

(WebCore::PluginView::getValueForURL):

Location:
trunk/Source
Files:
24 edited

Legend:

Unmodified
Added
Removed

  • trunk/Source/WebCore/ChangeLog

    r229091 r229100  
     12018-02-28  Alex Christensen  <achristensen@webkit.org>
     2
     3        Reduce use of NetworkingContext in WebKit
     4        https://bugs.webkit.org/show_bug.cgi?id=183213
     5
     6        Reviewed by Brady Eidson.
     7
     8        NetworkingContext is intended to be used only with ResourceHandle, which is now only used in WebKitLegacy.
     9        Now that we don't use ResourceHandle in the WebProcess, everything that was done through the NetworkingContext
     10        can now be done a cleaner way with no change in behavior.
     11
     12        * loader/FrameLoader.cpp:
     13        (WebCore::FrameLoader::loadResourceSynchronously):
     14        * loader/LinkLoader.cpp:
     15        (WebCore::LinkLoader::loadLink):
     16        * loader/LoaderStrategy.h:
     17        * platform/network/ProxyServer.h:
     18        * platform/network/cf/ProxyServerCFNet.cpp:
     19        (WebCore::proxyServersForURL):
     20        * platform/network/curl/ProxyServerCurl.cpp:
     21        (WebCore::proxyServersForURL):
     22        * platform/network/soup/ProxyServerSoup.cpp:
     23        (WebCore::proxyServersForURL):
     24
    1252018-02-28  Zalan Bujtas  <zalan@apple.com>
    226

  • trunk/Source/WebCore/loader/FrameLoader.cpp

    r229071 r229100  
    28432843        if (!documentLoader()->applicationCacheHost().maybeLoadSynchronously(newRequest, error, response, data)) {
    28442844            Vector<char> buffer;
    2845             platformStrategies()->loaderStrategy()->loadResourceSynchronously(networkingContext(), identifier, newRequest, storedCredentialsPolicy, clientCredentialPolicy, error, response, buffer);
     2845            platformStrategies()->loaderStrategy()->loadResourceSynchronously(*this, identifier, newRequest, storedCredentialsPolicy, clientCredentialPolicy, error, response, buffer);
    28462846            data = SharedBuffer::create(WTFMove(buffer));
    28472847            documentLoader()->applicationCacheHost().maybeLoadFallbackSynchronously(newRequest, error, response, data);

  • trunk/Source/WebCore/loader/LinkLoader.cpp

    r228528 r229100  
    269269            storageCredentialsPolicy = StoredCredentialsPolicy::DoNotUse;
    270270        ASSERT(document.frame()->loader().networkingContext());
    271         platformStrategies()->loaderStrategy()->preconnectTo(*document.frame()->loader().networkingContext(), href, storageCredentialsPolicy, [weakDocument = document.createWeakPtr(), href](ResourceError error) {
     271        platformStrategies()->loaderStrategy()->preconnectTo(document.frame()->loader(), href, storageCredentialsPolicy, [weakDocument = document.createWeakPtr(), href](ResourceError error) {
    272272            if (!weakDocument)
    273273                return;

  • trunk/Source/WebCore/loader/LoaderStrategy.h

    r224522 r229100  
    3838class ContentSecurityPolicy;
    3939class Frame;
     40class FrameLoader;
    4041class HTTPHeaderMap;
    4142class NetscapePlugInStreamLoader;
    4243class NetscapePlugInStreamLoaderClient;
    43 class NetworkingContext;
    4444class ResourceError;
    4545class ResourceLoader;
    … …  
    5656public:
    5757    virtual void loadResource(Frame&, CachedResource&, ResourceRequest&&, const ResourceLoaderOptions&, CompletionHandler<void(RefPtr<SubresourceLoader>&&)>&&) = 0;
    58     virtual void loadResourceSynchronously(NetworkingContext*, unsigned long identifier, const ResourceRequest&, StoredCredentialsPolicy, ClientCredentialPolicy, ResourceError&, ResourceResponse&, Vector<char>& data) = 0;
     58    virtual void loadResourceSynchronously(FrameLoader&, unsigned long identifier, const ResourceRequest&, StoredCredentialsPolicy, ClientCredentialPolicy, ResourceError&, ResourceResponse&, Vector<char>& data) = 0;
    5959
    6060    virtual void remove(ResourceLoader*) = 0;
    … …  
    7070
    7171    using PreconnectCompletionHandler = WTF::Function<void(const ResourceError&)>;
    72     virtual void preconnectTo(NetworkingContext&, const URL&, StoredCredentialsPolicy, PreconnectCompletionHandler&&) = 0;
     72    virtual void preconnectTo(FrameLoader&, const URL&, StoredCredentialsPolicy, PreconnectCompletionHandler&&) = 0;
    7373
    7474    virtual void storeDerivedDataToCache(const SHA1::Digest& bodyKey, const String& type, const String& partition, WebCore::SharedBuffer&) = 0;

  • trunk/Source/WebCore/platform/network/ProxyServer.h

    r173176 r229100  
    6969
    7070// Return a vector of proxy servers for the given URL.
    71 WEBCORE_EXPORT Vector<ProxyServer> proxyServersForURL(const URL&, const NetworkingContext*);
     71WEBCORE_EXPORT Vector<ProxyServer> proxyServersForURL(const URL&);
    7272
    7373// Converts the given vector of proxy servers to a PAC string, as described in

  • trunk/Source/WebCore/platform/network/cf/ProxyServerCFNet.cpp

    r161589 r229100  
    134134}
    135135
    136 Vector<ProxyServer> proxyServersForURL(const URL& url, const NetworkingContext*)
     136Vector<ProxyServer> proxyServersForURL(const URL& url)
    137137{
    138138    Vector<ProxyServer> proxyServers;

  • trunk/Source/WebCore/platform/network/curl/ProxyServerCurl.cpp

    r165996 r229100  
    3333namespace WebCore {
    3434
    35 Vector<ProxyServer> proxyServersForURL(const URL&, const NetworkingContext*)
     35Vector<ProxyServer> proxyServersForURL(const URL&)
    3636{
    3737    // FIXME: Implement.

  • trunk/Source/WebCore/platform/network/soup/ProxyServerSoup.cpp

    r165996 r229100  
    3333namespace WebCore {
    3434
    35 Vector<ProxyServer> proxyServersForURL(const URL&, const NetworkingContext*)
     35Vector<ProxyServer> proxyServersForURL(const URL&)
    3636{
    3737    // FIXME: Implement.

  • trunk/Source/WebKit/ChangeLog

    r229093 r229100  
     12018-02-28  Alex Christensen  <achristensen@webkit.org>
     2
     3        Reduce use of NetworkingContext in WebKit
     4        https://bugs.webkit.org/show_bug.cgi?id=183213
     5
     6        Reviewed by Brady Eidson.
     7
     8        * NetworkProcess/RemoteNetworkingContext.h:
     9        * WebProcess/Network/WebLoaderStrategy.cpp:
     10        (WebKit::WebLoaderStrategy::loadResourceSynchronously):
     11        (WebKit::WebLoaderStrategy::preconnectTo):
     12        * WebProcess/Network/WebLoaderStrategy.h:
     13        * WebProcess/Plugins/PluginView.cpp:
     14        (WebKit::PluginView::proxiesForURL):
     15        * WebProcess/WebCoreSupport/WebPlatformStrategies.cpp:
     16        * WebProcess/WebPage/WebFrame.cpp:
     17
    1182018-02-28  Brent Fulgham  <bfulgham@apple.com>
    219

  • trunk/Source/WebKit/NetworkProcess/RemoteNetworkingContext.h

    r227682 r229100  
    2727#pragma once
    2828
    29 #include <WebCore/NetworkingContext.h>
    3029#include <pal/SessionID.h>
    3130

  • trunk/Source/WebKit/WebProcess/Network/WebLoaderStrategy.cpp

    r227566 r229100  
    3939#include "WebFrame.h"
    4040#include "WebFrameLoaderClient.h"
    41 #include "WebFrameNetworkingContext.h"
    4241#include "WebPage.h"
    4342#include "WebPageProxyMessages.h"
    … …  
    406405}
    407406
    408 void WebLoaderStrategy::loadResourceSynchronously(NetworkingContext* context, unsigned long resourceLoadIdentifier, const ResourceRequest& request, StoredCredentialsPolicy storedCredentialsPolicy, ClientCredentialPolicy clientCredentialPolicy, ResourceError& error, ResourceResponse& response, Vector<char>& data)
    409 {
    410     WebFrameNetworkingContext* webContext = static_cast<WebFrameNetworkingContext*>(context);
    411     // FIXME: Some entities in WebCore use WebCore's "EmptyFrameLoaderClient" instead of having a proper WebFrameLoaderClient.
    412     // EmptyFrameLoaderClient shouldn't exist and everything should be using a WebFrameLoaderClient,
    413     // but in the meantime we have to make sure not to mis-cast.
    414     WebFrameLoaderClient* webFrameLoaderClient = webContext->webFrameLoaderClient();
    415     WebFrame* webFrame = webFrameLoaderClient ? webFrameLoaderClient->webFrame() : 0;
    416     WebPage* webPage = webFrame ? webFrame->page() : 0;
     407static bool shouldClearReferrerOnHTTPSToHTTPRedirect(Frame* frame)
     408{
     409    if (frame) {
     410        if (auto* document = frame->document())
     411            return document->referrerPolicy() == ReferrerPolicy::NoReferrerWhenDowngrade;
     412    }
     413    return true;
     414}
     415
     416void WebLoaderStrategy::loadResourceSynchronously(FrameLoader& frameLoader, unsigned long resourceLoadIdentifier, const ResourceRequest& request, StoredCredentialsPolicy storedCredentialsPolicy, ClientCredentialPolicy clientCredentialPolicy, ResourceError& error, ResourceResponse& response, Vector<char>& data)
     417{
     418    WebFrameLoaderClient* webFrameLoaderClient = toWebFrameLoaderClient(frameLoader.client());
     419    WebFrame* webFrame = webFrameLoaderClient ? webFrameLoaderClient->webFrame() : nullptr;
     420    WebPage* webPage = webFrame ? webFrame->page() : nullptr;
    417421
    418422    NetworkResourceLoadParameters loadParameters;
    … …  
    426430    loadParameters.storedCredentialsPolicy = storedCredentialsPolicy;
    427431    loadParameters.clientCredentialPolicy = clientCredentialPolicy;
    428     loadParameters.shouldClearReferrerOnHTTPSToHTTPRedirect = context->shouldClearReferrerOnHTTPSToHTTPRedirect();
     432    loadParameters.shouldClearReferrerOnHTTPSToHTTPRedirect = shouldClearReferrerOnHTTPSToHTTPRedirect(webFrame ? webFrame->coreFrame() : nullptr);
    429433
    430434    data.shrink(0);
    … …  
    449453void WebLoaderStrategy::startPingLoad(Frame& frame, ResourceRequest& request, const HTTPHeaderMap& originalRequestHeaders, const FetchOptions& options, PingLoadCompletionHandler&& completionHandler)
    450454{
    451     // It's possible that call to createPingHandle might be made during initial empty Document creation before a NetworkingContext exists.
    452     // It is not clear that we should send ping loads during that process anyways.
    453     auto* networkingContext = frame.loader().networkingContext();
    454     if (!networkingContext) {
    455         if (completionHandler)
    456             completionHandler(internalError(request.url()), { });
    457         return;
    458     }
    459 
    460     WebFrameNetworkingContext* webContext = static_cast<WebFrameNetworkingContext*>(networkingContext);
    461     WebFrameLoaderClient* webFrameLoaderClient = webContext->webFrameLoaderClient();
    462 
    463455    auto* document = frame.document();
    464456    if (!document) {
    … …  
    467459        return;
    468460    }
    469    
     461
    470462    NetworkResourceLoadParameters loadParameters;
    471463    loadParameters.identifier = generateLoadIdentifier();
    472464    loadParameters.request = request;
    473465    loadParameters.sourceOrigin = &document->securityOrigin();
    474     loadParameters.sessionID = webFrameLoaderClient ? webFrameLoaderClient->sessionID() : PAL::SessionID::defaultSessionID();
     466    loadParameters.sessionID = frame.page() ? frame.page()->sessionID() : PAL::SessionID::defaultSessionID();
    475467    loadParameters.storedCredentialsPolicy = options.credentials == FetchOptions::Credentials::Omit ? StoredCredentialsPolicy::DoNotUse : StoredCredentialsPolicy::Use;
    476468    loadParameters.mode = options.mode;
    477469    loadParameters.shouldFollowRedirects = options.redirect == FetchOptions::Redirect::Follow;
    478     loadParameters.shouldClearReferrerOnHTTPSToHTTPRedirect = networkingContext->shouldClearReferrerOnHTTPSToHTTPRedirect();
     470    loadParameters.shouldClearReferrerOnHTTPSToHTTPRedirect = shouldClearReferrerOnHTTPSToHTTPRedirect(&frame);
    479471    if (!document->shouldBypassMainWorldContentSecurityPolicy()) {
    480472        if (auto * contentSecurityPolicy = document->contentSecurityPolicy())
    … …  
    506498}
    507499
    508 void WebLoaderStrategy::preconnectTo(NetworkingContext& context, const WebCore::URL& url, StoredCredentialsPolicy storedCredentialsPolicy, PreconnectCompletionHandler&& completionHandler)
     500void WebLoaderStrategy::preconnectTo(FrameLoader& frameLoader, const WebCore::URL& url, StoredCredentialsPolicy storedCredentialsPolicy, PreconnectCompletionHandler&& completionHandler)
    509501{
    510502    uint64_t preconnectionIdentifier = generateLoadIdentifier();
    … …  
    512504    ASSERT_UNUSED(addResult, addResult.isNewEntry);
    513505
    514     auto& webContext = static_cast<WebFrameNetworkingContext&>(context);
    515     auto* webFrameLoaderClient = webContext.webFrameLoaderClient();
     506    auto* webFrameLoaderClient = toWebFrameLoaderClient(frameLoader.client());
    516507    if (!webFrameLoaderClient) {
    517508        completionHandler(internalError(url));

  • trunk/Source/WebKit/WebProcess/Network/WebLoaderStrategy.h

    r227153 r229100  
    4949   
    5050    void loadResource(WebCore::Frame&, WebCore::CachedResource&, WebCore::ResourceRequest&&, const WebCore::ResourceLoaderOptions&, CompletionHandler<void(RefPtr<WebCore::SubresourceLoader>&&)>&&) final;
    51     void loadResourceSynchronously(WebCore::NetworkingContext*, unsigned long resourceLoadIdentifier, const WebCore::ResourceRequest&, WebCore::StoredCredentialsPolicy, WebCore::ClientCredentialPolicy, WebCore::ResourceError&, WebCore::ResourceResponse&, Vector<char>& data) final;
     51    void loadResourceSynchronously(WebCore::FrameLoader&, unsigned long resourceLoadIdentifier, const WebCore::ResourceRequest&, WebCore::StoredCredentialsPolicy, WebCore::ClientCredentialPolicy, WebCore::ResourceError&, WebCore::ResourceResponse&, Vector<char>& data) final;
    5252
    5353    void remove(WebCore::ResourceLoader*) final;
    … …  
    6363    void didFinishPingLoad(uint64_t pingLoadIdentifier, WebCore::ResourceError&&, WebCore::ResourceResponse&&);
    6464
    65     void preconnectTo(WebCore::NetworkingContext&, const WebCore::URL&, WebCore::StoredCredentialsPolicy, PreconnectCompletionHandler&&) final;
     65    void preconnectTo(WebCore::FrameLoader&, const WebCore::URL&, WebCore::StoredCredentialsPolicy, PreconnectCompletionHandler&&) final;
    6666    void didFinishPreconnection(uint64_t preconnectionIdentifier, WebCore::ResourceError&&);
    6767

  • trunk/Source/WebKit/WebProcess/Plugins/PluginView.cpp

    r228260 r229100  
    5858#include <WebCore/MouseEvent.h>
    5959#include <WebCore/NetscapePlugInStreamLoader.h>
    60 #include <WebCore/NetworkingContext.h>
    6160#include <WebCore/Page.h>
    6261#include <WebCore/PlatformMouseEvent.h>
    … …  
    15731572String PluginView::proxiesForURL(const String& urlString)
    15741573{
    1575     const FrameLoader* frameLoader = frame() ? &frame()->loader() : 0;
    1576     const NetworkingContext* context = frameLoader ? frameLoader->networkingContext() : 0;
    1577     Vector<ProxyServer> proxyServers = proxyServersForURL(URL(URL(), urlString), context);
     1574    Vector<ProxyServer> proxyServers = proxyServersForURL(URL(URL(), urlString));
    15781575    return toString(proxyServers);
    15791576}

  • trunk/Source/WebKit/WebProcess/WebCoreSupport/WebPlatformStrategies.cpp

    r227566 r229100  
    5353#include <WebCore/MainFrame.h>
    5454#include <WebCore/NetworkStorageSession.h>
    55 #include <WebCore/NetworkingContext.h>
    5655#include <WebCore/Page.h>
    5756#include <WebCore/PageGroup.h>

  • trunk/Source/WebKit/WebProcess/WebPage/WebFrame.cpp

    r225954 r229100  
    7373#include <WebCore/JSRange.h>
    7474#include <WebCore/MainFrame.h>
    75 #include <WebCore/NetworkingContext.h>
    7675#include <WebCore/NodeTraversal.h>
    7776#include <WebCore/Page.h>

  • trunk/Source/WebKit/WebProcess/WebPage/mac/WebPageMac.mm

    r228260 r229100  
    7474#import <WebCore/MainFrame.h>
    7575#import <WebCore/NetworkStorageSession.h>
    76 #import <WebCore/NetworkingContext.h>
    7776#import <WebCore/NodeRenderStyle.h>
    7877#import <WebCore/Page.h>
    … …  
    684683    [request setValue:(NSString*)userAgent(url) forHTTPHeaderField:@"User-Agent"];
    685684    NSCachedURLResponse *cachedResponse;
    686     if (CFURLStorageSessionRef storageSession = corePage()->mainFrame().loader().networkingContext()->storageSession().platformSession())
    687         cachedResponse = cachedResponseForRequest(storageSession, request);
     685    auto* storageSession = NetworkStorageSession::storageSession(corePage()->sessionID());
     686    if (CFURLStorageSessionRef platformSession = storageSession ? storageSession->platformSession() : nullptr)
     687        cachedResponse = cachedResponseForRequest(platformSession, request);
    688688    else
    689689        cachedResponse = [[NSURLCache sharedURLCache] cachedResponseForRequest:request];
    … …  
    698698    [request setValue:(NSString *)webPage->userAgent(url) forHTTPHeaderField:@"User-Agent"];
    699699
    700     if (CFURLStorageSessionRef storageSession = webPage->corePage()->mainFrame().loader().networkingContext()->storageSession().platformSession())
    701         return cachedResponseForRequest(storageSession, request.get());
     700    auto* storageSession = NetworkStorageSession::storageSession(webPage->corePage()->sessionID());
     701    if (CFURLStorageSessionRef platformSession = storageSession ? storageSession->platformSession() : nullptr)
     702        return cachedResponseForRequest(platformSession, request.get());
    702703
    703704    return [[NSURLCache sharedURLCache] cachedResponseForRequest:request.get()];

  • trunk/Source/WebKitLegacy/ChangeLog

    r229048 r229100  
     12018-02-28  Alex Christensen  <achristensen@webkit.org>
     2
     3        Reduce use of NetworkingContext in WebKit
     4        https://bugs.webkit.org/show_bug.cgi?id=183213
     5
     6        Reviewed by Brady Eidson.
     7
     8        * WebCoreSupport/WebResourceLoadScheduler.cpp:
     9        (WebResourceLoadScheduler::loadResourceSynchronously):
     10        (WebResourceLoadScheduler::preconnectTo):
     11        * WebCoreSupport/WebResourceLoadScheduler.h:
     12
    1132018-02-26  Don Olmstead  <don.olmstead@sony.com>
    214

  • trunk/Source/WebKitLegacy/WebCoreSupport/WebResourceLoadScheduler.cpp

    r227455 r229100  
    106106}
    107107
    108 void WebResourceLoadScheduler::loadResourceSynchronously(NetworkingContext* context, unsigned long, const ResourceRequest& request, StoredCredentialsPolicy storedCredentialsPolicy, ClientCredentialPolicy, ResourceError& error, ResourceResponse& response, Vector<char>& data)
    109 {
    110     ResourceHandle::loadResourceSynchronously(context, request, storedCredentialsPolicy, error, response, data);
     108void WebResourceLoadScheduler::loadResourceSynchronously(FrameLoader& frameLoader, unsigned long, const ResourceRequest& request, StoredCredentialsPolicy storedCredentialsPolicy, ClientCredentialPolicy, ResourceError& error, ResourceResponse& response, Vector<char>& data)
     109{
     110    ResourceHandle::loadResourceSynchronously(frameLoader.networkingContext(), request, storedCredentialsPolicy, error, response, data);
    111111}
    112112
    … …  
    368368}
    369369
    370 void WebResourceLoadScheduler::preconnectTo(NetworkingContext&, const URL&, StoredCredentialsPolicy, PreconnectCompletionHandler&&)
    371 {
    372 }
    373 
     370void WebResourceLoadScheduler::preconnectTo(FrameLoader&, const URL&, StoredCredentialsPolicy, PreconnectCompletionHandler&&)
     371{
     372}
     373

  • trunk/Source/WebKitLegacy/WebCoreSupport/WebResourceLoadScheduler.h

    r224522 r229100  
    5151
    5252    void loadResource(WebCore::Frame&, WebCore::CachedResource&, WebCore::ResourceRequest&&, const WebCore::ResourceLoaderOptions&, CompletionHandler<void(RefPtr<WebCore::SubresourceLoader>&&)>&&) final;
    53     void loadResourceSynchronously(WebCore::NetworkingContext*, unsigned long, const WebCore::ResourceRequest&, WebCore::StoredCredentialsPolicy, WebCore::ClientCredentialPolicy, WebCore::ResourceError&, WebCore::ResourceResponse&, Vector<char>&) final;
     53    void loadResourceSynchronously(WebCore::FrameLoader&, unsigned long, const WebCore::ResourceRequest&, WebCore::StoredCredentialsPolicy, WebCore::ClientCredentialPolicy, WebCore::ResourceError&, WebCore::ResourceResponse&, Vector<char>&) final;
    5454    void remove(WebCore::ResourceLoader*) final;
    5555    void setDefersLoading(WebCore::ResourceLoader*, bool) final;
    … …  
    6262    void startPingLoad(WebCore::Frame&, WebCore::ResourceRequest&, const WebCore::HTTPHeaderMap&, const WebCore::FetchOptions&, PingLoadCompletionHandler&&) final;
    6363
    64     void preconnectTo(WebCore::NetworkingContext&, const WebCore::URL&, WebCore::StoredCredentialsPolicy, PreconnectCompletionHandler&&) final;
     64    void preconnectTo(WebCore::FrameLoader&, const WebCore::URL&, WebCore::StoredCredentialsPolicy, PreconnectCompletionHandler&&) final;
    6565
    6666    void storeDerivedDataToCache(const SHA1::Digest&, const String&, const String&, WebCore::SharedBuffer&) final { }

  • trunk/Source/WebKitLegacy/mac/ChangeLog

    r228974 r229100  
     12018-02-28  Alex Christensen  <achristensen@webkit.org>
     2
     3        Reduce use of NetworkingContext in WebKit
     4        https://bugs.webkit.org/show_bug.cgi?id=183213
     5
     6        Reviewed by Brady Eidson.
     7
     8        * Plugins/Hosted/NetscapePluginInstanceProxy.mm:
     9        (WebKit::NetscapePluginInstanceProxy::getProxy):
     10        * Plugins/WebNetscapePluginView.mm:
     11        (-[WebNetscapePluginView getVariable:forURL:value:length:]):
     12
    1132018-02-17  Darin Adler  <darin@apple.com>
    214

  • trunk/Source/WebKitLegacy/mac/Plugins/Hosted/NetscapePluginInstanceProxy.mm

    r228260 r229100  
    16171617        return false;
    16181618
    1619     Vector<ProxyServer> proxyServers = proxyServersForURL(url, 0);
     1619    Vector<ProxyServer> proxyServers = proxyServersForURL(url);
    16201620    WTF::CString proxyStringUTF8 = toString(proxyServers).utf8();
    16211621

  • trunk/Source/WebKitLegacy/mac/Plugins/WebNetscapePluginView.mm

    r228218 r229100  
    21632163                break;
    21642164
    2165             Vector<ProxyServer> proxyServers = proxyServersForURL(URL, 0);
     2165            Vector<ProxyServer> proxyServers = proxyServersForURL(URL);
    21662166            CString proxiesUTF8 = toString(proxyServers).utf8();
    21672167           

  • trunk/Source/WebKitLegacy/win/ChangeLog

    r229048 r229100  
     12018-02-28  Alex Christensen  <achristensen@webkit.org>
     2
     3        Reduce use of NetworkingContext in WebKit
     4        https://bugs.webkit.org/show_bug.cgi?id=183213
     5
     6        Reviewed by Brady Eidson.
     7
     8        * Plugins/PluginView.cpp:
     9        (WebCore::PluginView::getValueForURL):
     10
    1112018-02-26  Don Olmstead  <don.olmstead@sony.com>
    212

  • trunk/Source/WebKitLegacy/win/Plugins/PluginView.cpp

    r229048 r229100  
    12971297        URL u(m_parentFrame->document()->baseURL(), url);
    12981298        if (u.isValid()) {
    1299             Frame* frame = getFrame(parentFrame(), m_element);
    1300             const FrameLoader* frameLoader = frame ? &frame->loader() : 0;
    1301             const NetworkingContext* context = frameLoader ? frameLoader->networkingContext() : 0;
    1302             const CString proxyStr = toString(proxyServersForURL(u, context)).utf8();
     1299            const CString proxyStr = toString(proxyServersForURL(u)).utf8();
    13031300            if (!proxyStr.isNull()) {
    13041301                const int size = proxyStr.length();
Note: See TracChangeset for help on using the changeset viewer.