Changeset 49671 in webkit


Ignore:
Timestamp:
Oct 15, 2009 10:32:24 PM (15 years ago)
Author:
abarth@webkit.org
Message:

2009-10-15 Adam Barth <​abarth@webkit.org>

Reviewed by Darin Adler.

Factor ResourceLoadNotifier out of FrameLoader
​https://bugs.webkit.org/show_bug.cgi?id=30379

These methods have virtually no interaction with the rest of
FrameLoader.

  • GNUmakefile.am:
  • WebCore.gypi:
  • WebCore.pro:
  • WebCore.vcproj/WebCore.vcproj:
  • WebCore.xcodeproj/project.pbxproj:
  • WebCoreSources.bkl:
  • dom/Document.cpp: (WebCore::Document::resourceRetrievedByXMLHttpRequest):
  • loader/FrameLoader.cpp: (WebCore::FrameLoader::FrameLoader): (WebCore::FrameLoader::continueLoadAfterWillSubmitForm): (WebCore::ResourceLoadNotifier::ResourceLoadNotifier): (WebCore::ResourceLoadNotifier::activeDocumentLoader): (WebCore::ResourceLoadNotifier::assignIdentifierToInitialRequest): (WebCore::ResourceLoadNotifier::willSendRequest): (WebCore::ResourceLoadNotifier::didReceiveResponse): (WebCore::ResourceLoadNotifier::didReceiveData): (WebCore::ResourceLoadNotifier::didFailToLoad): (WebCore::ResourceLoadNotifier::didLoadResourceByXMLHttpRequest): (WebCore::FrameLoader::sendRemainingDelegateMessages): (WebCore::FrameLoader::requestFromDelegate): (WebCore::ResourceLoadNotifier::didFinishLoad): (WebCore::ResourceLoadNotifier::didReceiveAuthenticationChallenge): (WebCore::ResourceLoadNotifier::didCancelAuthenticationChallenge): (WebCore::ResourceLoadNotifier::dispatchAssignIdentifierToInitialRequest): (WebCore::ResourceLoadNotifier::dispatchWillSendRequest): (WebCore::ResourceLoadNotifier::dispatchDidReceiveResponse): (WebCore::ResourceLoadNotifier::dispatchDidReceiveContentLength): (WebCore::ResourceLoadNotifier::dispatchDidFinishLoading):
  • loader/FrameLoader.h: (WebCore::FrameLoader::notifier):
  • loader/MainResourceLoader.cpp: (WebCore::MainResourceLoader::receivedError):
  • loader/ResourceLoadNotifier.cpp: Added. (WebCore::ResourceLoadNotifier::ResourceLoadNotifier): (WebCore::ResourceLoadNotifier::didReceiveAuthenticationChallenge): (WebCore::ResourceLoadNotifier::didCancelAuthenticationChallenge): (WebCore::ResourceLoadNotifier::assignIdentifierToInitialRequest): (WebCore::ResourceLoadNotifier::willSendRequest): (WebCore::ResourceLoadNotifier::didReceiveResponse): (WebCore::ResourceLoadNotifier::didReceiveData): (WebCore::ResourceLoadNotifier::didFinishLoad): (WebCore::ResourceLoadNotifier::didFailToLoad): (WebCore::ResourceLoadNotifier::didLoadResourceByXMLHttpRequest): (WebCore::ResourceLoadNotifier::dispatchAssignIdentifierToInitialRequest): (WebCore::ResourceLoadNotifier::dispatchWillSendRequest): (WebCore::ResourceLoadNotifier::dispatchDidReceiveResponse): (WebCore::ResourceLoadNotifier::dispatchDidReceiveContentLength): (WebCore::ResourceLoadNotifier::dispatchDidFinishLoading): (WebCore::ResourceLoadNotifier::activeDocumentLoader):
  • loader/ResourceLoadNotifier.h: Added.
  • loader/ResourceLoader.cpp: (WebCore::ResourceLoader::willSendRequest): (WebCore::ResourceLoader::didReceiveResponse): (WebCore::ResourceLoader::didReceiveData): (WebCore::ResourceLoader::didFinishLoadingOnePart): (WebCore::ResourceLoader::didFail): (WebCore::ResourceLoader::didCancel): (WebCore::ResourceLoader::didReceiveAuthenticationChallenge): (WebCore::ResourceLoader::didCancelAuthenticationChallenge):
