Rebase webrtc/base 6163:6216 (svn diff -r 6163:6216 http://webrtc.googlecode.com/svn/trunk/talk/base, apply diff manually)
BUG=3379
TBR=wu@webrtc.org
Review URL: https://webrtc-codereview.appspot.com/17619004
git-svn-id: http://webrtc.googlecode.com/svn/trunk/webrtc@6217 4adac7df-926f-26a2-2b94-8c16560cd09d
diff --git a/base/messagequeue.h b/base/messagequeue.h
index 958a39e..41c1e24 100644
--- a/base/messagequeue.h
+++ b/base/messagequeue.h
@@ -58,7 +58,7 @@
void ClearInternal(MessageHandler *handler);
static MessageQueueManager* instance_;
- // This list contains 'active' MessageQueues.
+ // This list contains all live MessageQueues.
std::vector<MessageQueue *> message_queues_;
CriticalSection crit_;
};
@@ -230,7 +230,6 @@
void reheap() { make_heap(c.begin(), c.end(), comp); }
};
- void EnsureActive();
void DoDelayPost(int cmsDelay, uint32 tstamp, MessageHandler *phandler,
uint32 id, MessageData* pdata);
@@ -241,9 +240,6 @@
bool fStop_;
bool fPeekKeep_;
Message msgPeek_;
- // A message queue is active if it has ever had a message posted to it.
- // This also corresponds to being in MessageQueueManager's global list.
- bool active_;
MessageList msgq_;
PriorityQueue dmsgq_;
uint32 dmsgq_next_num_;