Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2025-03-01 22:07:41 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bug 1036653 - fix missing includes in shared_x_util, r=jesup

Browse Source
This commit is contained in:
Matthew A. Miller 2014-08-25 13:42:21 -06:00
parent 3502339bc7
commit ad184ca791
2 changed files with 14 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -3,17 +3,17 @@
* You can obtain one at http://mozilla.org/MPL/2.0/. */
#include "webrtc/modules/desktop_capture/x11/desktop_device_info_x11.h"
#include "webrtc/modules/desktop_capture/window_capturer.h"
#include "webrtc/modules/desktop_capture/x11/x_error_trap.h"
#include "webrtc/modules/desktop_capture/x11/x_server_pixel_buffer.h"
#include "webrtc/system_wrappers/interface/logging.h"
#include "webrtc/system_wrappers/interface/scoped_ptr.h"
#include "webrtc/system_wrappers/interface/scoped_refptr.h"
#include "webrtc/modules/desktop_capture/x11/shared_x_util.h"
#include <unistd.h>
#include <stdio.h>
#include "webrtc/modules/desktop_capture/x11/shared_x_util.h"
#include "webrtc/modules/desktop_capture/window_capturer.h"
#include "webrtc/modules/desktop_capture/x11/x_error_trap.h"
#include "webrtc/modules/desktop_capture/x11/x_server_pixel_buffer.h"
namespace webrtc{
namespace webrtc {
DesktopDeviceInfo * DesktopDeviceInfoImpl::Create() {
DesktopDeviceInfoX11 * pDesktopDeviceInfo = new DesktopDeviceInfoX11();

12
media/webrtc/trunk/webrtc/modules/desktop_capture/x11/shared_x_util.h
View File

@ -11,8 +11,17 @@
#ifndef WEBRTC_MODULES_DESKTOP_CAPTURE_X11_SHARED_X_UTIL_H_
#define WEBRTC_MODULES_DESKTOP_CAPTURE_X11_SHARED_X_UTIL_H_
#include "webrtc/system_wrappers/interface/atomic32.h"
#include "webrtc/system_wrappers/interface/scoped_refptr.h"
#include "webrtc/modules/desktop_capture/x11/shared_x_display.h"
#include "webrtc/system_wrappers/interface/logging.h"
#include <unistd.h>
#include <string.h>
#include <map>
#include <vector>
#include <vector>
#include <algorithm>
#include <assert.h>
#include <X11/Xlib.h>
@ -23,9 +32,6 @@
#include <X11/Xutil.h>
#include <string>
#include "webrtc/system_wrappers/interface/atomic32.h"
#include "webrtc/system_wrappers/interface/scoped_refptr.h"
namespace webrtc {
//===============================================================================