Bug 836654 - Part 11: Follow-up for b2g18; fix compile errors. r/a=me

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"

dom/ipc/ProcessPriorityManager.cpp

@@ -500,7 +500,11 @@ ProcessPriorityManager::ComputeIsInForeground()
 
 #ifdef DEBUG
     nsAutoCString spec;
-    nsCOMPtr<nsIURI> uri = window->GetDocumentURI();
+    nsCOMPtr<nsIDocument> doc = window->GetExtantDoc();
+    nsCOMPtr<nsIURI> uri;
+    if (doc) {
+      uri = doc->GetDocumentURI();
+    }
     if (uri) {
       uri->GetSpec(spec);
     }

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;
 }