Merge revision 739 changes:

- Add the ability to customize the animation frame rate (issue #697).

git-svn-id: https://chromiumembedded.googlecode.com/svn/branches/1180@740 5089003a-bbd8-11dd-ad1f-f1f9622dbc98
This commit is contained in:
Marshall Greenblatt
2012-08-14 23:34:56 +00:00
parent 8b1894b1ea
commit 921fba426b
16 changed files with 128 additions and 113 deletions

View File

@ -11,11 +11,6 @@ patches = [
'name': 'build',
'path': '../build/',
},
{
# http://codereview.chromium.org/6730028/
'name': 'base',
'path': '../base/',
},
{
# http://code.google.com/p/gyp/issues/detail?id=223
'name': 'tools_gyp',

View File

@ -1,33 +0,0 @@
Index: message_loop.cc
===================================================================
--- message_loop.cc (revision 140240)
+++ message_loop.cc (working copy)
@@ -369,9 +369,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 140240)
+++ message_loop.h (working copy)
@@ -347,6 +347,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;