From 3e465ca5edd5651829a63319a311471e29c2f3c0 Mon Sep 17 00:00:00 2001
From: Mats Palmgren <matspal@gmail.com>
Date: Tue, 29 May 2012 02:50:42 +0200
Subject: [PATCH] Bug 575294 - s/mFocused/sFocused/. part=4/4  r=smaug

---
 layout/forms/nsComboboxControlFrame.cpp | 12 ++++++------
 layout/forms/nsComboboxControlFrame.h   |  2 +-
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/layout/forms/nsComboboxControlFrame.cpp b/layout/forms/nsComboboxControlFrame.cpp
index 286004eb5b93..b6eda0287635 100644
--- a/layout/forms/nsComboboxControlFrame.cpp
+++ b/layout/forms/nsComboboxControlFrame.cpp
@@ -116,7 +116,7 @@ NS_IMPL_ISUPPORTS1(nsComboButtonListener,
                    nsIDOMEventListener)
 
 // static class data member for Bug 32920
-nsComboboxControlFrame * nsComboboxControlFrame::mFocused = nsnull;
+nsComboboxControlFrame* nsComboboxControlFrame::sFocused = nsnull;
 
 nsIFrame*
 NS_NewComboboxControlFrame(nsIPresShell* aPresShell, nsStyleContext* aContext, PRUint32 aStateFlags)
@@ -330,7 +330,7 @@ nsComboboxControlFrame::SetFocus(bool aOn, bool aRepaint)
   nsWeakFrame weakFrame(this);
   if (aOn) {
     nsListControlFrame::ComboboxFocusSet();
-    mFocused = this;
+    sFocused = this;
     if (mDelayedShowDropDown) {
       ShowDropDown(true); // might destroy us
       if (!weakFrame.IsAlive()) {
@@ -338,7 +338,7 @@ nsComboboxControlFrame::SetFocus(bool aOn, bool aRepaint)
       }
     }
   } else {
-    mFocused = nsnull;
+    sFocused = nsnull;
     mDelayedShowDropDown = false;
     if (mDroppedDown) {
       mListControlFrame->ComboboxFinish(mDisplayedIndex); // might destroy us
@@ -629,7 +629,7 @@ nsComboboxControlFrame::GetAvailableDropdownSpace(nscoord* aAbove,
                                                   nscoord* aBelow,
                                                   nsPoint* aTranslation)
 {
-  // Note: As first glance, it appears that you could simply get the absolute
+  // Note: At first glance, it appears that you could simply get the absolute
   // bounding box for the dropdown list by first getting its view, then getting
   // the view's nsIWidget, then asking the nsIWidget for its AbsoluteBounds.
   // The problem with this approach, is that the dropdown lists y location can
@@ -969,7 +969,7 @@ nsComboboxControlFrame::ShowDropDown(bool aDoDropDown)
   }
 
   if (!mDroppedDown && aDoDropDown) {
-    if (mFocused == this) {
+    if (sFocused == this) {
       DropDownPositionState state = AbsolutelyPositionDropDown();
       if (state == eDropDownPositionFinal) {
         ShowList(aDoDropDown); // might destroy us
@@ -1613,7 +1613,7 @@ void nsComboboxControlFrame::PaintFocus(nsRenderingContext& aRenderingContext,
 {
   /* Do we need to do anything? */
   nsEventStates eventStates = mContent->AsElement()->State();
-  if (eventStates.HasState(NS_EVENT_STATE_DISABLED) || mFocused != this)
+  if (eventStates.HasState(NS_EVENT_STATE_DISABLED) || sFocused != this)
     return;
 
   aRenderingContext.PushState();
diff --git a/layout/forms/nsComboboxControlFrame.h b/layout/forms/nsComboboxControlFrame.h
index 27fa522ed29a..dd8792ea85d6 100644
--- a/layout/forms/nsComboboxControlFrame.h
+++ b/layout/forms/nsComboboxControlFrame.h
@@ -281,7 +281,7 @@ protected:
 
   // static class data member for Bug 32920
   // only one control can be focused at a time
-  static nsComboboxControlFrame * mFocused;
+  static nsComboboxControlFrame* sFocused;
 
 #ifdef DO_REFLOW_COUNTER
   PRInt32 mReflowId;