Skip to content
Snippets Groups Projects
Commit e342e1f8 authored by B2G User's avatar B2G User
Browse files

Patch deletion due to upstream fix

Change-Id: Ib169ad0a2f8236fc989631325d6ef09a6d40fb62
parent 2b72975e
No related branches found
Tags LF.BR.1.2.3-15400-8x09.0
No related merge requests found
From 5550965517b15bb0a786badb857137412f49c7ae Mon Sep 17 00:00:00 2001
From: Philippe Gravel <pgravel@codeaurora.org>
Date: Mon, 2 Mar 2015 12:16:50 -0800
Subject: [PATCH] Expose SetIgnoreThreadStatus API in nsThreadStatusManager
Change-Id: I8412d735f60d9b479f5d9548391cd3fed1cd832c
---
xpcom/threads/nsIThreadManager.idl | 2 ++
xpcom/threads/nsThreadManager.cpp | 9 +++++++--
xpcom/threads/nsThreadManager.h | 2 --
3 files changed, 9 insertions(+), 4 deletions(-)
diff --git a/xpcom/threads/nsIThreadManager.idl b/xpcom/threads/nsIThreadManager.idl
index 9b4fc12..6df2742 100644
--- a/xpcom/threads/nsIThreadManager.idl
+++ b/xpcom/threads/nsIThreadManager.idl
@@ -48,6 +48,8 @@ interface nsIThreadManager : nsISupports
*/
[noscript] nsIThread getThreadFromPRThread(in PRThread prthread);
+ void setIgnoreThreadStatus();
+
/**
* Get the main thread.
*/
diff --git a/xpcom/threads/nsThreadManager.cpp b/xpcom/threads/nsThreadManager.cpp
index 8de08cf..d0abe0d 100644
--- a/xpcom/threads/nsThreadManager.cpp
+++ b/xpcom/threads/nsThreadManager.cpp
@@ -439,13 +439,18 @@ nsThreadManager::GetHighestNumberOfThreads()
return mHighestNumberOfThreads;
}
-#ifdef MOZ_NUWA_PROCESS
-void
+NS_IMETHODIMP
nsThreadManager::SetIgnoreThreadStatus()
{
+#ifdef MOZ_NUWA_PROCESS
GetCurrentThreadStatusInfo()->mIgnored = true;
+ return NS_OK;
+#endif
+ return NS_ERROR_NOT_AVAILABLE;
}
+#ifdef MOZ_NUWA_PROCESS
+
void
nsThreadManager::SetThreadIdle(nsIRunnable **aReturnRunnable)
{
diff --git a/xpcom/threads/nsThreadManager.h b/xpcom/threads/nsThreadManager.h
index 74e1bbc..712db3d 100644
--- a/xpcom/threads/nsThreadManager.h
+++ b/xpcom/threads/nsThreadManager.h
@@ -72,8 +72,6 @@ public:
}
#ifdef MOZ_NUWA_PROCESS
- void SetIgnoreThreadStatus();
-
// |SetThreadWorking| and |SetThreadIdle| set status of thread that is
// currently running. They get thread status information from TLS and pass
// the information to |SetThreadIsWorking|.
--
1.8.2.1
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment