backport bug 191839 (nsIContentPolicy) to aviary branch

RESOLVED FIXED in Thunderbird0.8

Status

RESOLVED FIXED
15 years ago
14 years ago

People

(Reporter: mconnor, Assigned: mconnor)

Tracking

unspecified
Thunderbird0.8

Firefox Tracking Flags

(Not tracked)

Details

Attachments

(1 attachment)

(Assignee)

Description

15 years ago
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.

Comment 1

15 years ago
thanks a lot for taking this on Mike.

Hooking up some dependencies.
Blocks: 216133

Updated

15 years ago
No longer blocks: 216133

Updated

15 years ago
Blocks: 216133

Comment 2

15 years ago
Mike, do you have a rough ETA on when you think you'll have a chance to port this?
(Assignee)

Comment 3

15 years ago
by the end of the week definitely, was hoping to be done tomorrow.

Comment 4

15 years ago
Mike, do you have a patch for this already? Otherwise I might try to take a stab
at it this weekend...
(Assignee)

Comment 5

15 years ago
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.

Comment 6

15 years ago
excellent! I'll hold off then.

Comment 7

15 years ago
Created attachment 152038 [details] [diff] [review]
the patch for the aviary 1.0 branch

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.
(Assignee)

Comment 8

15 years ago
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)

Comment 9

15 years ago
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. 

Comment 10

15 years ago
fixed
Status: NEW → RESOLVED
Last Resolved: 15 years ago
Resolution: --- → FIXED
Target Milestone: --- → Thunderbird0.8
(Assignee)

Comment 11

15 years ago
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 :)

Comment 12

14 years ago
> 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.