Make FindBestWindow faster when there are a lot of windows (many of which may be Firefox windows). (Bug 467635) r+sr=roc

widget/src/xremoteclient/XRemoteClient.cpp

@@ -460,7 +460,6 @@ XRemoteClient::FindBestWindow(const char *aProgram, const char *aUsername,
   Window bestWindow = 0;
   Window root2, parent, *kids;
   unsigned int nkids;
-  int i;
 
   // Get a list of the children of the root window, walk the list
   // looking for the best window that fits the criteria.
@@ -478,7 +477,7 @@ XRemoteClient::FindBestWindow(const char *aProgram, const char *aUsername,
   // We'll walk the list of windows looking for a window that best
   // fits the criteria here.
 
-  for (i=nkids-1; i >= 0; i--) {
+  for (unsigned int i = 0; i < nkids; i++) {
     Atom type;
     int format;
     unsigned long nitems, bytesafter;
@@ -591,9 +590,10 @@ XRemoteClient::FindBestWindow(const char *aProgram, const char *aUsername,
     // Check to see if the window supports the new command-line passing
     // protocol, if that is requested.
 
-    // If we got this far, this is the best window so far.  It passed
+    // If we got this far, this is the best window.  It passed
     // all the tests.
     bestWindow = w;
+    break;
   }
 
   if (kids)
@@ -699,8 +699,6 @@ XRemoteClient::DoSendCommandLine(Window aWindow, PRInt32 argc, char **argv,
                                  const char* aDesktopStartupID,
                                  char **aResponse, PRBool *aDestroyed)
 {
-  int i;
-
   *aDestroyed = PR_FALSE;
 
   char cwdbuf[MAX_PATH];
@@ -716,7 +714,7 @@ XRemoteClient::DoSendCommandLine(Window aWindow, PRInt32 argc, char **argv,
   static char desktopStartupPrefix[] = " DESKTOP_STARTUP_ID=";
 
   PRInt32 argvlen = strlen(cwdbuf);
-  for (i = 0; i < argc; ++i) {
+  for (int i = 0; i < argc; ++i) {
     PRInt32 len = strlen(argv[i]);
     if (i == 0 && aDesktopStartupID) {
       len += sizeof(desktopStartupPrefix) - 1 + strlen(aDesktopStartupID);