Commit 16347630 authored by Wes Kocher's avatar Wes Kocher
Browse files

Merge inbound to m-c a=merge 

MozReview-Commit-ID: A6ZgbjxAv9N
parents 5981360b 91bb7668

accessible/ipc/win/PlatformChild.cpp

+7 −0
Original line number Diff line number Diff line
@@ -50,6 +50,13 @@ PlatformChild::PlatformChild() 
  mozilla::mscom::InterceptorLog::Init();

  mozilla::mscom::RegisterArrayData(sPlatformChildArrayData);





  UniquePtr<mozilla::mscom::RegisteredProxy> customProxy;

  mozilla::mscom::EnsureMTA([&customProxy]() -> void {

    customProxy = Move(mozilla::mscom::RegisterProxy());

  });

  mCustomProxy = Move(customProxy);



  UniquePtr<mozilla::mscom::RegisteredProxy> ia2Proxy;

  mozilla::mscom::EnsureMTA([&ia2Proxy]() -> void {

    ia2Proxy = Move(mozilla::mscom::RegisterProxy(L"ia2marshal.dll"));

accessible/ipc/win/PlatformChild.h

+1 −0
Original line number Diff line number Diff line
@@ -23,6 +23,7 @@ public: 
  PlatformChild& operator=(PlatformChild&&) = delete;



private:

  UniquePtr<mozilla::mscom::RegisteredProxy> mCustomProxy;

  UniquePtr<mozilla::mscom::RegisteredProxy> mIA2Proxy;

  UniquePtr<mozilla::mscom::RegisteredProxy> mAccTypelib;

  UniquePtr<mozilla::mscom::RegisteredProxy> mMiscTypelib;

accessible/windows/msaa/Platform.cpp

+5 −0
Original line number Diff line number Diff line
@@ -22,6 +22,7 @@ using namespace mozilla; 
using namespace mozilla::a11y;

using namespace mozilla::mscom;



static StaticAutoPtr<RegisteredProxy> gRegCustomProxy;

static StaticAutoPtr<RegisteredProxy> gRegProxy;

static StaticAutoPtr<RegisteredProxy> gRegAccTlb;

static StaticAutoPtr<RegisteredProxy> gRegMiscTlb;
@@ -35,6 +36,9 @@ a11y::PlatformInit() 
  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();
@@ -54,6 +58,7 @@ a11y::PlatformShutdown() 
  ::DestroyCaret();



  nsWinUtils::ShutdownWindowEmulation();

  gRegCustomProxy = nullptr;

  gRegProxy = nullptr;

  gRegAccTlb = nullptr;

  gRegMiscTlb = nullptr;

addon-sdk/source/test/jetpack-package.ini

+3 −0
Original line number Diff line number Diff line
@@ -50,6 +50,7 @@ subsuite = clipboard 
[test-content-sync-worker.js]

[test-content-worker.js]

[test-context-menu.js]

skip-if = asan # Bug 1333359

[test-context-menu@2.js]

[test-cuddlefish.js]

# Cuddlefish loader is unsupported
@@ -106,6 +107,7 @@ skip-if = true 
[test-page-mod.js]

[test-page-worker.js]

[test-panel.js]

skip-if = asan # Bug 1333359

[test-passwords-utils.js]

[test-passwords.js]

[test-path.js]
@@ -173,6 +175,7 @@ skip-if = true 
[test-window-utils.js]

[test-window-utils2.js]

[test-windows-common.js]

skip-if = asan # bug 1333357

[test-windows.js]

[test-xhr.js]

[test-xpcom.js]

browser/base/content/test/newtab/browser.ini

+2 −0
Original line number Diff line number Diff line
@@ -49,5 +49,7 @@ support-files = 
[browser_newtab_sponsored_icon_click.js]

skip-if = true # Bug 1314619

[browser_newtab_undo.js]

# temporary until determine why more intermittent on VM

subsuite = clipboard

[browser_newtab_unpin.js]

[browser_newtab_update.js]