From 38a60197ca7f0b4390fb17c94a3e1b4998c17f34 Mon Sep 17 00:00:00 2001 From: Jim Mathies Date: Fri, 5 Apr 2013 05:33:41 -0500 Subject: [PATCH] Bug 855232 - don't send native msaa accessible events when running in metro, it messes up soft keyboard display. r=dbolter --- accessible/src/windows/msaa/AccessibleWrap.cpp | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/accessible/src/windows/msaa/AccessibleWrap.cpp b/accessible/src/windows/msaa/AccessibleWrap.cpp index 0894723003d5..b0722332bea3 100644 --- a/accessible/src/windows/msaa/AccessibleWrap.cpp +++ b/accessible/src/windows/msaa/AccessibleWrap.cpp @@ -1532,6 +1532,13 @@ AccessibleWrap::HandleAccEvent(AccEvent* aEvent) nsresult AccessibleWrap::FirePlatformEvent(AccEvent* aEvent) { + // Don't fire native MSAA events or mess with the system caret + // when running in metro mode. This confuses input focus tracking + // in metro's UIA implementation. + if (XRE_GetWindowsEnvironment() == WindowsEnvironmentType_Metro) { + return NS_OK; + } + uint32_t eventType = aEvent->GetEventType(); MOZ_STATIC_ASSERT(sizeof(gWinEventMap)/sizeof(gWinEventMap[0]) == nsIAccessibleEvent::EVENT_LAST_ENTRY,