Backing out 399852 due to mac mochitest failures

git-svn-id: svn://10.0.0.236/trunk@243161 18797224-902f-48f8-a5cc-f745e15eee43

mozilla/layout/base/nsCSSFrameConstructor.cpp

@@ -66,7 +66,6 @@
 #include "nsIPresShell.h"
 #include "nsStyleSet.h"
 #include "nsIViewManager.h"
-#include "nsViewManager.h"
 #include "nsIEventStateManager.h"
 #include "nsIScrollableView.h"
 #include "nsStyleConsts.h"
@@ -380,26 +379,6 @@ static nsresult
 DeletingFrameSubtree(nsFrameManager* aFrameManager,
                      nsIFrame*       aFrame);
 
-void nsFocusEventSuppressor::Suppress(nsIPresShell *aPresShell)
-{
-  NS_ASSERTION(aPresShell, "Need non-null nsIPresShell!");
-  NS_ASSERTION(!mViewManager, "Suppress before a pending UnSuppress()");
-  nsFrameManager *frameManager = aPresShell->FrameManager();
-  mViewManager = frameManager->GetPresContext()->GetViewManager();
-  if (mViewManager) {
-    mOldSuppressState = mViewManager->GetSuppressFocusEvents();
-    mViewManager->SetSuppressFocusEvents(PR_TRUE);
-  }
-}
-
-void nsFocusEventSuppressor::Unsuppress()
-{
-  if (mViewManager) {
-    mViewManager->SetSuppressFocusEvents(mOldSuppressState);
-    mViewManager = nsnull;
-  }
-}
-
 #ifdef  MOZ_SVG
 
 static nsIFrame *
@@ -10258,14 +10237,6 @@ nsCSSFrameConstructor::AttributeChanged(nsIContent* aContent,
   return result;
 }
 
-void
-nsCSSFrameConstructor::BeginUpdate() {
-  if (!mUpdateCount) {
-    mFocusSuppressor.Suppress(mPresShell);
-  }
-  ++mUpdateCount;
-}
-
 void
 nsCSSFrameConstructor::EndUpdate()
 {
@@ -10275,8 +10246,6 @@ nsCSSFrameConstructor::EndUpdate()
 
     RecalcQuotesAndCounters();
     NS_ASSERTION(mUpdateCount == 1, "Odd update count");
-
-    mFocusSuppressor.Unsuppress();
   }
 
   --mUpdateCount;