Fixing typos in comments, and a adding a change that got lost in the merge of the patch for bug 252326 when it was merged from the aviary branch.

dom/public/base/nsPIDOMWindow.h

@@ -50,7 +50,7 @@
 #include "nsCOMPtr.h"
 
 // Popup control state enum. The values in this enum must go from most
-// permissive to least permissive so that its safe to push state in
+// permissive to least permissive so that it's safe to push state in
 // all situations. Pushing popup state onto the stack never makes the
 // current popup state less permissive (see
 // GlobalWindowImpl::PushPopupControlState()).
@@ -177,7 +177,9 @@ public:
 #endif
 
 protected:
-  nsPIDOMWindow *mWindow; // WEAK
+#ifndef _IMPL_NS_LAYOUT
+  nsCOMPtr<nsPIDOMWindow> mWindow;
+#endif
   PopupControlState mOldState;
 
 private:

dom/src/base/nsGlobalWindow.cpp

@@ -4881,7 +4881,7 @@ GlobalWindowImpl::RunTimeout(nsTimeoutImpl *aTimeout)
     mRunningTimeout = timeout;
     timeout->mRunning = PR_TRUE;
 
-    // Push this timeouts popup control state, which should only be
+    // Push this timeout's popup control state, which should only be
     // eabled the first time a timeout fires that was created while
     // popups were enabled and with a delay less than
     // "dom.disable_open_click_delay".