zqz/platform-external-webrtc
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Revert "Split EventWrapper in twain."

Browse Source 
This reverts commit 9509fbfc301dd5412804ce5731afedc81480f2f8.

This is to debug a Chromium issue that WebRTC hangs if there is > 1 PeerConnection active in the browser on Win XP.

BUG=

TBR=tommi@webrtc.org

Review URL: https://webrtc-codereview.appspot.com/43019004

Cr-Commit-Position: refs/heads/master@{#8912}
This commit is contained in:
Minyue
2015-04-01 16:31:38 +02:00
parent 31331cfd2d
commit cf3c83e76c
25 changed files with 94 additions and 119 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
webrtc/modules/video_render/mac/video_render_nsopengl.h
View File

@ -31,13 +31,16 @@
class Trace;
namespace webrtc {
class EventTimerWrapper;
class EventWrapper;
class ThreadWrapper;
class VideoRenderNSOpenGL;
class CriticalSectionWrapper;
class VideoChannelNSOpenGL : public VideoRenderCallback {
class VideoChannelNSOpenGL : public VideoRenderCallback
{
public:
VideoChannelNSOpenGL(NSOpenGLContext *nsglContext, int iId, VideoRenderNSOpenGL* owner);
virtual ~VideoChannelNSOpenGL();
@ -167,7 +170,7 @@ private: // variables
int _id;
CriticalSectionWrapper& _nsglContextCritSec;
rtc::scoped_ptr<ThreadWrapper> _screenUpdateThread;
EventTimerWrapper* _screenUpdateEvent;
EventWrapper* _screenUpdateEvent;
NSOpenGLContext* _nsglContext;
NSOpenGLContext* _nsglFullScreenContext;
CocoaFullScreenWindow* _fullScreenWindow;