From 4a7d6d233fbc202d7e0cd6a7f744313de97917f8 Mon Sep 17 00:00:00 2001
From: Alexander Surkov <surkov.alexander@gmail.com>
Date: Wed, 23 Nov 2011 20:50:33 +0800
Subject: [PATCH] Bug 703198 - JAWS doesn't announce combobox navigation in
 collapsed combobox, perf version, r=marcoz

---
 accessible/src/msaa/nsAccessibleWrap.cpp | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/accessible/src/msaa/nsAccessibleWrap.cpp b/accessible/src/msaa/nsAccessibleWrap.cpp
index d1e301decdb..81e65ebbe12 100644
--- a/accessible/src/msaa/nsAccessibleWrap.cpp
+++ b/accessible/src/msaa/nsAccessibleWrap.cpp
@@ -1589,11 +1589,10 @@ nsAccessibleWrap::FirePlatformEvent(AccEvent* aEvent)
   NotifyWinEvent(winEvent, hWnd, OBJID_CLIENT, childID);
 
   // JAWS announces collapsed combobox navigation based on focus events.
-  if (nsWinUtils::IsWindowEmulationFor(kJAWSModuleHandle)) {
-    if (eventType == nsIAccessibleEvent::EVENT_SELECTION &&
-      accessible->Role() == nsIAccessibleRole::ROLE_COMBOBOX_OPTION) {
-      NotifyWinEvent(EVENT_OBJECT_FOCUS, hWnd, OBJID_CLIENT, childID);
-    }
+  if (eventType == nsIAccessibleEvent::EVENT_SELECTION &&
+      accessible->Role() == nsIAccessibleRole::ROLE_COMBOBOX_OPTION &&
+      nsWinUtils::IsWindowEmulationFor(kJAWSModuleHandle)) {
+    NotifyWinEvent(EVENT_OBJECT_FOCUS, hWnd, OBJID_CLIENT, childID);
   }
   return NS_OK;
 }