cef/cef1/patch/patches/base.patch
Marshall Greenblatt 211a176537 Update to Chromium revision 130586.
git-svn-id: https://chromiumembedded.googlecode.com/svn/trunk@584 5089003a-bbd8-11dd-ad1f-f1f9622dbc98
2012-04-05 03:02:46 +00:00

34 lines
974 B
Diff

Index: message_loop.cc
===================================================================
--- message_loop.cc (revision 130586)
+++ message_loop.cc (working copy)
@@ -361,9 +361,13 @@
}
void MessageLoop::AssertIdle() const {
+ DCHECK(IsIdle());
+}
+
+bool MessageLoop::IsIdle() const {
// We only check |incoming_queue_|, since we don't want to lock |work_queue_|.
base::AutoLock lock(incoming_queue_lock_);
- DCHECK(incoming_queue_.empty());
+ return incoming_queue_.empty();
}
bool MessageLoop::is_running() const {
Index: message_loop.h
===================================================================
--- message_loop.h (revision 130586)
+++ message_loop.h (working copy)
@@ -350,6 +350,9 @@
// Asserts that the MessageLoop is "idle".
void AssertIdle() const;
+ // Returns true if the MessageLoop is "idle".
+ bool IsIdle() const;
+
#if defined(OS_WIN)
void set_os_modal_loop(bool os_modal_loop) {
os_modal_loop_ = os_modal_loop;