From 8d4a14a8f18a2d3a3fd7d1bcf93493208784151a Mon Sep 17 00:00:00 2001
From: "neil%parkwaycc.co.uk"
 <neil%parkwaycc.co.uk@18797224-902f-48f8-a5cc-f745e15eee43>
Date: Fri, 12 May 2006 22:58:10 +0000
Subject: [PATCH] Only create key handlers for <key> elements b=336740 r=bryner
 sr=bz

git-svn-id: svn://10.0.0.236/trunk@196428 18797224-902f-48f8-a5cc-f745e15eee43
---
 .../content/xbl/src/nsXBLWindowKeyHandler.cpp | 25 ++++++++++---------
 1 file changed, 13 insertions(+), 12 deletions(-)

diff --git a/mozilla/content/xbl/src/nsXBLWindowKeyHandler.cpp b/mozilla/content/xbl/src/nsXBLWindowKeyHandler.cpp
index 1d64afc3283..8eb541c8d31 100644
--- a/mozilla/content/xbl/src/nsXBLWindowKeyHandler.cpp
+++ b/mozilla/content/xbl/src/nsXBLWindowKeyHandler.cpp
@@ -81,23 +81,24 @@ NS_IMPL_ISUPPORTS2(nsXBLWindowKeyHandler,
 static void
 BuildHandlerChain(nsIContent* aContent, nsXBLPrototypeHandler** aResult)
 {
-  nsXBLPrototypeHandler *firstHandler = nsnull, *currHandler = nsnull;
+  *aResult = nsnull;
 
-  PRUint32 handlerCount = aContent->GetChildCount();
-  for (PRUint32 j = 0; j < handlerCount; j++) {
-    nsIContent *handler = aContent->GetChildAt(j);
+  // Since we chain each handler onto the next handler,
+  // we'll enumerate them here in reverse so that when we
+  // walk the chain they'll come out in the original order
+  for (PRUint32 j = aContent->GetChildCount(); j--; ) {
+    nsIContent *key = aContent->GetChildAt(j);
 
-    nsXBLPrototypeHandler* newHandler = new nsXBLPrototypeHandler(handler);
+    if (key->NodeInfo()->Equals(nsXBLAtoms::key, kNameSpaceID_XUL)) {
+      nsXBLPrototypeHandler* handler = new nsXBLPrototypeHandler(key);
 
-    if (newHandler) {
-      if (currHandler)
-        currHandler->SetNextHandler(newHandler);
-      else firstHandler = newHandler;
-      currHandler = newHandler;
+      if (!handler)
+        return;
+
+      handler->SetNextHandler(*aResult);
+      *aResult = handler;
     }
   }
-
-  *aResult = firstHandler;
 }
 
 //