Changeset 88618 in webkit


Ignore:
Timestamp:
Jun 12, 2011 12:21:49 PM (13 years ago)
Author:
abarth@webkit.org
Message:

2011-06-12 Adam Barth <​abarth@webkit.org>

Reviewed by Alexey Proskuryakov.

Remove trival "forward-to-client" member functions from FrameLoader
​https://bugs.webkit.org/show_bug.cgi?id=62510

Update to call the FrameLoaderClient directly. Also, remove cargo-cult
code that checks whether FrameLoader is null.

  • webkit/webkitwebview.cpp: (webkit_web_view_stop_loading): (webkit_web_view_can_show_mime_type):

2011-06-12 Adam Barth <​abarth@webkit.org>

Reviewed by Alexey Proskuryakov.

Remove trival "forward-to-client" member functions from FrameLoader
​https://bugs.webkit.org/show_bug.cgi?id=62510

  • WebCoreSupport/WebFrameNetworkingContext.cpp: (WebFrameNetworkingContext::blockedError):

2011-06-12 Adam Barth <​abarth@webkit.org>

Reviewed by Alexey Proskuryakov.

Remove trival "forward-to-client" member functions from FrameLoader
​https://bugs.webkit.org/show_bug.cgi?id=62510

  • WebCoreSupport/WebFrameNetworkingContext.mm: (WebFrameNetworkingContext::blockedError):

2011-06-12 Adam Barth <​abarth@webkit.org>

Reviewed by Alexey Proskuryakov.

Remove trival "forward-to-client" member functions from FrameLoader
​https://bugs.webkit.org/show_bug.cgi?id=62510

Originally, FrameLoader was supposed to abstract FrameLoaderClient, but
we lost that battle log ago. Nowadays, it's easier if folks just call
into FrameLoaderClient directly. Many of these functions have direct
callers already anyway.

  • WebCore.exp.in:
  • html/HTMLMediaElement.cpp: (WebCore::HTMLMediaElement::createRenderer): (WebCore::HTMLMediaElement::attach):
  • loader/DocumentLoader.cpp: (WebCore::DocumentLoader::setRequest): (WebCore::DocumentLoader::setMainDocumentError): (WebCore::DocumentLoader::setupForReplaceByMIMEType):
  • loader/FrameLoader.cpp: (WebCore::FrameLoader::didFirstLayout):
  • loader/FrameLoader.h:
    • cancelledError is slightly more delicate, so I'm going to move it in a separate patch.
  • loader/MainResourceLoader.cpp: (WebCore::MainResourceLoader::interruptForPolicyChangeError): (WebCore::MainResourceLoader::stopLoadingForPolicyChange): (WebCore::MainResourceLoader::continueAfterContentPolicy): (WebCore::MainResourceLoader::handleEmptyLoad): (WebCore::MainResourceLoader::loadNow):
  • loader/MainResourceLoader.h:
  • loader/NetscapePlugInStreamLoader.cpp: (WebCore::NetscapePlugInStreamLoader::didReceiveResponse):
  • loader/PingLoader.cpp: (WebCore::PingLoader::PingLoader):
  • loader/PolicyChecker.cpp: (WebCore::PolicyChecker::continueAfterNavigationPolicy):
  • loader/ResourceLoader.cpp: (WebCore::ResourceLoader::blockedError): (WebCore::ResourceLoader::cannotShowURLError): (WebCore::ResourceLoader::shouldUseCredentialStorage): (WebCore::ResourceLoader::canAuthenticateAgainstProtectionSpace):
  • page/ContextMenuController.cpp: (WebCore::ContextMenuController::populate):

2011-06-12 Adam Barth <​abarth@webkit.org>

Reviewed by Alexey Proskuryakov.

Remove trival "forward-to-client" member functions from FrameLoader
​https://bugs.webkit.org/show_bug.cgi?id=62510

  • WebProcess/WebCoreSupport/mac/WebFrameNetworkingContext.mm: (WebKit::WebFrameNetworkingContext::blockedError):
Location:
trunk/Source
Files:
21 edited

Legend:

