| Index: webrtc/modules/desktop_capture/screen_capturer_x11.cc
|
| diff --git a/webrtc/modules/desktop_capture/screen_capturer_x11.cc b/webrtc/modules/desktop_capture/screen_capturer_x11.cc
|
| index ed31774070805716826f913ad7dd33458c5f560c..513df22cff42367724462d52bb3866c72a54c901 100644
|
| --- a/webrtc/modules/desktop_capture/screen_capturer_x11.cc
|
| +++ b/webrtc/modules/desktop_capture/screen_capturer_x11.cc
|
| @@ -29,7 +29,6 @@
|
| #include "webrtc/modules/desktop_capture/screen_capturer_helper.h"
|
| #include "webrtc/modules/desktop_capture/shared_desktop_frame.h"
|
| #include "webrtc/modules/desktop_capture/x11/x_server_pixel_buffer.h"
|
| -#include "webrtc/system_wrappers/include/logging.h"
|
|
|
| namespace webrtc {
|
| namespace {
|
| @@ -138,14 +137,12 @@ bool ScreenCapturerLinux::Init(const DesktopCaptureOptions& options) {
|
|
|
| root_window_ = RootWindow(display(), DefaultScreen(display()));
|
| if (root_window_ == BadValue) {
|
| - LOG(LS_ERROR) << "Unable to get the root window";
|
| DeinitXlib();
|
| return false;
|
| }
|
|
|
| gc_ = XCreateGC(display(), root_window_, 0, NULL);
|
| if (gc_ == NULL) {
|
| - LOG(LS_ERROR) << "Unable to get graphics context";
|
| DeinitXlib();
|
| return false;
|
| }
|
| @@ -158,14 +155,12 @@ bool ScreenCapturerLinux::Init(const DesktopCaptureOptions& options) {
|
| &xfixes_error_base_)) {
|
| has_xfixes_ = true;
|
| } else {
|
| - LOG(LS_INFO) << "X server does not support XFixes.";
|
| }
|
|
|
| // Register for changes to the dimensions of the root window.
|
| XSelectInput(display(), root_window_, StructureNotifyMask);
|
|
|
| if (!x_server_pixel_buffer_.Init(display(), DefaultRootWindow(display()))) {
|
| - LOG(LS_ERROR) << "Failed to initialize pixel buffer.";
|
| return false;
|
| }
|
|
|
| @@ -185,7 +180,6 @@ void ScreenCapturerLinux::InitXDamage() {
|
| // Check for XDamage extension.
|
| if (!XDamageQueryExtension(display(), &damage_event_base_,
|
| &damage_error_base_)) {
|
| - LOG(LS_INFO) << "X server does not support XDamage.";
|
| return;
|
| }
|
|
|
| @@ -198,7 +192,6 @@ void ScreenCapturerLinux::InitXDamage() {
|
| damage_handle_ = XDamageCreate(display(), root_window_,
|
| XDamageReportNonEmpty);
|
| if (!damage_handle_) {
|
| - LOG(LS_ERROR) << "Unable to initialize XDamage.";
|
| return;
|
| }
|
|
|
| @@ -206,7 +199,6 @@ void ScreenCapturerLinux::InitXDamage() {
|
| damage_region_ = XFixesCreateRegion(display(), 0, 0);
|
| if (!damage_region_) {
|
| XDamageDestroy(display(), damage_handle_);
|
| - LOG(LS_ERROR) << "Unable to create XFixes region.";
|
| return;
|
| }
|
|
|
| @@ -214,7 +206,6 @@ void ScreenCapturerLinux::InitXDamage() {
|
| damage_event_base_ + XDamageNotify, this);
|
|
|
| use_damage_ = true;
|
| - LOG(LS_INFO) << "Using XDamage extension.";
|
| }
|
|
|
| void ScreenCapturerLinux::Start(Callback* callback) {
|
| @@ -354,8 +345,6 @@ void ScreenCapturerLinux::ScreenConfigurationChanged() {
|
|
|
| helper_.ClearInvalidRegion();
|
| if (!x_server_pixel_buffer_.Init(display(), DefaultRootWindow(display()))) {
|
| - LOG(LS_ERROR) << "Failed to initialize pixel buffer after screen "
|
| - "configuration change.";
|
| }
|
| }
|
|
|
|
|