fix for 28467, a=jar, r=hyatt

content/xul/document/src/nsXULCommandDispatcher.cpp

@@ -53,7 +53,8 @@ static PRLogModuleInfo* gLog;
 ////////////////////////////////////////////////////////////////////////
 
 nsXULCommandDispatcher::nsXULCommandDispatcher(void)
-    : mScriptObject(nsnull), mUpdaters(nsnull), mSuppressFocus(PR_FALSE)
+    : mScriptObject(nsnull), mUpdaters(nsnull), mSuppressFocus(PR_FALSE), 
+	mActive(PR_FALSE), mFocusInitialized(PR_FALSE)
 {
 	NS_INIT_REFCNT();
 
@@ -575,3 +576,23 @@ nsXULCommandDispatcher::SetSuppressFocus(PRBool aSuppressFocus)
   mSuppressFocus = aSuppressFocus;
   return NS_OK;
 }
+
+NS_IMETHODIMP
+nsXULCommandDispatcher::GetActive(PRBool* aActive)
+{
+  //if(!mFocusInitialized)
+  //  return PR_TRUE;
+
+  *aActive = mActive;
+  return NS_OK;
+}
+
+NS_IMETHODIMP
+nsXULCommandDispatcher::SetActive(PRBool aActive)
+{
+  if(!mFocusInitialized)
+    mFocusInitialized = PR_TRUE;
+
+  mActive = aActive;
+  return NS_OK;
+}

content/xul/document/src/nsXULCommandDispatcher.h

@@ -86,6 +86,8 @@ protected:
     nsCOMPtr<nsIDOMWindow> mCurrentWindow; // [OWNER]
 
     PRBool mSuppressFocus;
+	PRBool mActive;
+	PRBool mFocusInitialized;
 
     class Updater {
     public:

rdf/content/src/nsXULCommandDispatcher.cpp

@@ -53,7 +53,8 @@ static PRLogModuleInfo* gLog;
 ////////////////////////////////////////////////////////////////////////
 
 nsXULCommandDispatcher::nsXULCommandDispatcher(void)
-    : mScriptObject(nsnull), mUpdaters(nsnull), mSuppressFocus(PR_FALSE)
+    : mScriptObject(nsnull), mUpdaters(nsnull), mSuppressFocus(PR_FALSE), 
+	mActive(PR_FALSE), mFocusInitialized(PR_FALSE)
 {
 	NS_INIT_REFCNT();
 
@@ -575,3 +576,23 @@ nsXULCommandDispatcher::SetSuppressFocus(PRBool aSuppressFocus)
   mSuppressFocus = aSuppressFocus;
   return NS_OK;
 }
+
+NS_IMETHODIMP
+nsXULCommandDispatcher::GetActive(PRBool* aActive)
+{
+  //if(!mFocusInitialized)
+  //  return PR_TRUE;
+
+  *aActive = mActive;
+  return NS_OK;
+}
+
+NS_IMETHODIMP
+nsXULCommandDispatcher::SetActive(PRBool aActive)
+{
+  if(!mFocusInitialized)
+    mFocusInitialized = PR_TRUE;
+
+  mActive = aActive;
+  return NS_OK;
+}

rdf/content/src/nsXULCommandDispatcher.h

@@ -86,6 +86,8 @@ protected:
     nsCOMPtr<nsIDOMWindow> mCurrentWindow; // [OWNER]
 
     PRBool mSuppressFocus;
+	PRBool mActive;
+	PRBool mFocusInitialized;
 
     class Updater {
     public: