wine/gecko
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/wine-gecko.git synced 2024-09-13 09:24:08 -07:00
Code Issues Packages Projects Releases Wiki Activity

Backed out changeset db13171100fa (bug 1041369) for frequent mochitest-3 failures.

Browse Source 
CLOSED TREE
This commit is contained in:
Ryan VanderMeulen 2014-08-04 13:55:14 -04:00
parent 6f42fd0c06
commit 11f333f6bc
15 changed files with 6 additions and 115 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
media/webrtc/trunk/webrtc/modules/desktop_capture/desktop_device_info.cc
View File

@ -251,11 +251,4 @@ int32_t DesktopDeviceInfoImpl::initializeWindowList() {
return 0;
}
int32_t DesktopDeviceInfoImpl::RefreshWindowList() {
desktop_window_list_.clear();
initializeWindowList();
return 0;
}
}

2
media/webrtc/trunk/webrtc/modules/desktop_capture/desktop_device_info.h
View File

@ -64,7 +64,6 @@ public:
virtual ~DesktopDeviceInfo() {};
virtual int32_t Init() = 0;
virtual int32_t Refresh() = 0;
virtual int32_t getDisplayDeviceCount() = 0;
virtual int32_t getDesktopDisplayDeviceInfo(int32_t nIndex,
DesktopDisplayDevice & desktopDisplayDevice) = 0;
@ -99,7 +98,6 @@ protected:
DesktopApplicationList desktop_application_list_;
int32_t initializeWindowList();
int32_t RefreshWindowList();
};
};

6
media/webrtc/trunk/webrtc/modules/desktop_capture/mac/desktop_device_info_mac.h
View File

@ -17,12 +17,6 @@ public:
//DesktopDeviceInfo Interfaces
virtual int32_t Init();
virtual int32_t Refresh();
private:
#if !defined(MULTI_MONITOR_SCREENSHARE)
int32_t MultiMonitorScreenshare();
#endif
};
}// namespace webrtc

24
media/webrtc/trunk/webrtc/modules/desktop_capture/mac/desktop_device_info_mac.mm
View File

