720799 - Don't use mDocShell in nsScreen

Status: RESOLVED FIXED

(Core :: DOM: Core & HTML, defect)

Description

[Mounir Lamouri (:mounir)]

Attachment: Patch

Comment 1

[Johnny Stenback (:jst)]

Comment on attachment 591223 [details] [diff] [review]
Patch

-  screen->mDocShell = aWindow->GetDocShell();
+  screen->mIsChrome = IsChromeType(aWindow->GetDocShell);

r=jst if you make that line actually compile :)

The rest looks good!

Comment 2

[Mounir Lamouri (:mounir)]

Comment on attachment 591223 [details] [diff] [review]
Patch

Pushed with a compiling patch :)

Comment 3

[Ed Morley [:emorley]]

Backed out of inbound since it conflicted with the prior push, which failed to build on all platforms:
https://tbpl.mozilla.org/?tree=Mozilla-Inbound&rev=4a763183482f

https://hg.mozilla.org/integration/mozilla-inbound/rev/c4c7eaaeec91

Comment 4

[Ed Morley [:emorley]]

Relanded, but the push had to be backed out again for bustage:
https://tbpl.mozilla.org/?tree=Mozilla-Inbound&rev=1ca8d5a931ac

https://hg.mozilla.org/integration/mozilla-inbound/rev/33ffd55f2dfe

Please can this/the rest of the push be run on try before landing a third time :-)

Comment 5

[Mounir Lamouri (:mounir)]

Attachment: Update to current tip

Justin did some changes that broke that patch... So I guess he will be glad to review the changes I had to do :)

Comment 6

[Justin Lebar (not reading bugmail)]

(In reply to Mounir Lamouri (:volkmar) (:mounir) from comment #5)
> Justin did some changes that broke that patch... So I guess he will be glad
> to review the changes I had to do :)

Sure!  But which changes broke you, exactly?  The last time I touched nsScreen.cpp was Dec 5.

Comment 7

[Justin Lebar (not reading bugmail)]

Maybe it's bug 729430 (which I reviewed)?

Comment 8

[Mounir Lamouri (:mounir)]

Yes, indeed. You did review that bug so you can obviously review this one :)

Comment 9

[Justin Lebar (not reading bugmail)]

Comment on attachment 605802 [details] [diff] [review]
Update to current tip

> +  if (!sAllowScreenEnabledProperty || !(mIsChrome || IsWhiteListed(GetOwner()))) {

Would you mind changing this to

 if (!sAllowScreenEnabledProperty || IsWhiteListed())

and making IsWhiteListed a member function which calls GetOwner() and checks mIsChrome?

Comment 10

[Mounir Lamouri (:mounir)]

Attachment: Update to current tip

Comment 11

[Justin Lebar (not reading bugmail)]

> +  nsCOMPtr<nsIDocument> doc = do_GetInterface(GetOwner()->GetDocShell());
> +  nsIPrincipal *principal = doc->NodePrincipal();

doc can't be null?

Comment 12

[Mounir Lamouri (:mounir)]

(In reply to Justin Lebar [:jlebar] from comment #11)
> > +  nsCOMPtr<nsIDocument> doc = do_GetInterface(GetOwner()->GetDocShell());
> > +  nsIPrincipal *principal = doc->NodePrincipal();
> 
> doc can't be null?

The code I'm moving is assuming that. Did you review the first patch without checking? :)

Comment 13

[Justin Lebar (not reading bugmail)]

(In reply to Mounir Lamouri (:volkmar) (:mounir) from comment #12)
> (In reply to Justin Lebar [:jlebar] from comment #11)
> > > +  nsCOMPtr<nsIDocument> doc = do_GetInterface(GetOwner()->GetDocShell());
> > > +  nsIPrincipal *principal = doc->NodePrincipal();
> > 
> > doc can't be null?
> 
> The code I'm moving is assuming that. Did you review the first patch without
> checking? :)

So it would seem...

Comment 14

[Mounir Lamouri (:mounir)]

I've added a null-check because it doesn't seem obvious that |doc| can never be null. Even |GetDocShell()| isn't guaranteed to not return null and the QI isn't guaranteed to succeed. Maybe it will always work in practice but better to be in the safe side here.

Comment 15

[Phil Ringnalda (:philor)]

https://hg.mozilla.org/mozilla-central/rev/38a71ae7e06d

Comment 16

[Mark Finkle (:mfinkle) (use needinfo?)]

I backed this out along with all the other patches in the initial push. Something in the push regressed Ts on Android by 20% and I don't know which patch is to blame:

https://hg.mozilla.org/mozilla-central/rev/e94edfdb1f5b

Regression Ts increase 20.6% on Android 2.2 Mozilla-Inbound
--------------------------------------------------------------
    Previous: avg 2653.656 stddev 87.856 of 30 runs up to revision 1239bd0779a6
    New     : avg 3201.178 stddev 110.202 of 5 runs since revision 0d61a0d8dba4
    Change  : +547.522 (20.6% / z=6.232)
    Graph   : http://mzl.la/zD3EWy

Comment 17

[Marco Bonardo [:mak]]

https://hg.mozilla.org/mozilla-central/rev/64c0ad726111