(1) The document now checks the window for capture.

(2) Frames and iframes now know their nearest enclosing chrome shells.

content/base/src/nsDocument.cpp

@@ -2267,7 +2267,11 @@ nsresult nsDocument::HandleDOMEvent(nsIPresContext& aPresContext,
   
   //Capturing stage
   if (NS_EVENT_FLAG_BUBBLE != aFlags) {
-    //XXX Check window capture here
+    nsIScriptGlobalObject* mGlobal;
+    if (NS_OK == mScriptContextOwner->GetScriptGlobalObject(&mGlobal)) {
+      mGlobal->HandleDOMEvent(aPresContext, aEvent, aDOMEvent, NS_EVENT_FLAG_CAPTURE, aEventStatus);
+      NS_RELEASE(mGlobal);
+    }
   }
   
   //Local handling stage

layout/base/src/nsDocument.cpp

@@ -2267,7 +2267,11 @@ nsresult nsDocument::HandleDOMEvent(nsIPresContext& aPresContext,
   
   //Capturing stage
   if (NS_EVENT_FLAG_BUBBLE != aFlags) {
-    //XXX Check window capture here
+    nsIScriptGlobalObject* mGlobal;
+    if (NS_OK == mScriptContextOwner->GetScriptGlobalObject(&mGlobal)) {
+      mGlobal->HandleDOMEvent(aPresContext, aEvent, aDOMEvent, NS_EVENT_FLAG_CAPTURE, aEventStatus);
+      NS_RELEASE(mGlobal);
+    }
   }
   
   //Local handling stage

layout/generic/nsFrameFrame.cpp

@@ -790,6 +790,21 @@ nsHTMLFrameInnerFrame::CreateWebShell(nsIPresContext& aPresContext,
 		    // content.
 		    mWebShell->SetWebShellType(parentType);
       }
+
+      // Make sure all shells have links back to the outermost chrome
+      // shell.
+      nsCOMPtr<nsIWebShell> chromeShell;
+      outerShell->GetContainingChromeShell(getter_AddRefs(chromeShell));
+      if (!chromeShell)
+        chromeShell = dont_QueryInterface(outerShell);
+
+      // Make sure the outermost shell is chrome, and only set up
+      // this link if it is.
+      nsWebShellType chromeShellType;
+      chromeShell->GetWebShellType(chromeShellType);
+      if (chromeShellType == nsWebShellChrome)
+        mWebShell->SetContainingChromeShell(chromeShell);
+      
 #endif // INCLUDE_XUL 
 
       nsIPref*  outerPrefs = nsnull;  // connect the prefs

layout/html/document/src/nsFrameFrame.cpp

@@ -790,6 +790,21 @@ nsHTMLFrameInnerFrame::CreateWebShell(nsIPresContext& aPresContext,
 		    // content.
 		    mWebShell->SetWebShellType(parentType);
       }
+
+      // Make sure all shells have links back to the outermost chrome
+      // shell.
+      nsCOMPtr<nsIWebShell> chromeShell;
+      outerShell->GetContainingChromeShell(getter_AddRefs(chromeShell));
+      if (!chromeShell)
+        chromeShell = dont_QueryInterface(outerShell);
+
+      // Make sure the outermost shell is chrome, and only set up
+      // this link if it is.
+      nsWebShellType chromeShellType;
+      chromeShell->GetWebShellType(chromeShellType);
+      if (chromeShellType == nsWebShellChrome)
+        mWebShell->SetContainingChromeShell(chromeShell);
+      
 #endif // INCLUDE_XUL 
 
       nsIPref*  outerPrefs = nsnull;  // connect the prefs