Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-11-24 21:31:04 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Backed out changeset e68169412c0b (bug 1431404) for failing mochitest browser chrome at browser/base/content/test/general/browser_datachoices_notification.js on a CLOSED TREE

Browse Source
This commit is contained in:
Andreea Pavel 2018-02-13 03:28:44 +02:00
parent 272f2f4dd8
commit 3d2179915d
2 changed files with 20 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
dom/ipc/TabParent.cpp
View File

@ -973,6 +973,11 @@ TabParent::RecvPDocAccessibleConstructor(PDocAccessibleParent* aDoc,
#ifdef XP_WIN
a11y::WrapperFor(doc)->SetID(aMsaaID);
MOZ_ASSERT(!aDocCOMProxy.IsNull());
#ifdef NIGHTLY_BUILD
if (aDocCOMProxy.IsNull()) {
return IPC_FAIL(this, "Constructing a top-level PDocAccessible with null COM proxy");
}
#endif
RefPtr<IAccessible> proxy(aDocCOMProxy.Get());
doc->SetCOMInterface(proxy);

16
ipc/mscom/Interceptor.cpp
View File

@ -28,12 +28,26 @@
#include "nsThreadUtils.h"
#include "nsXULAppAPI.h"
#if defined(MOZ_DEV_EDITION) || defined(RELEASE_OR_BETA)
#define ENSURE_HR_SUCCEEDED(hr) \
MOZ_ASSERT(SUCCEEDED((HRESULT)hr)); \
if (FAILED((HRESULT)hr)) { \
return hr; \
}
#else
#define ENSURE_HR_SUCCEEDED(hr) \
if (FAILED((HRESULT)hr)) { \
nsPrintfCString location("ENSURE_HR_SUCCEEDED \"%s\": %u", __FILE__, __LINE__); \
nsPrintfCString hrAsStr("0x%08X", (HRESULT)hr); \
CrashReporter::AnnotateCrashReport(location, hrAsStr); \
MOZ_DIAGNOSTIC_ASSERT(SUCCEEDED((HRESULT)hr)); \
return hr; \
}
#endif // defined(MOZ_DEV_EDITION) || defined(RELEASE_OR_BETA)
namespace mozilla {
namespace mscom {
namespace detail {