From 572ced716f46f8615dc0f0ca461a0e19ad6a9111 Mon Sep 17 00:00:00 2001 From: Justin Lebar Date: Fri, 15 Feb 2013 13:10:28 -0500 Subject: [PATCH] Bug 836654 - Part 11: Follow-up for b2g18; fix compile errors. r/a=me --- dom/ipc/ContentParent.cpp | 1 + dom/ipc/ProcessPriorityManager.cpp | 6 +++++- hal/HalWakeLock.cpp | 3 ++- 3 files changed, 8 insertions(+), 2 deletions(-) diff --git a/dom/ipc/ContentParent.cpp b/dom/ipc/ContentParent.cpp index 3e5403ad4c29..6a0622feac47 100644 --- a/dom/ipc/ContentParent.cpp +++ b/dom/ipc/ContentParent.cpp @@ -24,6 +24,7 @@ #include "IndexedDatabaseManager.h" #include "mozIApplication.h" #include "mozilla/ClearOnShutdown.h" +#include "mozilla/dom/Element.h" #include "mozilla/dom/ExternalHelperAppParent.h" #include "mozilla/dom/PMemoryReportRequestParent.h" #include "mozilla/dom/power/PowerManagerService.h" diff --git a/dom/ipc/ProcessPriorityManager.cpp b/dom/ipc/ProcessPriorityManager.cpp index e98de2277ac1..1e4ab937f3c4 100644 --- a/dom/ipc/ProcessPriorityManager.cpp +++ b/dom/ipc/ProcessPriorityManager.cpp @@ -500,7 +500,11 @@ ProcessPriorityManager::ComputeIsInForeground() #ifdef DEBUG nsAutoCString spec; - nsCOMPtr uri = window->GetDocumentURI(); + nsCOMPtr doc = window->GetExtantDoc(); + nsCOMPtr uri; + if (doc) { + uri = doc->GetDocumentURI(); + } if (uri) { uri->GetSpec(spec); } diff --git a/hal/HalWakeLock.cpp b/hal/HalWakeLock.cpp index b276721ab7bb..f7678bbb3c3b 100644 --- a/hal/HalWakeLock.cpp +++ b/hal/HalWakeLock.cpp @@ -262,7 +262,8 @@ GetWakeLockInfo(const nsAString& aTopic, WakeLockInformation* aWakeLockInfo) table->EnumerateRead(CountWakeLocks, &totalCount); aWakeLockInfo->numLocks() = totalCount.numLocks; aWakeLockInfo->numHidden() = totalCount.numHidden; - aWakeLockInfo->lockingProcesses() = totalCount.processes; + aWakeLockInfo->lockingProcesses().Clear(); + aWakeLockInfo->lockingProcesses().AppendElements(totalCount.processes); aWakeLockInfo->topic() = aTopic; }