475344 - Need a cancellation code to indicate successful load from cache

Status: RESOLVED FIXED

(Core :: Networking, defect)

Description

[[e-mail]]

Currently the code NS_IMAGELIB_ERROR_LOAD_ABORTED is handled specially in nsDocumentViewer to fire onload handlers even though the channel was cancelled (in this case because the image was in the image cache). The XUL prototype cache could do with this behaviour too; it currently works around it by providing a dummy channel that doesn't need to be aborted. See bug 206691.

Comment 1

[Christian :Biesinger (don't email me, ping me on IRC)]

I don't really like putting an error code into nsNetError that's not used by necko in any way. I'm not really sure what a better place would be though :/

uriloader might be low enough in the dependency tree, and it also doesn't seem entirely inappropriate to put it there.

Comment 2

[[e-mail]]

OK, so my #define now looks like this:

>diff uriloader/base/nsURILoader.h
>@@ 107,0 107,6 @@
>+
>+/**
>+ * Used when a load can be satisfied from a cache of decoded data,
>+ * rather than having to load from the original source or the network cache.
>+ */
>+#define NS_ERROR_something NS_ERROR_GENERATE_FAILURE(NS_ERROR_MODULE_URILOADER, something /*33?*/)

Comment 3

[Boris Zbarsky [:bzbarsky]]

nsURILoader.h is not exported.  You might want to just create a new header that is and put this in it.

We could call it NS_ERROR_PARSED_DATA_CACHED perhaps?

Comment 4

[[e-mail]]

Attachment: Proposed patch

Not sure who else I can ask for review here :-(

Comment 5

[Boris Zbarsky [:bzbarsky]]

Comment on attachment 361485 [details] [diff] [review]
Proposed patch

Yeah, this looks fine.

Comment 6

[[e-mail]]

Pushed changeset 1e74329357e3 to mozilla-central.

Comment 7

[Robert O'Callahan (:roc) (email my personal email if necessary)]

Comment on attachment 361485 [details] [diff] [review]
Proposed patch

I need this on branch for the media cache, which is P1...

Comment 8

[Robert O'Callahan (:roc) (email my personal email if necessary)]

Comment on attachment 361485 [details] [diff] [review]
Proposed patch

Actually, let me just cancel this request and use ImageErrors.h on branch.