From 03cc3bcefa8e95ddecf0df66929afcb9047ada2f Mon Sep 17 00:00:00 2001
From: Neil Deakin <enndeakin>
Date: Wed, 8 Apr 2015 08:38:00 +0200
Subject: [PATCH] Bug 1152290 - "[e10s] "<select>" doesn't show selected
 value". r=roc

--HG--
extra : rebase_source : c37303d508d4fdee0952059c14e79145a503bb7f
---
 layout/forms/nsListControlFrame.cpp | 14 ++++++++++----
 1 file changed, 10 insertions(+), 4 deletions(-)

diff --git a/layout/forms/nsListControlFrame.cpp b/layout/forms/nsListControlFrame.cpp
index dc9b6033f66c..f5b3aed0e371 100644
--- a/layout/forms/nsListControlFrame.cpp
+++ b/layout/forms/nsListControlFrame.cpp
@@ -1760,7 +1760,7 @@ nsListControlFrame::GetIndexFromDOMEvent(nsIDOMEvent* aMouseEvent,
   return NS_ERROR_FAILURE;
 }
 
-static void
+static bool
 FireShowDropDownEvent(nsIContent* aContent)
 {
   if (XRE_GetProcessType() == GeckoProcessType_Content &&
@@ -1768,7 +1768,10 @@ FireShowDropDownEvent(nsIContent* aContent)
     nsContentUtils::DispatchChromeEvent(aContent->OwnerDoc(), aContent,
                                         NS_LITERAL_STRING("mozshowdropdown"), true,
                                         false);
+    return true;
   }
+
+  return false;
 }
 
 nsresult
@@ -1818,7 +1821,9 @@ nsListControlFrame::MouseDown(nsIDOMEvent* aMouseEvent)
   } else {
     // NOTE: the combo box is responsible for dropping it down
     if (mComboboxFrame) {
-      FireShowDropDownEvent(mContent);
+      if (FireShowDropDownEvent(mContent)) {
+        return NS_OK;
+      }
 
       if (!IgnoreMouseEventForSelection(aMouseEvent)) {
         return NS_OK;
@@ -2059,8 +2064,9 @@ nsListControlFrame::DropDownToggleKey(nsIDOMEvent* aKeyEvent)
   if (IsInDropDownMode() && !nsComboboxControlFrame::ToolkitHasNativePopup()) {
     aKeyEvent->PreventDefault();
     if (!mComboboxFrame->IsDroppedDown()) {
-      FireShowDropDownEvent(mContent);
-      mComboboxFrame->ShowDropDown(true);
+      if (!FireShowDropDownEvent(mContent)) {
+        mComboboxFrame->ShowDropDown(true);
+      }
     } else {
       nsWeakFrame weakFrame(this);
       // mEndSelectionIndex is the last item that got selected.