Update To 11.40.268.0

[platform/framework/web/crosswalk.git] / src / third_party / webrtc / base / thread.cc

diff --git a/src/third_party/webrtc/base/thread.cc b/src/third_party/webrtc/base/thread.cc
index 40257ab..aa2442f 100644 (file)
--- a/src/third_party/webrtc/base/thread.cc
+++ b/src/third_party/webrtc/base/thread.cc
@@ -312,10 +312,13 @@ void Thread::SafeWrapCurrent() {
 }
 
 void Thread::Join() {
-  AssertBlockingIsAllowedOnCurrentThread();
-
   if (running()) {
     ASSERT(!IsCurrent());
+    if (Current() && !Current()->blocking_calls_allowed_) {
+      LOG(LS_WARNING) << "Waiting for the thread to join, "
+                      << "but blocking calls have been disallowed";
+    }
+
 #if defined(WEBRTC_WIN)
     ASSERT(thread_ != NULL);
     WaitForSingleObject(thread_, INFINITE);