Windows: Fix assertion on shutdown when using multi-threaded-message-loop (issue #755).

git-svn-id: https://chromiumembedded.googlecode.com/svn/branches/1916@1839 5089003a-bbd8-11dd-ad1f-f1f9622dbc98
This commit is contained in:
Marshall Greenblatt 2014-09-18 19:11:50 +00:00
parent 2353f35a05
commit acb624d1fd
2 changed files with 20 additions and 0 deletions

View File

@ -114,6 +114,12 @@ patches = [
'name': 'web_contents_1262',
'path': '../content/browser/web_contents/',
},
{
# Windows: Fix assertion on shutdown with multi-threaded-message-loop.
# https://code.google.com/p/chromiumembedded/issues/detail?id=755
'name': 'media_webrtc_755',
'path': '../content/browser/media/',
},
{
# Disable scollbar bounce and overlay on OS X.
# http://code.google.com/p/chromiumembedded/issues/detail?id=364

View File

@ -0,0 +1,14 @@
Index: webrtc_internals.cc
===================================================================
--- webrtc_internals.cc (revision 272606)
+++ webrtc_internals.cc (working copy)
@@ -63,7 +63,8 @@
}
WebRTCInternals* WebRTCInternals::GetInstance() {
- return Singleton<WebRTCInternals>::get();
+ return Singleton<WebRTCInternals,
+ LeakySingletonTraits<WebRTCInternals> >::get();
}
void WebRTCInternals::OnAddPeerConnection(int render_process_id,