Bug 30379 – Factor ResourceLoadNotifier out of FrameLoader

• Component: Page Loading
• Status: RESOLVED FIXED

[Adam Barth]

As discussed on webkit-dev.

[Adam Barth]

Created attachment 41210 [details]
Patch v1

[Adam Barth]

Created attachment 41211 [details]
Patch v1

[Darin Adler]

Comment on attachment 41211 [details]
Patch v1

>  void FrameLoader::sendRemainingDelegateMessages(unsigned long identifier, const ResourceResponse& response, int length, const ResourceError& error)

I'm surprised you left this function in FrameLoader. Seems to me it belongs in ResourceLoadNotifier, although you might have to add a document loader argument.

> @@ -3526,11 +3487,11 @@ void FrameLoader::requestFromDelegate(ResourceRequest& request, unsigned long& i

This function also seems to belong in ResourceLoadNotifier. I didn't look closely at other functions outside the patch.

> +void ResourceLoadNotifier::assignIdentifierToInitialRequest(unsigned long identifier, const ResourceRequest& clientRequest)
> +{
> +    dispatchAssignIdentifierToInitialRequest(identifier, activeDocumentLoader(), clientRequest);
> +}

We may want to consider passing the document loader here instead of having the notifier get the active document loader.

> +void ResourceLoadNotifier::didReceiveResponse(ResourceLoader* loader, const ResourceResponse& r)
> +{
> +    activeDocumentLoader()->addResponse(r);
> +
> +    if (Page* page = m_frame->page())
> +        page->progress()->incrementProgress(loader->identifier(), r);
> +
> +    dispatchDidReceiveResponse(loader->documentLoader(), loader->identifier(), r);
> +}

Here too, and then we could eliminate the activeDocumentLoader() function.

r=me

[Adam Barth]

Those are all good points.  If you don't mind, I'd like to handle them in a follow-up patch though.

[WebKit Commit Bot]

Comment on attachment 41211 [details]
Patch v1

Rejecting patch 41211 from commit-queue.

Patch https://bugs.webkit.org/attachment.cgi?id=41211 from bug 30379 failed to download and apply.

[Adam Barth]

Committed r49671: <http://trac.webkit.org/changeset/49671>

[Sam Weinig]

Please note for the future, that the style guidelines where recently updated and the contents inside a namespace in a header should no longer be indented.

[Adam Barth]

(In reply to comment #7)
> Please note for the future, that the style guidelines where recently updated
> and the contents inside a namespace in a header should no longer be indented.

Praise be to the style guide!