254510 - Bug 200433 regressed by patch in bug 253597

Status: RESOLVED FIXED

(Core :: Graphics: Image Blocking, defect)

Description

[Boris Zbarsky [:bzbarsky]]

The patch in bug 253597 regressed the fix from bug 200433 (the ShouldProcess
never blocks anything now).  See bug 253597 comment 9 for more information.

It'd be nice to fix this before next week's freeze...

Comment 1

[Michiel van Leeuwen (email: mvl+moz@)]

Attachment: patch v1

This bug only affects third-party checks. So the testcase in bug 253597 doesn't
work.
The patch gets the documentURI from the node if the uri is null. It's done in
nsImgManager. I'm not sure if it should be moved up, into nsContentPolicy or
something.
I hope my use of nsCOMptr vs normal pointers is ok.

Comment 2

[Johnny Stenback (:jst)]

Comment on attachment 156986 [details] [diff] [review]
patch v1

r=jst

Comment 3

[Boris Zbarsky [:bzbarsky]]

I'd put this in nsContentPolicy so all content policy impls benefit from it...

Comment 4

[Michiel van Leeuwen (email: mvl+moz@)]

Attachment: alternative patch

moved code into nsContentPolicy

Comment 5

[Boris Zbarsky [:bzbarsky]]

Comment on attachment 157511 [details] [diff] [review]
alternative patch

>Index: content/base/src/nsContentPolicy.cpp
>+        nsIDocument *doc = node->GetOwnerDoc();

Make that an nsCOMPtr and toss in:

if (!doc) {
  doc = do_QueryInteface(requestingContext);
}

With that, sr=bzbarsky

Comment 6

[Michiel van Leeuwen (email: mvl+moz@)]

Comment on attachment 157511 [details] [diff] [review]
alternative patch

carrying review forward

Comment 7

[Michiel van Leeuwen (email: mvl+moz@)]

patch checked in (updated to bz's comments)