471981 - clean up window mediator initialization

Status: RESOLVED FIXED

(Core :: General, defect)

Description

[Josh Aas]

nsWindowMediator has a strange initialization system, we should clean it up to use a standard Init process for xpcom services. Same goes for the class nsAbout.

Comment 1

[Josh Aas]

Attachment: fix v1.0

Comment 2

[[e-mail]]

Comment on attachment 355228 [details] [diff] [review]
fix v1.0

I wasn't actually sure that some of the changes belong in this bug. Also I couldn't get the patch to apply locally.

>+0x1f1ce501, 0x663a, 0x11d3, { 0xb7, 0xa0, 0xbe, 0x42, 0x6e, 0x4e, 0x69, 0xbc } \

>-0x1f1ce501, 0x663a, 0x11d3, { 0xb7, 0xa0, 0xbe, 0x42, 0x6e, 0x4e, 0x69, 0xbc } \
[I wondered why this line moved]

>-#endif // nsAboutBlank_h__
>+#endif // nsAboutBlank_h_
[Actually the #define is nsAbout_h_]

>-PRInt32 nsWindowMediator::gRefCnt = 0;
You didn't remove the declaration.

>-    return enumerator->QueryInterface(NS_GET_IID(nsISimpleEnumerator), (void**) _retval);
>+    return enumerator->QueryInterface(NS_GET_IID(nsISimpleEnumerator), (void**)_retval);
[return CallQueryInterface(enumerator, _retval);]

Comment 3

[Josh Aas]

You probably can't apply the patch because I modified this file a day ago and your source isn't new enough. New patch coming up.

Comment 4

[Josh Aas]

Attachment: fix v1.1

Comment 5

[Josh Aas]

Attachment: fix v1.2

I don't see anything that actually uses nsAbout, so this patch just removes it altogether instead of fixing it up.

Comment 6

[[e-mail]]

Comment on attachment 355256 [details] [diff] [review]
fix v1.2

about: uses it...

Comment 7

[[e-mail]]

Comment on attachment 355236 [details] [diff] [review]
fix v1.1

>+  while (mOldestWindow)
>+    UnregisterWindow(mOldestWindow);
>+  
Nit: spaces crept on to this blank line

>   nsAppShellWindowEnumerator *enumerator;
>   if (aFrontToBack)
>     enumerator = new nsASDOMWindowFrontToBackEnumerator(aWindowType, *this);
>   else
>     enumerator = new nsASDOMWindowBackToFrontEnumerator(aWindowType, *this);
>   if (enumerator)
>-    return enumerator->QueryInterface(NS_GET_IID(nsISimpleEnumerator), (void**) _retval);
>+    return CallQueryInterface(enumerator, _retval);
> 
>   return NS_ERROR_OUT_OF_MEMORY;
Hmm... there's more than one way to return an enumerator, and the original code was pretty crummy anyway, and I should have noticed that before ;-)

Comment 8

[Josh Aas]

You're right, that URL does use nsAbout - but how? I don't see any references to that class, and Gecko compiles fine without it.

Comment 9

[Robert O'Callahan (:roc) (email my personal email if necessary)]

The about: protocol handler loads it by contract ID.

Comment 10

[Josh Aas]

pushed to trunk

http://hg.mozilla.org/mozilla-central/rev/3800877d845a