516076 - document.commandDispatcher.getControllerForCommand looks in active window

Status: RESOLVED FIXED

(Core :: XUL, defect)

Description

[[e-mail]]

Under 1.9.1, document.commandDispatcher.getControllerForCommand always looked for the focused element within the same top-level window. However on trunk it looks for the focused element in the active window. For example, if a dialog calls a function in its opener, then it always checks the calling dialog's controller. Alternatively, if you step through goUpdateCommand using Venkman then it always checks Venkman's controllers.

Comment 1

[Neil Deakin]

Attachment: pass the window to the focus controller methods

I hope to get rid of the focus controller as it doesn't really have much in it anymore. For now, to fix the regression though, just pass a suitable context window to it's methods.

Comment 2

[Neil Deakin]

Also, this patch caused some contenteditable tests to fail when run on the try server. The fix for that is in nsFocusManager::WindowHidden included in this patch.

Comment 3

[[e-mail]]

Comment on attachment 400766 [details] [diff] [review]
pass the window to the focus controller methods

Works with my test cases.

>+  nsCOMPtr<nsPIDOMWindow> focusedWindow;
>+  nsIContent* focusedContent =
>+    GetRootFocusedContentAndWindow(aContextWindow, getter_AddRefs(focusedWindow));
>+  if (focusedContent) {
...
>+      nsIDocument* doc = focusedContent->GetOwnerDoc();
>+      nsCOMPtr<nsIDOMWindowInternal> domWindow = do_QueryInterface(doc->GetWindow());
Didn't GetRootFocusedContentAndWindow already get the right window?

Comment 4

[Neil Deakin]

> >+      nsIDocument* doc = focusedContent->GetOwnerDoc();
> >+      nsCOMPtr<nsIDOMWindowInternal> domWindow = do_QueryInterface(doc->GetWindow());
> Didn't GetRootFocusedContentAndWindow already get the right window?

I'll remove those lines and just refer to focusedWindow instead.

Comment 5

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

Comment on attachment 400766 [details] [diff] [review]
pass the window to the focus controller methods

> // 2879DB1C-47AA-46C4-B184-2590CC39F262
> #define NS_IFOCUSCONTROLLER_IID \
> { 0x2879db1c, 0x47aa, 0x46c4, \
>   { 0xb1, 0x84, 0x25, 0x90, 0xcc, 0x39, 0xf2, 0x62 } }
You should update the IID

Comment 6

[Neil Deakin]

http://hg.mozilla.org/mozilla-central/rev/ccb1560bb97c

Comment 7

[Neil Deakin]

Comment on attachment 400766 [details] [diff] [review]
pass the window to the focus controller methods

Regression so could affect some extensions.

Comment 8

[Dão Gottwald [:dao]]

http://hg.mozilla.org/releases/mozilla-1.9.2/rev/edde3db42b51