diff options
| author | sky@chromium.org <sky@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-08-14 15:48:24 +0000 |
|---|---|---|
| committer | sky@chromium.org <sky@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-08-14 15:49:28 +0000 |
| commit | 9a4129222945e697c34bd4a3254b338049870a70 (patch) | |
| tree | 2ba94fb188cb4d6f063a8f5203847962380db647 /base/message_loop | |
| parent | 2f3a7b23b62dca9435d4e0f9274c3b0307a983b3 (diff) | |
| download | chromium_src-9a4129222945e697c34bd4a3254b338049870a70.zip chromium_src-9a4129222945e697c34bd4a3254b338049870a70.tar.gz chromium_src-9a4129222945e697c34bd4a3254b338049870a70.tar.bz2 | |
Adds some CHECKs to MessagePumpMojo
The thread watcher appears to be kicking on when we're trying to
remove a handle. Not sure why. This converts some DCHECKs to CHECKs
and fixes handling of the deadline. I suspect none of this will help,
but it's worth a shot.
BUG=399769
TEST=none
R=darin@chromium.org
Committed: https://src.chromium.org/viewvc/chrome?view=rev&revision=288949
Review URL: https://codereview.chromium.org/454433003
Cr-Commit-Position: refs/heads/master@{#289600}
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@289600 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'base/message_loop')
| -rw-r--r-- | base/message_loop/message_loop.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/base/message_loop/message_loop.cc b/base/message_loop/message_loop.cc index 69a02a3..ae165ea 100644 --- a/base/message_loop/message_loop.cc +++ b/base/message_loop/message_loop.cc @@ -90,6 +90,8 @@ MessageLoop::MessagePumpFactory* message_pump_for_ui_factory_ = NULL; // time for every task that is added to the MessageLoop incoming queue. bool AlwaysNotifyPump(MessageLoop::Type type) { #if defined(OS_ANDROID) + // The Android UI message loop needs to get notified each time a task is added + // to the incoming queue. return type == MessageLoop::TYPE_UI || type == MessageLoop::TYPE_JAVA; #else return false; @@ -496,8 +498,6 @@ void MessageLoop::ReloadWorkQueue() { } void MessageLoop::ScheduleWork(bool was_empty) { - // The Android UI message loop needs to get notified each time - // a task is added to the incoming queue. if (was_empty || AlwaysNotifyPump(type_)) pump_->ScheduleWork(); } |