Backed out changeset 79d402a25984 (bug 1036653)
authorCarsten "Tomcat" Book <cbook@mozilla.com>
Wed, 27 Aug 2014 09:20:32 +0200
changeset 223545 f51225f9377656229d16e43a3854dab4b6e2eb03
parent 223544 c47c04eceb4610d9d560fb5bbd26724abf8df0f3
child 223546 0b3b9f1a0c8e948ab02b9fdc99a7c598e5470bc0
push id3979
push userraliiev@mozilla.com
push dateMon, 13 Oct 2014 16:35:44 +0000
treeherdermozilla-beta@30f2cc610691 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
bugs1036653
milestone34.0a1
backs out79d402a259843fcedb312d6dc18d6151c21a3c9d
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Backed out changeset 79d402a25984 (bug 1036653)
media/webrtc/trunk/webrtc/modules/desktop_capture/x11/desktop_device_info_x11.cc
media/webrtc/trunk/webrtc/modules/desktop_capture/x11/shared_x_util.h
--- a/media/webrtc/trunk/webrtc/modules/desktop_capture/x11/desktop_device_info_x11.cc
+++ b/media/webrtc/trunk/webrtc/modules/desktop_capture/x11/desktop_device_info_x11.cc
@@ -1,24 +1,24 @@
 /* This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this file,
  * 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();
   if (pDesktopDeviceInfo && pDesktopDeviceInfo->Init() != 0){
     delete pDesktopDeviceInfo;
     pDesktopDeviceInfo = NULL;
   }
   return pDesktopDeviceInfo;
--- a/media/webrtc/trunk/webrtc/modules/desktop_capture/x11/shared_x_util.h
+++ b/media/webrtc/trunk/webrtc/modules/desktop_capture/x11/shared_x_util.h
@@ -6,37 +6,31 @@
  *  tree. An additional intellectual property rights grant can be found
  *  in the file PATENTS.  All contributing project authors may
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
 #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>
 
 #include <X11/Xatom.h>
 #include <X11/extensions/Xcomposite.h>
 #include <X11/extensions/Xrender.h>
 #include <X11/Xutil.h>
 #include <string>
 
+#include "webrtc/system_wrappers/interface/atomic32.h"
+#include "webrtc/system_wrappers/interface/scoped_refptr.h"
+
 namespace webrtc {
 
 //===============================================================================
 // Moved common code from window_capture_x11.cc to better reuse throughout module
 
 // Convenience wrapper for XGetWindowProperty() results.
 template <class PropertyType>
 class XWindowProperty {