Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(749)

Unified Diff: ipc/mojo/async_handle_waiter.cc

Issue 1350023003: Add a Mojo EDK for Chrome that uses one OS pipe per message pipe. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years, 3 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: ipc/mojo/async_handle_waiter.cc
diff --git a/ipc/mojo/async_handle_waiter.cc b/ipc/mojo/async_handle_waiter.cc
index b9e68d7c4539886059b8428617eb43121eb19b4d..854c8e30d51db7dd3b67fbaeac51a9db63470e83 100644
--- a/ipc/mojo/async_handle_waiter.cc
+++ b/ipc/mojo/async_handle_waiter.cc
@@ -9,7 +9,12 @@
#include "base/bind_helpers.h"
#include "base/location.h"
#include "base/logging.h"
+
+#if defined(USE_CHROME_EDK)
+#include "mojo/edk/embedder/embedder.h"
+#else
#include "third_party/mojo/src/mojo/edk/embedder/embedder.h"
+#endif
namespace IPC {
namespace internal {
@@ -86,6 +91,11 @@ class AsyncHandleWaiter::Context
}
void DidProcessIOEvent() override {
+ // This object could have been constructed in another's class's
+ // DidProcessIOEvent.
+ if (io_loop_level_== 0)
+ return;
+
DCHECK_GE(io_loop_level_, 1);
// Leaving a nested loop.

Powered by Google App Engine
This is Rietveld 408576698