From 2f449323dfe9d11493232f2004801b20b897c935 Mon Sep 17 00:00:00 2001
From: "sfraser%netscape.com" <sfraser%netscape.com>
Date: Sat, 12 Apr 2003 03:03:27 +0000
Subject: [PATCH] Fix for bug 201400: move the "accessibility.browsewithcaret"
 pref observer to the nsEventStateManager, to remove it from the
 DOMWindowController. Patch by brade/sfraser, r=aaronl, sr=sfraser.

---
 content/events/src/nsEventStateManager.cpp | 33 +++++++++++++++++++---
 content/events/src/nsEventStateManager.h   |  1 +
 2 files changed, 30 insertions(+), 4 deletions(-)

diff --git a/content/events/src/nsEventStateManager.cpp b/content/events/src/nsEventStateManager.cpp
index e9f5bf51ce45..c3693baa7de3 100644
--- a/content/events/src/nsEventStateManager.cpp
+++ b/content/events/src/nsEventStateManager.cpp
@@ -46,6 +46,7 @@
 #include "nsIWidget.h"
 #include "nsIPresContext.h"
 #include "nsIPresShell.h"
+#include "nsIPrefBranchInternal.h"
 #include "nsDOMEvent.h"
 #include "nsHTMLAtoms.h"
 #include "nsIFormControl.h"
@@ -154,8 +155,8 @@ nsEventStateManager::nsEventStateManager()
   : mGestureDownPoint(0,0),
     mCurrentFocusFrame(nsnull),
     m_haveShutdown(PR_FALSE),
-    mDOMEventLevel(0),
-    mClearedFrameRefsDuringEvent(PR_FALSE)
+    mClearedFrameRefsDuringEvent(PR_FALSE),
+    mDOMEventLevel(0)
 {
   mLastMouseOverFrame = nsnull;
   mLastDragOverFrame = nsnull;
@@ -209,6 +210,10 @@ nsEventStateManager::Init()
       mPrefBranch->GetIntPref("ui.key.generalAccessKey",
                               &nsEventStateManager::gGeneralAccesskeyModifier);
     }
+
+    nsCOMPtr<nsIPrefBranchInternal> prefBranchInt(do_QueryInterface(mPrefBranch));
+    if (prefBranchInt)
+      prefBranchInt->AddObserver("accessibility.browsewithcaret", this, PR_TRUE);
   }
 
   if (nsEventStateManager::sTextfieldSelectModel == eTextfieldSelect_unset) {
@@ -264,6 +269,10 @@ nsEventStateManager::~nsEventStateManager()
 nsresult
 nsEventStateManager::Shutdown()
 {
+  nsCOMPtr<nsIPrefBranchInternal> prefBranchInt(do_QueryInterface(mPrefBranch));
+  if (prefBranchInt)
+    prefBranchInt->RemoveObserver("accessibility.browsewithcaret", this);
+  
   mPrefBranch = nsnull;
 
   m_haveShutdown = PR_TRUE;
@@ -293,7 +302,13 @@ nsEventStateManager::Observe(nsISupports *aSubject,
 {
   if (!nsCRT::strcmp(aTopic, NS_XPCOM_SHUTDOWN_OBSERVER_ID))
     Shutdown();
-
+  else if (!nsCRT::strcmp(aTopic, NS_PREFBRANCH_PREFCHANGE_TOPIC_ID)) {
+    if (someData && nsDependentString(someData).Equals(NS_LITERAL_STRING("accessibility.browsewithcaret"))) {
+      PRBool browseWithCaret;
+      ResetBrowseWithCaret(&browseWithCaret);
+    }
+  }
+  
   return NS_OK;
 }
 
@@ -4994,6 +5009,15 @@ nsresult nsEventStateManager::SetContentCaretVisible(nsIPresShell* aPresShell, n
   return NS_OK;
 }
 
+
+NS_IMETHODIMP
+nsEventStateManager::GetBrowseWithCaret(PRBool *aBrowseWithCaret)
+{
+  NS_ENSURE_ARG_POINTER(aBrowseWithCaret);
+  *aBrowseWithCaret = mBrowseWithCaret;
+  return NS_OK;
+}
+
 NS_IMETHODIMP
 nsEventStateManager::ResetBrowseWithCaret(PRBool *aBrowseWithCaret)
 {
@@ -5001,7 +5025,8 @@ nsEventStateManager::ResetBrowseWithCaret(PRBool *aBrowseWithCaret)
   // or when a document gets focused 
 
   *aBrowseWithCaret = PR_FALSE;
-
+  if (!mPresContext) return NS_ERROR_FAILURE;
+  
   nsCOMPtr<nsISupports> pcContainer;
   mPresContext->GetContainer(getter_AddRefs(pcContainer));
   PRInt32 itemType;
diff --git a/content/events/src/nsEventStateManager.h b/content/events/src/nsEventStateManager.h
index 5f877d4c49b3..5c927974f81d 100644
--- a/content/events/src/nsEventStateManager.h
+++ b/content/events/src/nsEventStateManager.h
@@ -149,6 +149,7 @@ public:
 
   NS_IMETHOD ShiftFocus(PRBool aForward, nsIContent* aStart=nsnull);
 
+  NS_IMETHOD GetBrowseWithCaret(PRBool *aBrowseWithCaret);
   NS_IMETHOD ResetBrowseWithCaret(PRBool *aBrowseWithCaret);
 
   NS_IMETHOD MoveFocusToCaret(PRBool aCanFocusDoc, PRBool *aIsSelectionWithFocus);