Closed Bug 245280 Opened 20 years ago Closed 20 years ago

backport bug 191839 (nsIContentPolicy) to aviary branch

Categories

(Thunderbird :: General, defect)

defect
Not set
normal

Tracking

(Not tracked)

RESOLVED FIXED
Thunderbird0.8

People

(Reporter: mconnor, Assigned: mconnor)

References

Details

Attachments

(1 file)

this is needed to do better content blocking for remote loads.  Unfortunately,
the relicensing project means the patch against trunk bails on 3/4 of the files,
so this will have to be merged and tested by hand.  Not in the next couple days,
but will be done.
thanks a lot for taking this on Mike.

Hooking up some dependencies.
Blocks: 216133
No longer blocks: 216133
Blocks: 216133
Mike, do you have a rough ETA on when you think you'll have a chance to port this?
by the end of the week definitely, was hoping to be done tomorrow.
Mike, do you have a patch for this already? Otherwise I might try to take a stab
at it this weekend...
scott, I was hoping to have it done by tomorrow morning myself.  I got sort of
tied up with a paid project, but I'm pretty much done that now and I'm clearing
my backlog tonight and tomorrow.
excellent! I'll hold off then.
I hope you don't mind but I took a cut at back porting the changes this morning
:)

Here's what I came up with.
sweet, thanks!  my work project has turned into an episode of Columbo "Just one
more thing" so I haven't done any hacking on Moz in a week or more :(

I took a quick look,  everything looks good except the vim modelines, which I
don't think we have most places.  (i.e. +// vim: ft=cpp sw=2 ts=2 tw=78 et)
heh...:(

I didn't think we needed the vim comments. I wasn't sure why they were in the
original patch anyway. That looks like some special editor specific piece of
information. 
fixed
Status: NEW → RESOLVED
Closed: 20 years ago
Resolution: --- → FIXED
Target Milestone: --- → Thunderbird0.8
yeah, vim modelines basically exist to tell vim tab spacing, syntax stuff, etc.

they sneak into patches that are written by vi users a lot :)
> Index: content/html/style/src/nsCSSValue.cpp
> ===================================================================
> @@ -377,7 +377,7 @@
>      : (PRInt32)nsIRequest::LOAD_BACKGROUND;
>  
>    if (mURI &&
> -      NS_SUCCEEDED(nsContentUtils::CanLoadImage(mURI, nsnull, aDocument))) {
> +      nsContentUtils::CanLoadImage(mURI, nsnull, aDocument)) {

This seems to be a port of the patch for bug 243948. However, what bz actually
checked in was this:

+      nsContentUtils::CanLoadImage(mURI, aDocument, aDocument)) {

I think this should be changed on the aviary branch as well, a null context
isn't nice.
Note: this never landed on 1.7 branch, so now we have incompatible nsIContentPolicy 
apis on the branches....
You need to log in before you can comment on or make changes to this bug.

Attachment

General

Created:
Updated:
Size: