diff options
| author | sergeyu@chromium.org <sergeyu@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-08-14 11:02:54 +0000 |
|---|---|---|
| committer | sergeyu@chromium.org <sergeyu@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-08-14 11:02:54 +0000 |
| commit | 4b71a721b49c24e52930de0a1b8665edf7d4d99f (patch) | |
| tree | d0bb87b5892beb52da0633fd5542c82a3feda9db /content | |
| parent | 2a8d287cd8c5f74c596980e6e76c1d5f140012d2 (diff) | |
| download | chromium_src-4b71a721b49c24e52930de0a1b8665edf7d4d99f.zip chromium_src-4b71a721b49c24e52930de0a1b8665edf7d4d99f.tar.gz chromium_src-4b71a721b49c24e52930de0a1b8665edf7d4d99f.tar.bz2 | |
Update JingleThreadWrapper to allow it to be created using task runner.
Previously JingleThreadWrapper required a MessageLoop. In NaCl
we don't have MessageLoop for the main plugin thread, but have a task runner.
This CL allows to use JingleThreadWrapper on the main NaCl thread.
BUG=134216
TBR=tommi@chromium.org
Review URL: https://chromiumcodereview.appspot.com/10823224
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@151458 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'content')
| -rw-r--r-- | content/renderer/media/media_stream_impl.cc | 4 | ||||
| -rw-r--r-- | content/renderer/p2p/p2p_transport_impl.cc | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/content/renderer/media/media_stream_impl.cc b/content/renderer/media/media_stream_impl.cc index aac798b..c794f05 100644 --- a/content/renderer/media/media_stream_impl.cc +++ b/content/renderer/media/media_stream_impl.cc @@ -370,7 +370,7 @@ void MediaStreamImpl::OnSocketDispatcherDestroyed() { void MediaStreamImpl::InitializeWorkerThread(talk_base::Thread** thread, base::WaitableEvent* event) { - jingle_glue::JingleThreadWrapper::EnsureForCurrentThread(); + jingle_glue::JingleThreadWrapper::EnsureForCurrentMessageLoop(); jingle_glue::JingleThreadWrapper::current()->set_send_allowed(true); *thread = jingle_glue::JingleThreadWrapper::current(); event->Signal(); @@ -392,7 +392,7 @@ void MediaStreamImpl::DeleteIpcNetworkManager() { bool MediaStreamImpl::EnsurePeerConnectionFactory() { DCHECK(CalledOnValidThread()); if (!signaling_thread_) { - jingle_glue::JingleThreadWrapper::EnsureForCurrentThread(); + jingle_glue::JingleThreadWrapper::EnsureForCurrentMessageLoop(); jingle_glue::JingleThreadWrapper::current()->set_send_allowed(true); signaling_thread_ = jingle_glue::JingleThreadWrapper::current(); } diff --git a/content/renderer/p2p/p2p_transport_impl.cc b/content/renderer/p2p/p2p_transport_impl.cc index 1556ef3..bce4181 100644 --- a/content/renderer/p2p/p2p_transport_impl.cc +++ b/content/renderer/p2p/p2p_transport_impl.cc @@ -58,7 +58,7 @@ bool P2PTransportImpl::Init(WebKit::WebFrame* web_frame, // Before proceeding, ensure we have libjingle thread wrapper for // the current thread. - jingle_glue::JingleThreadWrapper::EnsureForCurrentThread(); + jingle_glue::JingleThreadWrapper::EnsureForCurrentMessageLoop(); name_ = name; event_handler_ = event_handler; |