Skip to content

Commit

Permalink
Bug 1392666: Unconditionally initialize e10s-specific variables in Wi…
Browse files Browse the repository at this point in the history
…n32 a11y::PlatformInit; r=eeejay

MozReview-Commit-ID: 6aqnbt9Qytp
  • Loading branch information
dblohm7 committed Aug 22, 2017
1 parent 15675fe commit e72586e
Showing 1 changed file with 15 additions and 16 deletions.
31 changes: 15 additions & 16 deletions accessible/windows/msaa/Platform.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -39,22 +39,21 @@ a11y::PlatformInit()

nsWinUtils::MaybeStartWindowEmulation();
ia2AccessibleText::InitTextChangeData();
if (BrowserTabsRemoteAutostart()) {
mscom::InterceptorLog::Init();
UniquePtr<RegisteredProxy> regCustomProxy(
mscom::RegisterProxy());
gRegCustomProxy = regCustomProxy.release();
UniquePtr<RegisteredProxy> regProxy(
mscom::RegisterProxy(L"ia2marshal.dll"));
gRegProxy = regProxy.release();
UniquePtr<RegisteredProxy> regAccTlb(
mscom::RegisterTypelib(L"oleacc.dll",
RegistrationFlags::eUseSystemDirectory));
gRegAccTlb = regAccTlb.release();
UniquePtr<RegisteredProxy> regMiscTlb(
mscom::RegisterTypelib(L"Accessible.tlb"));
gRegMiscTlb = regMiscTlb.release();
}

mscom::InterceptorLog::Init();
UniquePtr<RegisteredProxy> regCustomProxy(
mscom::RegisterProxy());
gRegCustomProxy = regCustomProxy.release();
UniquePtr<RegisteredProxy> regProxy(
mscom::RegisterProxy(L"ia2marshal.dll"));
gRegProxy = regProxy.release();
UniquePtr<RegisteredProxy> regAccTlb(
mscom::RegisterTypelib(L"oleacc.dll",
RegistrationFlags::eUseSystemDirectory));
gRegAccTlb = regAccTlb.release();
UniquePtr<RegisteredProxy> regMiscTlb(
mscom::RegisterTypelib(L"Accessible.tlb"));
gRegMiscTlb = regMiscTlb.release();
}

void
Expand Down

0 comments on commit e72586e

Please sign in to comment.