1287442 - Simplify the code in nsContentUtils::GetDocShellForEventTarget

Status: RESOLVED FIXED

(Core :: DOM: Events, defect)

Description

[Kartikaya Gupta (email:[e-mail])]

In bug 970346, I moved the function at [1] to nsContentUtils to reuse it in another place. During the review, bz commented that code could be simplified [2]. This is a follow-up bug to simplify the code. Quoting from bz's comment:

> So in all cases except the node->OwnerDoc() one you go through 
> nsPIDOMWindowInner, and even in that case you could have used 
> GetScriptHandlingObject, right?
> 
> And once you have a nsPIDOMWindowInner you can GetDocShell() on it directly 
> instead of going through GetExtantDoc....   Then again, I guess you just moved 
> this code.  Maybe a followup bug on simplifying it, just in case that actually 
> changes its behavior.

[1] http://searchfox.org/mozilla-central/rev/bfcc10319e4e3ce78367fa9bba9316f7eb5248b6/dom/events/EventListenerManager.cpp#1158
[2] https://bugzilla.mozilla.org/show_bug.cgi?id=970346#c48

Comment 1

[Boris Zbarsky [:bzbarsky]]

Olli, can you think of a reason to not do that?

Comment 2

[Olli Pettay [:smaug][[e-mail]]]

Going from inner window to docshell sounds ok to me. I guess I just didn't think of window->docshell route when reviewing bug 970346.

Comment 3

[Boris Zbarsky [:bzbarsky]]

Attachment: Simplify nsContentUtils::GetDocShellForEventTarget a bit

Comment 4

[Pulsebot]

Pushed by [e-mail]:
https://hg.mozilla.org/integration/mozilla-inbound/rev/33e19f0223e7
Simplify nsContentUtils::GetDocShellForEventTarget a bit.  r=smaug

Comment 5

[Carsten Book [:Tomcat]]

https://hg.mozilla.org/mozilla-central/rev/33e19f0223e7