Bug 771765, tentative bustage fix no. 2 on CLOSED TREE. r=bent
authorGregor Wagner <anygregor@gmail.com>
Mon, 30 Sep 2013 10:38:05 -0700
changeset 163152 910daf91e2499e9f539477475a5f97c4d0b23fbf
parent 163151 537197fd56bec858c630285a2294ab0071a4f208
child 163153 419ca20557cbde5ec10f6d0f0920d57cd9c63e33
push id3066
push userakeybl@mozilla.com
push dateMon, 09 Dec 2013 19:58:46 +0000
treeherdermozilla-beta@a31a0dce83aa [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersbent
bugs771765
milestone27.0a1
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Bug 771765, tentative bustage fix no. 2 on CLOSED TREE. r=bent
dom/ipc/CrashReporterParent.cpp
--- a/dom/ipc/CrashReporterParent.cpp
+++ b/dom/ipc/CrashReporterParent.cpp
@@ -1,19 +1,21 @@
 /* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
  * vim: set sw=4 ts=8 et 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/dom/ContentParent.h"
+#include "nsXULAppAPI.h"
+#include <time.h>
+
+#ifdef MOZ_CRASHREPORTER
 #include "nsExceptionHandler.h"
-#include "nsXULAppAPI.h"
-
-#include <time.h>
+#endif
 
 using namespace base;
 
 namespace mozilla {
 namespace dom {
 
 void
 CrashReporterParent::AnnotateCrashReport(const nsCString& key,
@@ -30,16 +32,17 @@ CrashReporterParent::RecvAppendAppNotes(
     mAppNotes.Append(data);
     return true;
 }
 
 mozilla::ipc::IProtocol*
 CrashReporterParent::CloneProtocol(Channel* aChannel,
                                    mozilla::ipc::ProtocolCloneContext* aCtx)
 {
+#ifdef MOZ_CRASHREPORTER
     ContentParent* contentParent = aCtx->GetContentParent();
     CrashReporter::ThreadId childThreadId = contentParent->Pid();
     GeckoProcessType childProcessType =
         contentParent->Process()->GetProcessType();
 
     nsAutoPtr<PCrashReporterParent> actor(
         contentParent->AllocPCrashReporterParent(childThreadId,
                                                  childProcessType)
@@ -47,16 +50,20 @@ CrashReporterParent::CloneProtocol(Chann
     if (!actor ||
         !contentParent->RecvPCrashReporterConstructor(actor,
                                                       childThreadId,
                                                       childThreadId)) {
       return nullptr;
     }
 
     return actor.forget();
+#else
+    MOZ_CRASH("Not Implemented");
+    return nullptr;
+#endif
 }
 
 CrashReporterParent::CrashReporterParent()
     :
 #ifdef MOZ_CRASHREPORTER
       mNotes(4),
 #endif
       mStartTime(time(NULL))