cef/patch/patches/base.patch
Marshall Greenblatt da210afca7 Update to Chromium revision 91424.
- Add tools/gyp_cef to satisfy grit_info.py module load requirement.
- Add skia_gpu.patch to work around skia/Angle/WebGL bug.

git-svn-id: https://chromiumembedded.googlecode.com/svn/trunk@263 5089003a-bbd8-11dd-ad1f-f1f9622dbc98
2011-07-03 00:03:30 +00:00

34 lines
1014 B
Diff

Index: message_loop.cc
===================================================================
--- message_loop.cc (revision 91424)
+++ message_loop.cc (working copy)
@@ -401,9 +401,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();
}
//------------------------------------------------------------------------------
Index: message_loop.h
===================================================================
--- message_loop.h (revision 91424)
+++ message_loop.h (working copy)
@@ -349,6 +349,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;