| OLD | NEW |
|---|
| 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. |
| 2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
| 3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
| 4 | 4 |
| 5 #include "base/run_loop.h" | 5 #include "base/run_loop.h" |
| 6 | 6 |
| 7 #include "base/bind.h" | 7 #include "base/bind.h" |
| 8 | 8 |
| 9 #if defined(USE_AURA) | 9 #if defined(USE_AURA) |
| 10 #include "base/message_loop/message_pump_dispatcher.h" | 10 #include "base/message_loop/message_pump_dispatcher.h" |
| 11 #endif | 11 #endif |
| 12 | 12 |
| 13 namespace base { | 13 namespace base { |
| 14 | 14 |
| 15 RunLoop::RunLoop() | 15 RunLoop::RunLoop() |
| 16 : loop_(MessageLoop::current()), | 16 : loop_(MessageLoop::current()), |
| 17 previous_run_loop_(NULL), | 17 previous_run_loop_(NULL), |
| 18 run_depth_(0), | 18 run_depth_(0), |
| 19 run_called_(false), | 19 run_called_(false), |
| 20 quit_called_(false), | 20 quit_called_(false), |
| 21 running_(false), | 21 running_(false), |
| 22 quit_when_idle_received_(false), | 22 quit_when_idle_received_(false), |
| 23 weak_factory_(this) { | 23 weak_factory_(this) { |
| 24 #if defined(USE_AURA) | 24 #if defined(OS_WIN) |
| 25 dispatcher_ = NULL; | 25 dispatcher_ = NULL; |
| 26 #endif | 26 #endif |
| 27 } | 27 } |
| 28 | 28 |
| 29 #if defined(USE_AURA) | 29 #if defined(OS_WIN) |
| 30 RunLoop::RunLoop(MessagePumpDispatcher* dispatcher) | 30 RunLoop::RunLoop(MessagePumpDispatcher* dispatcher) |
| 31 : loop_(MessageLoop::current()), | 31 : loop_(MessageLoop::current()), |
| 32 previous_run_loop_(NULL), | 32 previous_run_loop_(NULL), |
| 33 dispatcher_(dispatcher), | 33 dispatcher_(dispatcher), |
| 34 run_depth_(0), | 34 run_depth_(0), |
| 35 run_called_(false), | 35 run_called_(false), |
| 36 quit_called_(false), | 36 quit_called_(false), |
| 37 running_(false), | 37 running_(false), |
| 38 quit_when_idle_received_(false), | 38 quit_when_idle_received_(false), |
| 39 weak_factory_(this) { | 39 weak_factory_(this) { |
| (...skipping 49 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 89 | 89 |
| 90 // Pop RunLoop stack: | 90 // Pop RunLoop stack: |
| 91 loop_->run_loop_ = previous_run_loop_; | 91 loop_->run_loop_ = previous_run_loop_; |
| 92 | 92 |
| 93 // Execute deferred QuitNow, if any: | 93 // Execute deferred QuitNow, if any: |
| 94 if (previous_run_loop_ && previous_run_loop_->quit_called_) | 94 if (previous_run_loop_ && previous_run_loop_->quit_called_) |
| 95 loop_->QuitNow(); | 95 loop_->QuitNow(); |
| 96 } | 96 } |
| 97 | 97 |
| 98 } // namespace base | 98 } // namespace base |
| OLD | NEW |
|---|
Chromium Code Reviews
Issue 219743002:
x11: Move X event handling out of the message-pump. (Closed)
Base URL: svn://svn.chromium.org/chrome/trunk/src