mozilla-central: changeset 122684:d9bdd0a18d7812787bdb1517009cdf5e07112d81

author	Timothy Nikkel <tnikkel@gmail.com>
	Fri, 22 Feb 2013 01:38:06 -0600
changeset 122684	d9bdd0a18d7812787bdb1517009cdf5e07112d81
parent 122683	3075a93108fb798871ce0db6da9ca56779b1b8b3
child 122685	c46476d3892a8669c4e3085c411b61c29c3f8862
push id	24356
push user	gszorc@mozilla.com
push date	Sun, 24 Feb 2013 01:00:12 +0000
treeherder	mozilla-central@195e706140d1 [default view] [failures only]
perfherder	[talos] [build metrics] [platform microbench] (compared to previous push)
reviewers	mattwoodrow
bugs	843979
milestone	22.0a1
first release with	nightly linux32 195e706140d1 / 22.0a1 / 20130224031053 / files nightly linux64 195e706140d1 / 22.0a1 / 20130224031053 / files nightly mac 195e706140d1 / 22.0a1 / 20130224031053 / files nightly win32 195e706140d1 / 22.0a1 / 20130224031053 / files nightly win64 195e706140d1 / 22.0a1 / 20130224031053 / files
last release without	nightly linux32 885cde564ff3 / 22.0a1 / 20130222031133 / files nightly linux64 885cde564ff3 / 22.0a1 / 20130222031133 / files nightly mac 885cde564ff3 / 22.0a1 / 20130222031133 / files nightly win32 885cde564ff3 / 22.0a1 / 20130222031133 / files nightly win64 885cde564ff3 / 22.0a1 / 20130222031133 / files

--- a/layout/forms/nsListControlFrame.cpp
+++ b/layout/forms/nsListControlFrame.cpp
@@ -1011,17 +1011,19 @@ nsListControlFrame::Init(nsIContent*    
   mContent->AddEventListener(NS_LITERAL_STRING("mousemove"), mEventListener,
                              false, false);
 
   mStartSelectionIndex = kNothingSelected;
   mEndSelectionIndex = kNothingSelected;
 
   mLastDropdownBackstopColor = PresContext()->DefaultBackgroundColor();
 
-  AddStateBits(NS_FRAME_IN_POPUP);
+  if (IsInDropDownMode()) {
+    AddStateBits(NS_FRAME_IN_POPUP);
+  }
 
   return result;
 }
 
 already_AddRefed<nsIContent> 
 nsListControlFrame::GetOptionAsContent(nsIDOMHTMLOptionsCollection* aCollection, int32_t aIndex) 
 {
   nsIContent * content = nullptr;