From a3e8c9f82fb57bdfae9cad40b3d1e6587b73994b Mon Sep 17 00:00:00 2001 From: wolfbeast Date: Mon, 21 May 2018 16:27:43 +0200 Subject: Remove stubbed IPC CrashReporter(Parent/Child) --- dom/ipc/ContentChild.cpp | 4 +--- dom/ipc/ContentParent.cpp | 1 - dom/ipc/CrashReporterChild.cpp | 17 ----------------- dom/ipc/CrashReporterChild.h | 16 ---------------- dom/ipc/CrashReporterParent.cpp | 22 ---------------------- dom/ipc/CrashReporterParent.h | 21 --------------------- dom/ipc/moz.build | 7 ------- dom/media/gmp/GMPChild.cpp | 1 - dom/media/gmp/GMPParent.cpp | 1 - dom/plugins/ipc/PluginModuleChild.cpp | 1 - toolkit/crashreporter/nsExceptionHandler.cpp | 1 - 11 files changed, 1 insertion(+), 91 deletions(-) delete mode 100644 dom/ipc/CrashReporterChild.cpp delete mode 100644 dom/ipc/CrashReporterChild.h delete mode 100644 dom/ipc/CrashReporterParent.cpp delete mode 100644 dom/ipc/CrashReporterParent.h diff --git a/dom/ipc/ContentChild.cpp b/dom/ipc/ContentChild.cpp index 532a9a3a4..bf8aca1e6 100644 --- a/dom/ipc/ContentChild.cpp +++ b/dom/ipc/ContentChild.cpp @@ -11,7 +11,6 @@ #include "ContentChild.h" #include "BlobChild.h" -#include "CrashReporterChild.h" #include "GeckoProfiler.h" #include "TabChild.h" #include "HandlerServiceChild.h" @@ -534,8 +533,7 @@ ContentChild::Init(MessageLoop* aIOLoop, NS_ASSERTION(!sSingleton, "only one ContentChild per child"); // Once we start sending IPC messages, we need the thread manager to be - // initialized so we can deal with the responses. Do that here before we - // try to construct the crash reporter. + // initialized so we can deal with the responses. Do that here. nsresult rv = nsThreadManager::get().Init(); if (NS_WARN_IF(NS_FAILED(rv))) { return false; diff --git a/dom/ipc/ContentParent.cpp b/dom/ipc/ContentParent.cpp index eb5550088..bb5e13e2b 100644 --- a/dom/ipc/ContentParent.cpp +++ b/dom/ipc/ContentParent.cpp @@ -22,7 +22,6 @@ #include "AppProcessChecker.h" #include "AudioChannelService.h" #include "BlobParent.h" -#include "CrashReporterParent.h" #include "GMPServiceParent.h" #include "HandlerServiceParent.h" #include "IHistory.h" diff --git a/dom/ipc/CrashReporterChild.cpp b/dom/ipc/CrashReporterChild.cpp deleted file mode 100644 index d5616a504..000000000 --- a/dom/ipc/CrashReporterChild.cpp +++ /dev/null @@ -1,17 +0,0 @@ -/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 2 -*- */ -/* vim: set ts=8 sts=2 et sw=2 tw=80: */ -/* This Source Code Form is subject to the terms of the Mozilla Public - * License, v. 2.0. If a copy of the MPL was not distributed with this - * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -#include "mozilla/plugins/PluginModuleChild.h" -#include "ContentChild.h" -#include "CrashReporterChild.h" -#include "nsXULAppAPI.h" - -using mozilla::plugins::PluginModuleChild; - -namespace mozilla { -namespace dom { - /*** STUB ***/ -} // namespace dom -} // namespace mozilla diff --git a/dom/ipc/CrashReporterChild.h b/dom/ipc/CrashReporterChild.h deleted file mode 100644 index 32140a901..000000000 --- a/dom/ipc/CrashReporterChild.h +++ /dev/null @@ -1,16 +0,0 @@ -/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 2 -*- */ -/* vim: set ts=8 sts=2 et sw=2 tw=80: */ -/* This Source Code Form is subject to the terms of the Mozilla Public - * License, v. 2.0. If a copy of the MPL was not distributed with this - * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ - -#ifndef mozilla_dom_CrashReporterChild_h -#define mozilla_dom_CrashReporterChild_h - -namespace mozilla { -namespace dom { - /*** STUB ***/ -} // namespace dom -} // namespace mozilla - -#endif // mozilla_dom_CrashReporterChild_h diff --git a/dom/ipc/CrashReporterParent.cpp b/dom/ipc/CrashReporterParent.cpp deleted file mode 100644 index 75b0fccb7..000000000 --- a/dom/ipc/CrashReporterParent.cpp +++ /dev/null @@ -1,22 +0,0 @@ -/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 2 -*- */ -/* vim: set ts=8 sts=2 et sw=2 tw=80: */ -/* This Source Code Form is subject to the terms of the Mozilla Public - * License, v. 2.0. If a copy of the MPL was not distributed with this - * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -#include "CrashReporterParent.h" -#include "mozilla/Sprintf.h" -#include "mozilla/dom/ContentParent.h" -#include "mozilla/ipc/CrashReporterHost.h" -#include "nsAutoPtr.h" -#include "nsXULAppAPI.h" -#include - -#include "mozilla/Telemetry.h" - -namespace mozilla { -namespace dom { - - /*** STUB ***/ - -} // namespace dom -} // namespace mozilla diff --git a/dom/ipc/CrashReporterParent.h b/dom/ipc/CrashReporterParent.h deleted file mode 100644 index 481c4d77b..000000000 --- a/dom/ipc/CrashReporterParent.h +++ /dev/null @@ -1,21 +0,0 @@ -/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 2 -*- */ -/* vim: set ts=8 sts=2 et sw=2 tw=80: */ -/* This Source Code Form is subject to the terms of the Mozilla Public - * License, v. 2.0. If a copy of the MPL was not distributed with this - * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ - -#ifndef mozilla_dom_CrashReporterParent_h -#define mozilla_dom_CrashReporterParent_h - -#include "mozilla/dom/TabMessageUtils.h" -#include "nsIFile.h" - -namespace mozilla { -namespace dom { - - /*** STUB ***/ - -} // namespace dom -} // namespace mozilla - -#endif // mozilla_dom_CrashReporterParent_h diff --git a/dom/ipc/moz.build b/dom/ipc/moz.build index 0871f3f23..5629ab2c6 100644 --- a/dom/ipc/moz.build +++ b/dom/ipc/moz.build @@ -26,8 +26,6 @@ EXPORTS.mozilla.dom += [ 'ContentProcess.h', 'ContentProcessManager.h', 'CPOWManagerGetter.h', - 'CrashReporterChild.h', - 'CrashReporterParent.h', 'FilePickerParent.h', 'nsIContentChild.h', 'nsIContentParent.h', @@ -54,7 +52,6 @@ UNIFIED_SOURCES += [ 'ContentParent.cpp', 'ContentProcess.cpp', 'ContentProcessManager.cpp', - 'CrashReporterParent.cpp', 'FilePickerParent.cpp', 'nsIContentChild.cpp', 'nsIContentParent.cpp', @@ -70,13 +67,10 @@ UNIFIED_SOURCES += [ ] # Blob.cpp cannot be compiled in unified mode because it triggers a fatal gcc warning. -# CrashReporterChild.cpp cannot be compiled in unified mode because of name clashes -# in OS X headers. # ContentChild.cpp cannot be compiled in unified mode on linux due to Time conflict SOURCES += [ 'Blob.cpp', 'ContentChild.cpp', - 'CrashReporterChild.cpp', 'ProcessHangMonitor.cpp', ] @@ -131,7 +125,6 @@ LOCAL_INCLUDES += [ '/layout/base', '/media/webrtc', '/netwerk/base', - '/toolkit/crashreporter', '/toolkit/xre', '/uriloader/exthandler', '/widget', diff --git a/dom/media/gmp/GMPChild.cpp b/dom/media/gmp/GMPChild.cpp index ad08d3950..14b06cc72 100644 --- a/dom/media/gmp/GMPChild.cpp +++ b/dom/media/gmp/GMPChild.cpp @@ -18,7 +18,6 @@ #include "gmp-video-decode.h" #include "gmp-video-encode.h" #include "GMPPlatform.h" -#include "mozilla/dom/CrashReporterChild.h" #include "mozilla/ipc/ProcessChild.h" #include "GMPUtils.h" #include "prio.h" diff --git a/dom/media/gmp/GMPParent.cpp b/dom/media/gmp/GMPParent.cpp index beca4d1a3..40c3e5141 100644 --- a/dom/media/gmp/GMPParent.cpp +++ b/dom/media/gmp/GMPParent.cpp @@ -22,7 +22,6 @@ #include "MediaPrefs.h" #include "VideoUtils.h" -#include "mozilla/dom/CrashReporterParent.h" using mozilla::ipc::GeckoChildProcessHost; #include "mozilla/Telemetry.h" diff --git a/dom/plugins/ipc/PluginModuleChild.cpp b/dom/plugins/ipc/PluginModuleChild.cpp index 78c0d26ea..7f7cc7acb 100644 --- a/dom/plugins/ipc/PluginModuleChild.cpp +++ b/dom/plugins/ipc/PluginModuleChild.cpp @@ -32,7 +32,6 @@ #include "mozilla/plugins/StreamNotifyChild.h" #include "mozilla/plugins/BrowserStreamChild.h" #include "mozilla/plugins/PluginStreamChild.h" -#include "mozilla/dom/CrashReporterChild.h" #include "mozilla/Sprintf.h" #include "mozilla/Unused.h" diff --git a/toolkit/crashreporter/nsExceptionHandler.cpp b/toolkit/crashreporter/nsExceptionHandler.cpp index 2ac030089..b6237a7a4 100644 --- a/toolkit/crashreporter/nsExceptionHandler.cpp +++ b/toolkit/crashreporter/nsExceptionHandler.cpp @@ -10,7 +10,6 @@ #include "nsDirectoryServiceDefs.h" #include "nsDataHashtable.h" #include "mozilla/ArrayUtils.h" -#include "mozilla/dom/CrashReporterChild.h" #include "mozilla/ipc/CrashReporterClient.h" #include "mozilla/Services.h" #include "nsIObserverService.h" -- cgit v1.2.3