Location:
trunk/WebCore
Files:
2 added
12 edited

Legend:

Unmodified
Added
Removed

  • trunk/WebCore/ChangeLog

    r49670 r49671  
     12009-10-15  Adam Barth  <abarth@webkit.org>
     2
     3        Reviewed by Darin Adler.
     4
     5        Factor ResourceLoadNotifier out of FrameLoader
     6        https://bugs.webkit.org/show_bug.cgi?id=30379
     7
     8        These methods have virtually no interaction with the rest of
     9        FrameLoader.
     10
     11        * GNUmakefile.am:
     12        * WebCore.gypi:
     13        * WebCore.pro:
     14        * WebCore.vcproj/WebCore.vcproj:
     15        * WebCore.xcodeproj/project.pbxproj:
     16        * WebCoreSources.bkl:
     17        * dom/Document.cpp:
     18        (WebCore::Document::resourceRetrievedByXMLHttpRequest):
     19        * loader/FrameLoader.cpp:
     20        (WebCore::FrameLoader::FrameLoader):
     21        (WebCore::FrameLoader::continueLoadAfterWillSubmitForm):
     22        (WebCore::ResourceLoadNotifier::ResourceLoadNotifier):
     23        (WebCore::ResourceLoadNotifier::activeDocumentLoader):
     24        (WebCore::ResourceLoadNotifier::assignIdentifierToInitialRequest):
     25        (WebCore::ResourceLoadNotifier::willSendRequest):
     26        (WebCore::ResourceLoadNotifier::didReceiveResponse):
     27        (WebCore::ResourceLoadNotifier::didReceiveData):
     28        (WebCore::ResourceLoadNotifier::didFailToLoad):
     29        (WebCore::ResourceLoadNotifier::didLoadResourceByXMLHttpRequest):
     30        (WebCore::FrameLoader::sendRemainingDelegateMessages):
     31        (WebCore::FrameLoader::requestFromDelegate):
     32        (WebCore::ResourceLoadNotifier::didFinishLoad):
     33        (WebCore::ResourceLoadNotifier::didReceiveAuthenticationChallenge):
     34        (WebCore::ResourceLoadNotifier::didCancelAuthenticationChallenge):
     35        (WebCore::ResourceLoadNotifier::dispatchAssignIdentifierToInitialRequest):
     36        (WebCore::ResourceLoadNotifier::dispatchWillSendRequest):
     37        (WebCore::ResourceLoadNotifier::dispatchDidReceiveResponse):
     38        (WebCore::ResourceLoadNotifier::dispatchDidReceiveContentLength):
     39        (WebCore::ResourceLoadNotifier::dispatchDidFinishLoading):
     40        * loader/FrameLoader.h:
     41        (WebCore::FrameLoader::notifier):
     42        * loader/MainResourceLoader.cpp:
     43        (WebCore::MainResourceLoader::receivedError):
     44        * loader/ResourceLoadNotifier.cpp: Added.
     45        (WebCore::ResourceLoadNotifier::ResourceLoadNotifier):
     46        (WebCore::ResourceLoadNotifier::didReceiveAuthenticationChallenge):
     47        (WebCore::ResourceLoadNotifier::didCancelAuthenticationChallenge):
     48        (WebCore::ResourceLoadNotifier::assignIdentifierToInitialRequest):
     49        (WebCore::ResourceLoadNotifier::willSendRequest):
     50        (WebCore::ResourceLoadNotifier::didReceiveResponse):
     51        (WebCore::ResourceLoadNotifier::didReceiveData):
     52        (WebCore::ResourceLoadNotifier::didFinishLoad):
     53        (WebCore::ResourceLoadNotifier::didFailToLoad):
     54        (WebCore::ResourceLoadNotifier::didLoadResourceByXMLHttpRequest):
     55        (WebCore::ResourceLoadNotifier::dispatchAssignIdentifierToInitialRequest):
     56        (WebCore::ResourceLoadNotifier::dispatchWillSendRequest):
     57        (WebCore::ResourceLoadNotifier::dispatchDidReceiveResponse):
     58        (WebCore::ResourceLoadNotifier::dispatchDidReceiveContentLength):
     59        (WebCore::ResourceLoadNotifier::dispatchDidFinishLoading):
     60        (WebCore::ResourceLoadNotifier::activeDocumentLoader):
     61        * loader/ResourceLoadNotifier.h: Added.
     62        * loader/ResourceLoader.cpp:
     63        (WebCore::ResourceLoader::willSendRequest):
     64        (WebCore::ResourceLoader::didReceiveResponse):
     65        (WebCore::ResourceLoader::didReceiveData):
     66        (WebCore::ResourceLoader::didFinishLoadingOnePart):
     67        (WebCore::ResourceLoader::didFail):
     68        (WebCore::ResourceLoader::didCancel):
     69        (WebCore::ResourceLoader::didReceiveAuthenticationChallenge):
     70        (WebCore::ResourceLoader::didCancelAuthenticationChallenge):
     71
    1722009-10-15  Roland Steiner  <rolandsteiner@google.com>
    273

  • trunk/WebCore/GNUmakefile.am

    r49515 r49671  
    12621262        WebCore/loader/ResourceLoader.cpp \
    12631263        WebCore/loader/ResourceLoader.h \
     1264        WebCore/loader/ResourceLoadNotifier.cpp \
     1265        WebCore/loader/ResourceLoadNotifier.h \
    12641266        WebCore/loader/SubresourceLoader.cpp \
    12651267        WebCore/loader/SubresourceLoader.h \

  • trunk/WebCore/WebCore.gypi

    r49648 r49671  
    16481648            'loader/ResourceLoader.cpp',
    16491649            'loader/ResourceLoader.h',
     1650            'loader/ResourceLoadNotifier.cpp',
     1651            'loader/ResourceLoadNotifier.h',
    16501652            'loader/SubresourceLoader.cpp',
    16511653            'loader/SubresourceLoader.h',

  • trunk/WebCore/WebCore.pro

    r49574 r49671  
    11231123    loader/Request.cpp \
    11241124    loader/ResourceLoader.cpp \
     1125    loader/ResourceLoadNotifier.cpp \
    11251126    loader/SubresourceLoader.cpp \
    11261127    loader/TextDocument.cpp \

  • trunk/WebCore/WebCore.vcproj/WebCore.vcproj

    r49648 r49671  
    1754317543                        <File
    1754417544                                RelativePath="..\loader\ResourceLoader.h"
     17545                                >
     17546                        </File>
     17547                        <File
     17548                                RelativePath="..\loader\ResourceLoadNotifier.cpp"
     17549                                >
     17550                        </File>
     17551                        <File
     17552                                RelativePath="..\loader\ResourceLoadNotifier.h"
    1754517553                                >
    1754617554                        </File>

  • trunk/WebCore/WebCore.xcodeproj/project.pbxproj

    r49617 r49671  
    23582358                97059979107D975200A50A7C /* PolicyChecker.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 97059975107D975200A50A7C /* PolicyChecker.cpp */; };
    23592359                9705997A107D975200A50A7C /* PolicyChecker.h in Headers */ = {isa = PBXBuildFile; fileRef = 97059976107D975200A50A7C /* PolicyChecker.h */; settings = {ATTRIBUTES = (Private, ); }; };
     2360                973E325610883B7C005BC493 /* ResourceLoadNotifier.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 973E325410883B7C005BC493 /* ResourceLoadNotifier.cpp */; };
     2361                973E325710883B7C005BC493 /* ResourceLoadNotifier.h in Headers */ = {isa = PBXBuildFile; fileRef = 973E325510883B7C005BC493 /* ResourceLoadNotifier.h */; settings = {ATTRIBUTES = (Private, ); }; };
    23602362                979F43D31075E44A0000F83B /* RedirectScheduler.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 979F43D11075E44A0000F83B /* RedirectScheduler.cpp */; };
    23612363                979F43D41075E44A0000F83B /* RedirectScheduler.h in Headers */ = {isa = PBXBuildFile; fileRef = 979F43D21075E44A0000F83B /* RedirectScheduler.h */; settings = {ATTRIBUTES = (Private, ); }; };
    … …  
    75687570                97059975107D975200A50A7C /* PolicyChecker.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = PolicyChecker.cpp; sourceTree = "<group>"; };
    75697571                97059976107D975200A50A7C /* PolicyChecker.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = PolicyChecker.h; sourceTree = "<group>"; };
     7572                973E325410883B7C005BC493 /* ResourceLoadNotifier.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = ResourceLoadNotifier.cpp; sourceTree = "<group>"; };
     7573                973E325510883B7C005BC493 /* ResourceLoadNotifier.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ResourceLoadNotifier.h; sourceTree = "<group>"; };
    75707574                979F43D11075E44A0000F83B /* RedirectScheduler.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = RedirectScheduler.cpp; sourceTree = "<group>"; };
    75717575                979F43D21075E44A0000F83B /* RedirectScheduler.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = RedirectScheduler.h; sourceTree = "<group>"; };
    … …  
    1465714661                                93E227DE0AF589AD00D48324 /* ResourceLoader.cpp */,
    1465814662                                656D37270ADBA5DE00A4554D /* ResourceLoader.h */,
     14663                                973E325410883B7C005BC493 /* ResourceLoadNotifier.cpp */,
     14664                                973E325510883B7C005BC493 /* ResourceLoadNotifier.h */,
    1465914665                                93E227DF0AF589AD00D48324 /* SubresourceLoader.cpp */,
    1466014666                                656D37300ADBA5DE00A4554D /* SubresourceLoader.h */,
    … …  
    1803518041                                E1BE512E0CF6C512002EA959 /* XSLTUnicodeSort.h in Headers */,
    1803618042                                97DD4D870FDF4D6E00ECF9A4 /* XSSAuditor.h in Headers */,
     18043                                973E325710883B7C005BC493 /* ResourceLoadNotifier.h in Headers */,
    1803718044                        );
    1803818045                        runOnlyForDeploymentPostprocessing = 0;
    … …  
    2016620173                                E1BE512D0CF6C512002EA959 /* XSLTUnicodeSort.cpp in Sources */,
    2016720174                                97DD4D860FDF4D6E00ECF9A4 /* XSSAuditor.cpp in Sources */,
     20175                                973E325610883B7C005BC493 /* ResourceLoadNotifier.cpp in Sources */,
    2016820176                        );
    2016920177                        runOnlyForDeploymentPostprocessing = 0;

  • trunk/WebCore/WebCoreSources.bkl

    r49415 r49671  
    734734        loader/Request.cpp
    735735        loader/ResourceLoader.cpp
     736        loader/ResourceLoadNotifier.cpp
    736737        loader/SubresourceLoader.cpp
    737738        loader/TextDocument.cpp

  • trunk/WebCore/dom/Document.cpp

    r49608 r49671  
    45034503    if (frame) {
    45044504        FrameLoader* frameLoader = frame->loader();
    4505         frameLoader->didLoadResourceByXMLHttpRequest(identifier, sourceString);
     4505        frameLoader->notifier()->didLoadResourceByXMLHttpRequest(identifier, sourceString);
    45064506    }
    45074507}

  • trunk/WebCore/loader/FrameLoader.cpp

    r49608 r49671  
    169169    , m_policyChecker(frame)
    170170    , m_history(frame)
     171    , m_notifer(frame)
    171172    , m_state(FrameStateCommittedPage)
    172173    , m_loadType(FrameLoadTypeStandard)
    … …  
    29372938    if (Page* page = m_frame->page()) {
    29382939        identifier = page->progress()->createUniqueIdentifier();
    2939         dispatchAssignIdentifierToInitialRequest(identifier, m_provisionalDocumentLoader.get(), m_provisionalDocumentLoader->originalRequest());
     2940        notifier()->dispatchAssignIdentifierToInitialRequest(identifier, m_provisionalDocumentLoader.get(), m_provisionalDocumentLoader->originalRequest());
    29402941    }
    29412942
    … …  
    32553256    sendRemainingDelegateMessages(identifier, response, data.size(), error);
    32563257    return identifier;
    3257 }
    3258 
    3259 void FrameLoader::assignIdentifierToInitialRequest(unsigned long identifier, const ResourceRequest& clientRequest)
    3260 {
    3261     return dispatchAssignIdentifierToInitialRequest(identifier, activeDocumentLoader(), clientRequest);
    3262 }
    3263 
    3264 void FrameLoader::willSendRequest(ResourceLoader* loader, ResourceRequest& clientRequest, const ResourceResponse& redirectResponse)
    3265 {
    3266     applyUserAgent(clientRequest);
    3267     dispatchWillSendRequest(loader->documentLoader(), loader->identifier(), clientRequest, redirectResponse);
    3268 }
    3269 
    3270 void FrameLoader::didReceiveResponse(ResourceLoader* loader, const ResourceResponse& r)
    3271 {
    3272     activeDocumentLoader()->addResponse(r);
    3273    
    3274     if (Page* page = m_frame->page())
    3275         page->progress()->incrementProgress(loader->identifier(), r);
    3276     dispatchDidReceiveResponse(loader->documentLoader(), loader->identifier(), r);
    3277 }
    3278 
    3279 void FrameLoader::didReceiveData(ResourceLoader* loader, const char* data, int length, int lengthReceived)
    3280 {
    3281     if (Page* page = m_frame->page())
    3282         page->progress()->incrementProgress(loader->identifier(), data, length);
    3283     dispatchDidReceiveContentLength(loader->documentLoader(), loader->identifier(), lengthReceived);
    3284 }
    3285 
    3286 void FrameLoader::didFailToLoad(ResourceLoader* loader, const ResourceError& error)
    3287 {
    3288     if (Page* page = m_frame->page())
    3289         page->progress()->completeProgress(loader->identifier());
    3290     if (!error.isNull())
    3291         m_client->dispatchDidFailLoading(loader->documentLoader(), loader->identifier(), error);
    3292 }
    3293 
    3294 void FrameLoader::didLoadResourceByXMLHttpRequest(unsigned long identifier, const ScriptString& sourceString)
    3295 {
    3296     m_client->dispatchDidLoadResourceByXMLHttpRequest(identifier, sourceString);
    32973258}
    32983259
    … …  
    35093470{   
    35103471    if (!response.isNull())
    3511         dispatchDidReceiveResponse(m_documentLoader.get(), identifier, response);
     3472        notifier()->dispatchDidReceiveResponse(m_documentLoader.get(), identifier, response);
    35123473   
    35133474    if (length > 0)
    3514         dispatchDidReceiveContentLength(m_documentLoader.get(), identifier, length);
     3475        notifier()->dispatchDidReceiveContentLength(m_documentLoader.get(), identifier, length);
    35153476   
    35163477    if (error.isNull())
    3517         dispatchDidFinishLoading(m_documentLoader.get(), identifier);
     3478        notifier()->dispatchDidFinishLoading(m_documentLoader.get(), identifier);
    35183479    else
    35193480        m_client->dispatchDidFailLoading(m_documentLoader.get(), identifier, error);
    … …  
    35273488    if (Page* page = m_frame->page()) {
    35283489        identifier = page->progress()->createUniqueIdentifier();
    3529         dispatchAssignIdentifierToInitialRequest(identifier, m_documentLoader.get(), request);
     3490        notifier()->dispatchAssignIdentifierToInitialRequest(identifier, m_documentLoader.get(), request);
    35303491    }
    35313492
    35323493    ResourceRequest newRequest(request);
    3533     dispatchWillSendRequest(m_documentLoader.get(), identifier, newRequest, ResourceResponse());
     3494    notifier()->dispatchWillSendRequest(m_documentLoader.get(), identifier, newRequest, ResourceResponse());
    35343495
    35353496    if (newRequest.isNull())
    … …  
    38593820}
    38603821
    3861 void FrameLoader::didFinishLoad(ResourceLoader* loader)
    3862 {   
    3863     if (Page* page = m_frame->page())
    3864         page->progress()->completeProgress(loader->identifier());
    3865     dispatchDidFinishLoading(loader->documentLoader(), loader->identifier());
    3866 }
    3867 
    38683822bool FrameLoader::shouldUseCredentialStorage(ResourceLoader* loader)
    38693823{
    38703824    return m_client->shouldUseCredentialStorage(loader->documentLoader(), loader->identifier());
    3871 }
    3872 
    3873 void FrameLoader::didReceiveAuthenticationChallenge(ResourceLoader* loader, const AuthenticationChallenge& currentWebChallenge)
    3874 {
    3875     m_client->dispatchDidReceiveAuthenticationChallenge(loader->documentLoader(), loader->identifier(), currentWebChallenge);
    3876 }
    3877 
    3878 void FrameLoader::didCancelAuthenticationChallenge(ResourceLoader* loader, const AuthenticationChallenge& currentWebChallenge)
    3879 {
    3880     m_client->dispatchDidCancelAuthenticationChallenge(loader->documentLoader(), loader->identifier(), currentWebChallenge);
    38813825}
    38823826
    … …  
    39863930}
    39873931
    3988 void FrameLoader::dispatchAssignIdentifierToInitialRequest(unsigned long identifier, DocumentLoader* loader, const ResourceRequest& request)
    3989 {
    3990     m_client->assignIdentifierToInitialRequest(identifier, loader, request);
    3991 
    3992 #if ENABLE(INSPECTOR)
    3993     if (Page* page = m_frame->page())
    3994         page->inspectorController()->identifierForInitialRequest(identifier, loader, request);
    3995 #endif
    3996 }
    3997 
    3998 void FrameLoader::dispatchWillSendRequest(DocumentLoader* loader, unsigned long identifier, ResourceRequest& request, const ResourceResponse& redirectResponse)
    3999 {
    4000     StringImpl* oldRequestURL = request.url().string().impl();
    4001     m_documentLoader->didTellClientAboutLoad(request.url());
    4002 
    4003     m_client->dispatchWillSendRequest(loader, identifier, request, redirectResponse);
    4004 
    4005     // If the URL changed, then we want to put that new URL in the "did tell client" set too.
    4006     if (!request.isNull() && oldRequestURL != request.url().string().impl())
    4007         m_documentLoader->didTellClientAboutLoad(request.url());
    4008 
    4009 #if ENABLE(INSPECTOR)
    4010     if (Page* page = m_frame->page())
    4011         page->inspectorController()->willSendRequest(loader, identifier, request, redirectResponse);
    4012 #endif
    4013 }
    4014 
    4015 void FrameLoader::dispatchDidReceiveResponse(DocumentLoader* loader, unsigned long identifier, const ResourceResponse& r)
    4016 {
    4017     m_client->dispatchDidReceiveResponse(loader, identifier, r);
    4018 
    4019 #if ENABLE(INSPECTOR)
    4020     if (Page* page = m_frame->page())
    4021         page->inspectorController()->didReceiveResponse(loader, identifier, r);
    4022 #endif
    4023 }
    4024 
    4025 void FrameLoader::dispatchDidReceiveContentLength(DocumentLoader* loader, unsigned long identifier, int length)
    4026 {
    4027     m_client->dispatchDidReceiveContentLength(loader, identifier, length);
    4028 
    4029 #if ENABLE(INSPECTOR)
    4030     if (Page* page = m_frame->page())
    4031         page->inspectorController()->didReceiveContentLength(loader, identifier, length);
    4032 #endif
    4033 }
    4034 
    4035 void FrameLoader::dispatchDidFinishLoading(DocumentLoader* loader, unsigned long identifier)
    4036 {
    4037     m_client->dispatchDidFinishLoading(loader, identifier);
    4038 
    4039 #if ENABLE(INSPECTOR)
    4040     if (Page* page = m_frame->page())
    4041         page->inspectorController()->didFinishLoading(loader, identifier);
    4042 #endif
    4043 }
    4044 
    40453932void FrameLoader::tellClientAboutPastMemoryCacheLoads()
    40463933{

  • trunk/WebCore/loader/FrameLoader.h

    r49608 r49671  
    3737#include "PolicyChecker.h"
    3838#include "RedirectScheduler.h"
     39#include "ResourceLoadNotifier.h"
    3940#include "ResourceRequest.h"
    4041#include "ThreadableLoader.h"
    … …  
    9293        PolicyChecker* policyChecker() const { return &m_policyChecker; }
    9394        HistoryController* history() const { return &m_history; }
     95        ResourceLoadNotifier* notifier() const { return &m_notifer; }
    9496
    9597        // FIXME: This is not cool, people. There are too many different functions that all start loads.
    … …  
    142144
    143145        bool shouldUseCredentialStorage(ResourceLoader*);
    144         void didReceiveAuthenticationChallenge(ResourceLoader*, const AuthenticationChallenge&);
    145         void didCancelAuthenticationChallenge(ResourceLoader*, const AuthenticationChallenge&);
    146        
    147         void assignIdentifierToInitialRequest(unsigned long identifier, const ResourceRequest&);
    148         void willSendRequest(ResourceLoader*, ResourceRequest&, const ResourceResponse& redirectResponse);
    149         void didReceiveResponse(ResourceLoader*, const ResourceResponse&);
    150         void didReceiveData(ResourceLoader*, const char*, int, int lengthReceived);
    151         void didFinishLoad(ResourceLoader*);
    152         void didFailToLoad(ResourceLoader*, const ResourceError&);
    153         void didLoadResourceByXMLHttpRequest(unsigned long identifier, const ScriptString& sourceString);
    154146        const ResourceRequest& originalRequest() const;
    155147        const ResourceRequest& initialRequest() const;
    … …  
    398390
    399391        void dispatchDidCommitLoad();
    400         void dispatchAssignIdentifierToInitialRequest(unsigned long identifier, DocumentLoader*, const ResourceRequest&);
    401         void dispatchWillSendRequest(DocumentLoader*, unsigned long identifier, ResourceRequest&, const ResourceResponse& redirectResponse);
    402         void dispatchDidReceiveResponse(DocumentLoader*, unsigned long identifier, const ResourceResponse&);
    403         void dispatchDidReceiveContentLength(DocumentLoader*, unsigned long identifier, int length);
    404         void dispatchDidFinishLoading(DocumentLoader*, unsigned long identifier);
    405392
    406393        void loadWithDocumentLoader(DocumentLoader*, FrameLoadType, PassRefPtr<FormState>); // Calls continueLoadAfterNavigationPolicy
    … …  
    448435        mutable PolicyChecker m_policyChecker;
    449436        mutable HistoryController m_history;
     437        mutable ResourceLoadNotifier m_notifer;
    450438
    451439        FrameState m_state;

  • trunk/WebCore/loader/MainResourceLoader.cpp

    r49284 r49671  
    7878    if (!cancelled()) {
    7979        ASSERT(!reachedTerminalState());
    80         frameLoader()->didFailToLoad(this, error);
     80        frameLoader()->notifier()->didFailToLoad(this, error);
    8181       
    8282        releaseResources();

  • trunk/WebCore/loader/ResourceLoader.cpp

    r47916 r49671  
    204204        if (!m_identifier) {
    205205            m_identifier = m_frame->page()->progress()->createUniqueIdentifier();
    206             frameLoader()->assignIdentifierToInitialRequest(m_identifier, request);
     206            frameLoader()->notifier()->assignIdentifierToInitialRequest(m_identifier, request);
    207207        }
    208208
    209         frameLoader()->willSendRequest(this, request, redirectResponse);
     209        frameLoader()->notifier()->willSendRequest(this, request, redirectResponse);
    210210    }
    211211   
    … …  
    231231       
    232232    if (m_sendResourceLoadCallbacks)
    233         frameLoader()->didReceiveResponse(this, m_response);
     233        frameLoader()->notifier()->didReceiveResponse(this, m_response);
    234234}
    235235
    … …  
    251251    // Could be an issue with a giant local file.
    252252    if (m_sendResourceLoadCallbacks && m_frame)
    253         frameLoader()->didReceiveData(this, data, length, static_cast<int>(lengthReceived));
     253        frameLoader()->notifier()->didReceiveData(this, data, length, static_cast<int>(lengthReceived));
    254254}
    255255
    … …  
    285285    m_calledDidFinishLoad = true;
    286286    if (m_sendResourceLoadCallbacks)
    287         frameLoader()->didFinishLoad(this);
     287        frameLoader()->notifier()->didFinishLoad(this);
    288288}
    289289
    … …  
    302302
    303303    if (m_sendResourceLoadCallbacks && !m_calledDidFinishLoad)
    304         frameLoader()->didFailToLoad(this, error);
     304        frameLoader()->notifier()->didFailToLoad(this, error);
    305305
    306306    releaseResources();
    … …  
    331331    }
    332332    if (m_sendResourceLoadCallbacks && !m_calledDidFinishLoad)
    333         frameLoader()->didFailToLoad(this, error);
     333        frameLoader()->notifier()->didFailToLoad(this, error);
    334334
    335335    releaseResources();
    … …  
    434434    // anything including possibly derefing this; one example of this is Radar 3266216.
    435435    RefPtr<ResourceLoader> protector(this);
    436     frameLoader()->didReceiveAuthenticationChallenge(this, challenge);
     436    frameLoader()->notifier()->didReceiveAuthenticationChallenge(this, challenge);
    437437}
    438438
    … …  
    442442    // anything including possibly derefing this; one example of this is Radar 3266216.
    443443    RefPtr<ResourceLoader> protector(this);
    444     frameLoader()->didCancelAuthenticationChallenge(this, challenge);
     444    frameLoader()->notifier()->didCancelAuthenticationChallenge(this, challenge);
    445445}
    446446
Note: See TracChangeset for help on using the changeset viewer.