Unmodified
Added
Removed

  • trunk/Source/WebCore/ChangeLog

    r88617 r88618  
     12011-06-12  Adam Barth  <abarth@webkit.org>
     2
     3        Reviewed by Alexey Proskuryakov.
     4
     5        Remove trival "forward-to-client" member functions from FrameLoader
     6        https://bugs.webkit.org/show_bug.cgi?id=62510
     7
     8        Originally, FrameLoader was supposed to abstract FrameLoaderClient, but
     9        we lost that battle log ago.  Nowadays, it's easier if folks just call
     10        into FrameLoaderClient directly.  Many of these functions have direct
     11        callers already anyway.
     12
     13        * WebCore.exp.in:
     14        * html/HTMLMediaElement.cpp:
     15        (WebCore::HTMLMediaElement::createRenderer):
     16        (WebCore::HTMLMediaElement::attach):
     17        * loader/DocumentLoader.cpp:
     18        (WebCore::DocumentLoader::setRequest):
     19        (WebCore::DocumentLoader::setMainDocumentError):
     20        (WebCore::DocumentLoader::setupForReplaceByMIMEType):
     21        * loader/FrameLoader.cpp:
     22        (WebCore::FrameLoader::didFirstLayout):
     23        * loader/FrameLoader.h:
     24            - cancelledError is slightly more delicate, so I'm going to move it in
     25              a separate patch.
     26        * loader/MainResourceLoader.cpp:
     27        (WebCore::MainResourceLoader::interruptForPolicyChangeError):
     28        (WebCore::MainResourceLoader::stopLoadingForPolicyChange):
     29        (WebCore::MainResourceLoader::continueAfterContentPolicy):
     30        (WebCore::MainResourceLoader::handleEmptyLoad):
     31        (WebCore::MainResourceLoader::loadNow):
     32        * loader/MainResourceLoader.h:
     33        * loader/NetscapePlugInStreamLoader.cpp:
     34        (WebCore::NetscapePlugInStreamLoader::didReceiveResponse):
     35        * loader/PingLoader.cpp:
     36        (WebCore::PingLoader::PingLoader):
     37        * loader/PolicyChecker.cpp:
     38        (WebCore::PolicyChecker::continueAfterNavigationPolicy):
     39        * loader/ResourceLoader.cpp:
     40        (WebCore::ResourceLoader::blockedError):
     41        (WebCore::ResourceLoader::cannotShowURLError):
     42        (WebCore::ResourceLoader::shouldUseCredentialStorage):
     43        (WebCore::ResourceLoader::canAuthenticateAgainstProtectionSpace):
     44        * page/ContextMenuController.cpp:
     45        (WebCore::ContextMenuController::populate):
     46
    1472011-06-12  Dan Bernstein  <mitz@apple.com>
    248

  • trunk/Source/WebCore/WebCore.exp.in

    r88610 r88618  
    10471047__ZNK7WebCore11CachedImage5imageEv
    10481048__ZNK7WebCore11FrameLoader10isCompleteEv
    1049 __ZNK7WebCore11FrameLoader12blockedErrorERKNS_15ResourceRequestE
    10501049__ZNK7WebCore11FrameLoader14cancelledErrorERKNS_15ResourceRequestE
    10511050__ZNK7WebCore11FrameLoader14frameHasLoadedEv

  • trunk/Source/WebCore/html/HTMLMediaElement.cpp

    r88505 r88618  
    336336
    337337        if (Frame* frame = document()->frame())
    338             frame->loader()->showMediaPlayerProxyPlugin(m_proxyWidget.get());
     338            frame->loader()->client()->showMediaPlayerProxyPlugin(m_proxyWidget.get());
    339339    }
    340340    return mediaRenderer;
    … …  
    377377    else if (m_proxyWidget) {
    378378        if (Frame* frame = document()->frame())
    379             frame->loader()->hideMediaPlayerProxyPlugin(m_proxyWidget.get());
     379            frame->loader()->client()->hideMediaPlayerProxyPlugin(m_proxyWidget.get());
    380380    }
    381381#endif

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

    r88610 r88618  
    178178    m_request = req;
    179179
    180     // Only send webView:didReceiveServerRedirectForProvisionalLoadForFrame: if URL changed (and is non-null).
     180    // Only dispatchDidReceiveServerRedirectForProvisionalLoad() if URL changed (and is non-null).
    181181    // Also, don't send it when replacing unreachable URLs with alternate content.
    182182    if (!handlingUnreachableURL && !req.url().isNull() && oldURL != req.url())
    183         frameLoader()->didReceiveServerRedirectForProvisionalLoadForFrame();
     183        frameLoader()->client()->dispatchDidReceiveServerRedirectForProvisionalLoad();
    184184}
    185185
    … …  
    187187{
    188188    m_mainDocumentError = error;   
    189     frameLoader()->setMainDocumentError(this, error);
    190  }
     189    frameLoader()->client()->setMainDocumentError(this, error);
     190}
    191191
    192192void DocumentLoader::clearErrors()
    … …  
    342342   
    343343    if (!doesProgressiveLoad(oldMIMEType)) {
    344         frameLoader()->revertToProvisional(this);
     344        frameLoader()->client()->revertToProvisionalState(this);
    345345        setupForReplace();
    346346        RefPtr<SharedBuffer> resourceData = mainResourceData();
    … …  
    355355   
    356356    if (doesProgressiveLoad(newMIMEType)) {
    357         frameLoader()->revertToProvisional(this);
     357        frameLoader()->client()->revertToProvisionalState(this);
    358358        setupForReplace();
    359359    }

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

    r88566 r88618  
    264264}
    265265
    266 bool FrameLoader::canHandleRequest(const ResourceRequest& request)
    267 {
    268     return m_client->canHandleRequest(request);
    269 }
    270 
    271266void FrameLoader::changeLocation(PassRefPtr<SecurityOrigin> securityOrigin, const KURL& url, const String& referrer, bool lockHistory, bool lockBackForwardList, bool refresh)
    272267{
    … …  
    10781073}
    10791074
    1080 #if ENABLE(PLUGIN_PROXY_FOR_VIDEO)
    1081 void FrameLoader::hideMediaPlayerProxyPlugin(Widget* widget)
    1082 {
    1083     m_client->hideMediaPlayerProxyPlugin(widget);
    1084 }
    1085 
    1086 void FrameLoader::showMediaPlayerProxyPlugin(Widget* widget)
    1087 {
    1088     m_client->showMediaPlayerProxyPlugin(widget);
    1089 }
    1090 #endif // ENABLE(PLUGIN_PROXY_FOR_VIDEO)
    1091 
    10921075String FrameLoader::outgoingReferrer() const
    10931076{
    … …  
    23082291}
    23092292
    2310 bool FrameLoader::canShowMIMEType(const String& MIMEType) const
    2311 {
    2312     return m_client->canShowMIMEType(MIMEType);
    2313 }
    2314 
    2315 bool FrameLoader::representationExistsForURLScheme(const String& URLScheme)
    2316 {
    2317     return m_client->representationExistsForURLScheme(URLScheme);
    2318 }
    2319 
    2320 String FrameLoader::generatedMIMETypeForURLScheme(const String& URLScheme)
    2321 {
    2322     return m_client->generatedMIMETypeForURLScheme(URLScheme);
    2323 }
    2324 
    2325 void FrameLoader::didReceiveServerRedirectForProvisionalLoadForFrame()
    2326 {
    2327     m_client->dispatchDidReceiveServerRedirectForProvisionalLoad();
    2328 }
    2329 
    23302293void FrameLoader::finishedLoadingDocument(DocumentLoader* loader)
    23312294{
    … …  
    23742337{
    23752338    m_loadType = FrameLoadTypeReplace;
    2376 }
    2377 
    2378 void FrameLoader::revertToProvisional(DocumentLoader* loader)
    2379 {
    2380     m_client->revertToProvisionalState(loader);
    23812339}
    23822340
    … …  
    25782536    if (m_stateMachine.committedFirstRealDocumentLoad() && !m_stateMachine.isDisplayingInitialEmptyDocument() && !m_stateMachine.firstLayoutDone())
    25792537        m_stateMachine.advanceTo(FrameLoaderStateMachine::FirstLayoutDone);
     2538
    25802539    m_client->dispatchDidFirstLayout();
    25812540}
    … …  
    33683327}
    33693328
    3370 void FrameLoader::setMainDocumentError(DocumentLoader* loader, const ResourceError& error)
    3371 {
    3372     m_client->setMainDocumentError(loader, error);
    3373 }
    3374 
    33753329void FrameLoader::mainReceivedCompleteError(DocumentLoader* loader, const ResourceError&)
    33763330{
    … …  
    33933347    return error;
    33943348}
    3395 
    3396 ResourceError FrameLoader::blockedError(const ResourceRequest& request) const
    3397 {
    3398     return m_client->blockedError(request);
    3399 }
    3400 
    3401 ResourceError FrameLoader::cannotShowURLError(const ResourceRequest& request) const
    3402 {
    3403     return m_client->cannotShowURLError(request);
    3404 }
    3405 
    3406 ResourceError FrameLoader::interruptionForPolicyChangeError(const ResourceRequest& request) const
    3407 {
    3408     return m_client->interruptForPolicyChangeError(request);
    3409 }
    3410 
    3411 ResourceError FrameLoader::fileDoesNotExistError(const ResourceResponse& response) const
    3412 {
    3413     return m_client->fileDoesNotExistError(response);   
    3414 }
    3415 
    3416 bool FrameLoader::shouldUseCredentialStorage(ResourceLoader* loader)
    3417 {
    3418     return m_client->shouldUseCredentialStorage(loader->documentLoader(), loader->identifier());
    3419 }
    3420 
    3421 #if USE(PROTECTION_SPACE_AUTH_CALLBACK)
    3422 bool FrameLoader::canAuthenticateAgainstProtectionSpace(ResourceLoader* loader, const ProtectionSpace& protectionSpace)
    3423 {
    3424     return m_client->canAuthenticateAgainstProtectionSpace(loader->documentLoader(), loader->identifier(), protectionSpace);
    3425 }
    3426 #endif
    34273349
    34283350void FrameLoader::setTitle(const StringWithDirection& title)

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

    r87189 r88618  
    129129    unsigned long loadResourceSynchronously(const ResourceRequest&, StoredCredentials, ResourceError&, ResourceResponse&, Vector<char>& data);
    130130
    131     bool canHandleRequest(const ResourceRequest&);
    132 
    133131    // Also not cool.
    134132    void stopAllLoaders(ClearProvisionalItemPolicy = ShouldClearProvisionalItem);
    … …  
    153151    static double timeOfLastCompletedLoad();
    154152
    155     bool shouldUseCredentialStorage(ResourceLoader*);
    156 #if USE(PROTECTION_SPACE_AUTH_CALLBACK)
    157     bool canAuthenticateAgainstProtectionSpace(ResourceLoader* loader, const ProtectionSpace& protectionSpace);
    158 #endif
    159153    const ResourceRequest& originalRequest() const;
    160154    const ResourceRequest& initialRequest() const;
    … …  
    168162    void finishedLoading();
    169163
     164    // FIXME: Move this method to ResourceLoader with the rest of the ResourceError accessors.
    170165    ResourceError cancelledError(const ResourceRequest&) const;
    171     ResourceError fileDoesNotExistError(const ResourceResponse&) const;
    172     ResourceError blockedError(const ResourceRequest&) const;
    173     ResourceError cannotShowURLError(const ResourceRequest&) const;
    174     ResourceError interruptionForPolicyChangeError(const ResourceRequest&) const;
    175166
    176167    bool isHostedByObjectElement() const;
    177168    bool isLoadingMainFrame() const;
    178     bool canShowMIMEType(const String& MIMEType) const;
    179     bool representationExistsForURLScheme(const String& URLScheme);
    180     String generatedMIMETypeForURLScheme(const String& URLScheme);
    181169
    182170    void reload(bool endToEndReload = false);
    183171    void reloadWithOverrideEncoding(const String& overrideEncoding);
    184172
    185     void didReceiveServerRedirectForProvisionalLoadForFrame();
    186173    void finishedLoadingDocument(DocumentLoader*);
    187174    bool isReplacing() const;
    188175    void setReplacing();
    189     void revertToProvisional(DocumentLoader*);
    190     void setMainDocumentError(DocumentLoader*, const ResourceError&);
    191176    void mainReceivedCompleteError(DocumentLoader*, const ResourceError&);
    192177    bool subframeIsLoading() const;
    … …  
    309294
    310295    void open(CachedFrameBase&);
    311 
    312 #if ENABLE(PLUGIN_PROXY_FOR_VIDEO)
    313     void hideMediaPlayerProxyPlugin(Widget*);
    314     void showMediaPlayerProxyPlugin(Widget*);
    315 #endif
    316296
    317297    // FIXME: Should these really be public?

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

    r87189 r88618  
    119119}
    120120
    121 ResourceError MainResourceLoader::interruptionForPolicyChangeError() const
    122 {
    123     return frameLoader()->interruptionForPolicyChangeError(request());
     121ResourceError MainResourceLoader::interruptForPolicyChangeError() const
     122{
     123    return frameLoader()->client()->interruptForPolicyChangeError(request());
    124124}
    125125
    126126void MainResourceLoader::stopLoadingForPolicyChange()
    127127{
    128     ResourceError error = interruptionForPolicyChangeError();
     128    ResourceError error = interruptForPolicyChangeError();
    129129    error.setIsCancellation(true);
    130130    cancel(error);
    … …  
    259259        bool isRemoteWebArchive = (equalIgnoringCase("application/x-webarchive", mimeType) || equalIgnoringCase("multipart/related", mimeType))
    260260            && !m_substituteData.isValid() && !url.isLocalFile();
    261         if (!frameLoader()->canShowMIMEType(mimeType) || isRemoteWebArchive) {
     261        if (!frameLoader()->client()->canShowMIMEType(mimeType) || isRemoteWebArchive) {
    262262            frameLoader()->policyChecker()->cannotShowMIMEType(r);
    263263            // Check reachedTerminalState since the load may have already been cancelled inside of _handleUnimplementablePolicyWithErrorCode::.
    … …  
    279279        // It might have gone missing
    280280        if (frameLoader())
    281             receivedError(interruptionForPolicyChangeError());
     281            receivedError(interruptForPolicyChangeError());
    282282        return;
    283283
    … …  
    317317            if (frameLoader() && !frameLoader()->isStopping())
    318318                didFinishLoading(0);
    319         } else if (shouldLoadAsEmptyDocument(url) || frameLoader()->representationExistsForURLScheme(url.protocol()))
     319        } else if (shouldLoadAsEmptyDocument(url) || frameLoader()->client()->representationExistsForURLScheme(url.protocol()))
    320320            didFinishLoading(0);
    321321    }
    … …  
    511511    String mimeType;
    512512    if (forURLScheme)
    513         mimeType = frameLoader()->generatedMIMETypeForURLScheme(url.protocol());
     513        mimeType = frameLoader()->client()->generatedMIMETypeForURLScheme(url.protocol());
    514514    else
    515515        mimeType = "text/html";
    … …  
    581581    if (m_substituteData.isValid())
    582582        handleDataLoadSoon(r);
    583     else if (shouldLoadEmpty || frameLoader()->representationExistsForURLScheme(url.protocol()))
     583    else if (shouldLoadEmpty || frameLoader()->client()->representationExistsForURLScheme(url.protocol()))
    584584        handleEmptyLoad(url, !shouldLoadEmpty);
    585585    else

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

    r86720 r88618  
    8787
    8888        void receivedError(const ResourceError&);
    89         ResourceError interruptionForPolicyChangeError() const;
     89        ResourceError interruptForPolicyChangeError() const;
    9090        void stopLoadingForPolicyChange();
    9191        bool isPostOrRedirectAfterPost(const ResourceRequest& newRequest, const ResourceResponse& redirectResponse);

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

    r86720 r88618  
    3131
    3232#include "FrameLoader.h"
     33#include "FrameLoaderClient.h"
    3334#include "DocumentLoader.h"
    3435
    … …  
    9091   
    9192    if (response.httpStatusCode() < 100 || response.httpStatusCode() >= 400)
    92         cancel(frameLoader()->fileDoesNotExistError(response));
     93        cancel(frameLoader()->client()->fileDoesNotExistError(response));
    9394}
    9495

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

    r88458 r88618  
    116116{
    117117    unsigned long identifier = frame->page()->progress()->createUniqueIdentifier();
     118    // FIXME: Why activeDocumentLoader? I would have expected documentLoader().
     119    // Itseems like the PingLoader should be associated with the current
     120    // Document in the Frame, but the activeDocumentLoader will be associated
     121    // with the provisional DocumentLoader if there is a provisional
     122    // DocumentLoader.
    118123    m_shouldUseCredentialStorage = frame->loader()->client()->shouldUseCredentialStorage(frame->loader()->activeDocumentLoader(), identifier);
    119124    m_handle = ResourceHandle::create(frame->loader()->networkingContext(), request, this, false, false);

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

    r86462 r88618  
    154154
    155155            if (!m_frame->loader()->client()->canHandleRequest(request)) {
    156                 handleUnimplementablePolicy(m_frame->loader()->cannotShowURLError(callback.request()));
     156                handleUnimplementablePolicy(m_frame->loader()->client()->cannotShowURLError(callback.request()));
    157157                callback.clearRequest();
    158158                shouldContinue = false;

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

    r87189 r88618  
    407407ResourceError ResourceLoader::blockedError()
    408408{
    409     return frameLoader()->blockedError(m_request);
     409    return frameLoader()->client()->blockedError(m_request);
    410410}
    411411
    412412ResourceError ResourceLoader::cannotShowURLError()
    413413{
    414     return frameLoader()->cannotShowURLError(m_request);
     414    return frameLoader()->client()->cannotShowURLError(m_request);
    415415}
    416416
    … …  
    472472{
    473473    RefPtr<ResourceLoader> protector(this);
    474     return frameLoader()->shouldUseCredentialStorage(this);
     474    return frameLoader()->client()->shouldUseCredentialStorage(documentLoader(), identifier());
    475475}
    476476
    … …  
    495495{
    496496    RefPtr<ResourceLoader> protector(this);
    497     return frameLoader()->canAuthenticateAgainstProtectionSpace(this, protectionSpace);
     497    return frameLoader()->client()->canAuthenticateAgainstProtectionSpace(documentLoader(), identifier(), protectionSpace);
    498498}
    499499#endif

  • trunk/Source/WebCore/page/ContextMenuController.cpp

    r85864 r88618  
    4848#include "FrameLoadRequest.h"
    4949#include "FrameLoader.h"
     50#include "FrameLoaderClient.h"
    5051#include "FrameSelection.h"
    5152#include "HTMLFormElement.h"
    … …  
    695696        KURL linkURL = m_hitTestResult.absoluteLinkURL();
    696697        if (!linkURL.isEmpty()) {
    697             if (loader->canHandleRequest(ResourceRequest(linkURL))) {
     698            if (loader->client()->canHandleRequest(ResourceRequest(linkURL))) {
    698699                appendItem(OpenLinkItem, m_contextMenu.get());
    699700                appendItem(OpenLinkInNewWindowItem, m_contextMenu.get());
    … …  
    856857        KURL linkURL = m_hitTestResult.absoluteLinkURL();
    857858        if (!linkURL.isEmpty()) {
    858             if (loader->canHandleRequest(ResourceRequest(linkURL))) {
     859            if (loader->client()->canHandleRequest(ResourceRequest(linkURL))) {
    859860                appendItem(OpenLinkItem, m_contextMenu.get());
    860861                appendItem(OpenLinkInNewWindowItem, m_contextMenu.get());

  • trunk/Source/WebKit/gtk/ChangeLog

    r88498 r88618  
     12011-06-12  Adam Barth  <abarth@webkit.org>
     2
     3        Reviewed by Alexey Proskuryakov.
     4
     5        Remove trival "forward-to-client" member functions from FrameLoader
     6        https://bugs.webkit.org/show_bug.cgi?id=62510
     7
     8        Update to call the FrameLoaderClient directly.  Also, remove cargo-cult
     9        code that checks whether FrameLoader is null.
     10
     11        * webkit/webkitwebview.cpp:
     12        (webkit_web_view_stop_loading):
     13        (webkit_web_view_can_show_mime_type):
     14
    1152011-06-09  Martin Robinson  <mrobinson@igalia.com>
    216

  • trunk/Source/WebKit/gtk/webkit/webkitwebview.cpp

    r88399 r88618  
    5353#include "FocusController.h"
    5454#include "FrameLoader.h"
     55#include "FrameLoaderClient.h"
    5556#include "FrameLoaderTypes.h"
    5657#include "FrameView.h"
    … …  
    39793980    g_return_if_fail(WEBKIT_IS_WEB_VIEW(webView));
    39803981
    3981     Frame* frame = core(webView)->mainFrame();
    3982 
    3983     if (FrameLoader* loader = frame->loader())
    3984         loader->stopForUserCancel();
     3982    core(webView)->mainFrame()->loader()->stopForUserCancel();
    39853983}
    39863984
    … …  
    43574355
    43584356    Frame* frame = core(webkit_web_view_get_main_frame(webView));
    4359     if (FrameLoader* loader = frame->loader())
    4360         return loader->canShowMIMEType(String::fromUTF8(mimeType));
    4361     else
    4362         return FALSE;
     4357    return frame->loader()->client()->canShowMIMEType(String::fromUTF8(mimeType));
    43634358}
    43644359

  • trunk/Source/WebKit/mac/ChangeLog

    r88576 r88618  
     12011-06-12  Adam Barth  <abarth@webkit.org>
     2
     3        Reviewed by Alexey Proskuryakov.
     4
     5        Remove trival "forward-to-client" member functions from FrameLoader
     6        https://bugs.webkit.org/show_bug.cgi?id=62510
     7
     8        * WebCoreSupport/WebFrameNetworkingContext.mm:
     9        (WebFrameNetworkingContext::blockedError):
     10
    1112011-06-10  Tony Chang  <tony@chromium.org>
    212

  • trunk/Source/WebKit/mac/WebCoreSupport/WebFrameNetworkingContext.mm

    r66794 r88618  
    2020#import "WebFrameNetworkingContext.h"
    2121
     22#import <WebCore/FrameLoaderClient.h>
    2223#import <WebCore/Page.h>
    2324#import <WebCore/ResourceError.h>
    … …  
    4344ResourceError WebFrameNetworkingContext::blockedError(const ResourceRequest& request) const
    4445{
    45     return frame()->loader()->blockedError(request);
     46    return frame()->loader()->client()->blockedError(request);
    4647}

  • trunk/Source/WebKit/win/ChangeLog

    r88260 r88618  
     12011-06-12  Adam Barth  <abarth@webkit.org>
     2
     3        Reviewed by Alexey Proskuryakov.
     4
     5        Remove trival "forward-to-client" member functions from FrameLoader
     6        https://bugs.webkit.org/show_bug.cgi?id=62510
     7
     8        * WebCoreSupport/WebFrameNetworkingContext.cpp:
     9        (WebFrameNetworkingContext::blockedError):
     10
    1112011-06-06  Michael Saboff  <msaboff@apple.com>
    212

  • trunk/Source/WebKit/win/WebCoreSupport/WebFrameNetworkingContext.cpp

    r67397 r88618  
    1919
    2020#include "config.h"
     21#include "WebFrameNetworkingContext.h"
    2122
    22 #include "WebFrameNetworkingContext.h"
     23#include "FrameLoaderClient.h"
    2324
    2425using namespace WebCore;
    … …  
    4142WebCore::ResourceError WebFrameNetworkingContext::blockedError(const WebCore::ResourceRequest& request) const
    4243{
    43     return frame()->loader()->blockedError(request);
     44    return frame()->loader()->client()->blockedError(request);
    4445}

  • trunk/Source/WebKit2/ChangeLog

    r88607 r88618  
     12011-06-12  Adam Barth  <abarth@webkit.org>
     2
     3        Reviewed by Alexey Proskuryakov.
     4
     5        Remove trival "forward-to-client" member functions from FrameLoader
     6        https://bugs.webkit.org/show_bug.cgi?id=62510
     7
     8        * WebProcess/WebCoreSupport/mac/WebFrameNetworkingContext.mm:
     9        (WebKit::WebFrameNetworkingContext::blockedError):
     10
    1112011-06-11  Stephanie Lewis  <slewis@apple.com>
    212

  • trunk/Source/WebKit2/WebProcess/WebCoreSupport/mac/WebFrameNetworkingContext.mm

    r76991 r88618  
    2121#import "WebFrameNetworkingContext.h"
    2222
     23#import <WebCore/FrameLoaderClient.h>
    2324#import <WebCore/Page.h>
    2425#import <WebCore/ResourceError.h>
    … …  
    4647ResourceError WebFrameNetworkingContext::blockedError(const ResourceRequest& request) const
    4748{
    48     return frame()->loader()->blockedError(request);
     49    return frame()->loader()->client()->blockedError(request);
    4950}
    5051
Note: See TracChangeset for help on using the changeset viewer.