@ -24,24 +24,15 @@ DesktopDeviceInfoMac::DesktopDeviceInfoMac() {
DesktopDeviceInfoMac::~DesktopDeviceInfoMac() {
}
int32_t DesktopDeviceInfoMac::Init() {
#if !defined(MULTI_MONITOR_SCREENSHARE)
int32_t DesktopDeviceInfoMac::MultiMonitorScreenshare()
{
DesktopDisplayDevice *pDesktopDeviceInfo = new DesktopDisplayDevice;
if (pDesktopDeviceInfo) {
if(pDesktopDeviceInfo) {
pDesktopDeviceInfo->setScreenId(0);
pDesktopDeviceInfo->setDeviceName("Primary Monitor");
pDesktopDeviceInfo->setUniqueIdName("\\screen\\monitor#1");
desktop_display_list_[pDesktopDeviceInfo->getScreenId()] = pDesktopDeviceInfo;
}
return 0;
}
#endif
int32_t DesktopDeviceInfoMac::Init() {
#if !defined(MULTI_MONITOR_SCREENSHARE)
MultiMonitorScreenshare();
#endif
initializeWindowList();
@ -49,15 +40,4 @@ int32_t DesktopDeviceInfoMac::Init() {
return 0;
}
int32_t DesktopDeviceInfoMac::Refresh() {
#if !defined(MULTI_MONITOR_SCREENSHARE)
desktop_display_list_.clear();
MultiMonitorScreenshare();
#endif
RefreshWindowList();
return 0;
}
} //namespace webrtc

21
media/webrtc/trunk/webrtc/modules/desktop_capture/win/desktop_device_info_win.cc
View File

@ -21,9 +21,8 @@ DesktopDeviceInfoWin::DesktopDeviceInfoWin() {
DesktopDeviceInfoWin::~DesktopDeviceInfoWin() {
}
int32_t DesktopDeviceInfoWin::Init() {
#if !defined(MULTI_MONITOR_SCREENSHARE)
int32_t DesktopDeviceInfoWin::MultiMonitorScreenshare()
{
DesktopDisplayDevice *pDesktopDeviceInfo = new DesktopDisplayDevice;
if (pDesktopDeviceInfo) {
pDesktopDeviceInfo->setScreenId(0);
@ -32,13 +31,6 @@ int32_t DesktopDeviceInfoWin::MultiMonitorScreenshare()
desktop_display_list_[pDesktopDeviceInfo->getScreenId()] = pDesktopDeviceInfo;
}
return 0;
}
#endif
int32_t DesktopDeviceInfoWin::Init() {
#if !defined(MULTI_MONITOR_SCREENSHARE)
MultiMonitorScreenshare();
#endif
initializeWindowList();
@ -46,15 +38,4 @@ int32_t DesktopDeviceInfoWin::Init() {
return 0;
}
int32_t DesktopDeviceInfoWin::Refresh() {
#if !defined(MULTI_MONITOR_SCREENSHARE)
desktop_display_list_.clear();
MultiMonitorScreenshare();
#endif
RefreshWindowList();
return 0;
}
} //namespace webrtc

6
media/webrtc/trunk/webrtc/modules/desktop_capture/win/desktop_device_info_win.h
View File

@ -17,12 +17,6 @@ public:
//DesktopDeviceInfo Interfaces
virtual int32_t Init();
virtual int32_t Refresh();
private:
#if !defined(MULTI_MONITOR_SCREENSHARE)
int32_t MultiMonitorScreenshare();
#endif
};
}// namespace webrtc

23
media/webrtc/trunk/webrtc/modules/desktop_capture/x11/desktop_device_info_x11.cc
View File

@ -22,24 +22,16 @@ DesktopDeviceInfoX11::DesktopDeviceInfoX11() {
DesktopDeviceInfoX11::~DesktopDeviceInfoX11() {
}
int32_t DesktopDeviceInfoX11::Init() {
#if !defined(MULTI_MONITOR_SCREENSHARE)
int32_t DesktopDeviceInfoX11::MultiMonitorScreenshare()
{
DesktopDisplayDevice *pDesktopDeviceInfo = new DesktopDisplayDevice;
if (pDesktopDeviceInfo) {
if(pDesktopDeviceInfo){
pDesktopDeviceInfo->setScreenId(0);
pDesktopDeviceInfo->setDeviceName("Primary Monitor");
pDesktopDeviceInfo->setUniqueIdName("\\screen\\monitor#1");
desktop_display_list_[pDesktopDeviceInfo->getScreenId()] = pDesktopDeviceInfo;
}
return 0;
}
#endif
int32_t DesktopDeviceInfoX11::Init() {
#if !defined(MULTI_MONITOR_SCREENSHARE)
MultiMonitorScreenshare();
#endif
initializeWindowList();
@ -47,15 +39,4 @@ int32_t DesktopDeviceInfoX11::Init() {
return 0;
}
int32_t DesktopDeviceInfoX11::Refresh() {
#if !defined(MULTI_MONITOR_SCREENSHARE)
desktop_display_list_.clear();
MultiMonitorScreenshare();
#endif
RefreshWindowList();
return 0;
}
} //namespace webrtc

6
media/webrtc/trunk/webrtc/modules/desktop_capture/x11/desktop_device_info_x11.h
View File

@ -17,12 +17,6 @@ public:
//DesktopDeviceInfo Interfaces
virtual int32_t Init();
virtual int32_t Refresh();
private:
#if !defined(MULTI_MONITOR_SCREENSHARE)
int32_t MultiMonitorScreenshare();
#endif
};
}// namespace webrtc

1
media/webrtc/trunk/webrtc/modules/video_capture/device_info_impl.h
View File

@ -44,7 +44,6 @@ protected:
/* Initialize this object*/
virtual int32_t Init()=0;
virtual int32_t Refresh() { return 0; }
/*
* Fills the member variable _captureCapabilities with capabilities for the given device name.
*/

1
media/webrtc/trunk/webrtc/modules/video_capture/include/video_capture.h
View File

@ -30,7 +30,6 @@ class VideoCaptureModule: public RefCountedModule {
class DeviceInfo {
public:
virtual uint32_t NumberOfDevices() = 0;
virtual int32_t Refresh() = 0;
// Returns the available capture devices.
// deviceNumber - Index of capture device.

1
media/webrtc/trunk/webrtc/modules/video_capture/windows/device_info_ds.h
View File

@ -42,7 +42,6 @@ public:
int32_t Init();
virtual uint32_t NumberOfDevices();
int32_t Refresh() { return 0; }
/*
* Returns the available capture devices.

2
media/webrtc/trunk/webrtc/video_engine/browser_capture_impl.h
View File

@ -11,8 +11,6 @@ namespace webrtc {
public:
virtual uint32_t NumberOfDevices() { return 1; }
virtual int32_t Refresh() { return 0; }
virtual int32_t GetDeviceName(uint32_t deviceNumber,
char* deviceNameUTF8,
uint32_t deviceNameLength,

15
media/webrtc/trunk/webrtc/video_engine/desktop_capture_impl.cc
View File

@ -42,11 +42,6 @@ int32_t ScreenDeviceInfoImpl::Init() {
return 0;
}
int32_t ScreenDeviceInfoImpl::Refresh() {
desktop_device_info_->Refresh();
return 0;
}
uint32_t ScreenDeviceInfoImpl::NumberOfDevices() {
return desktop_device_info_->getDisplayDeviceCount();
}
@ -138,11 +133,6 @@ int32_t AppDeviceInfoImpl::Init() {
return 0;
}
int32_t AppDeviceInfoImpl::Refresh() {
desktop_device_info_->Refresh();
return 0;
}
uint32_t AppDeviceInfoImpl::NumberOfDevices() {
return desktop_device_info_->getApplicationCount();
}
@ -238,11 +228,6 @@ int32_t WindowDeviceInfoImpl::Init() {
return 0;
}
int32_t WindowDeviceInfoImpl::Refresh() {
desktop_device_info_->Refresh();
return 0;
}
uint32_t WindowDeviceInfoImpl::NumberOfDevices() {
return desktop_device_info_->getWindowCount();
}

5
media/webrtc/trunk/webrtc/video_engine/desktop_capture_impl.h
View File

@ -43,7 +43,6 @@ public:
virtual ~ScreenDeviceInfoImpl(void);
int32_t Init();
int32_t Refresh();
virtual uint32_t NumberOfDevices();
virtual int32_t GetDeviceName(uint32_t deviceNumber,
@ -81,7 +80,6 @@ public:
virtual ~AppDeviceInfoImpl(void);
int32_t Init();
int32_t Refresh();
virtual uint32_t NumberOfDevices();
virtual int32_t GetDeviceName(uint32_t deviceNumber,
@ -118,7 +116,6 @@ public:
virtual ~WindowDeviceInfoImpl(void) {};
int32_t Init();
int32_t Refresh();
virtual uint32_t NumberOfDevices();
virtual int32_t GetDeviceName(uint32_t deviceNumber,
@ -232,7 +229,7 @@ private:
TickTime _lastProcessTime; // last time the module process function was called.
TickTime _lastFrameRateCallbackTime; // last time the frame rate callback function was called.
bool _frameRateCallBack; // true if EnableFrameRateCallback
bool _noPictureAlarmCallBack; // true if EnableNoPictureAlarm
bool _noPictureAlarmCallBack; //true if EnableNoPictureAlarm
VideoCaptureAlarm _captureAlarm; // current value of the noPictureAlarm
int32_t _setCaptureDelay; // The currently used capture delay

1
media/webrtc/trunk/webrtc/video_engine/vie_input_manager.cc
View File

@ -66,7 +66,6 @@ int ViEInputManager::NumberOfCaptureDevices() {
CriticalSectionScoped cs(device_info_cs_.get());
GetDeviceInfo();
assert(capture_device_info_);
capture_device_info_->Refresh();
return capture_device_info_->NumberOfDevices();
}