| Index: webrtc/modules/desktop_capture/screen_capturer_mac.mm
|
| diff --git a/webrtc/modules/desktop_capture/screen_capturer_mac.mm b/webrtc/modules/desktop_capture/screen_capturer_mac.mm
|
| index 78c2cf20b7a6ec41d49582ec61d1d36214cd0dda..94a2be21dda751058dc83b4d473ea34c848e85de 100644
|
| --- a/webrtc/modules/desktop_capture/screen_capturer_mac.mm
|
| +++ b/webrtc/modules/desktop_capture/screen_capturer_mac.mm
|
| @@ -36,7 +36,6 @@
|
| #include "webrtc/modules/desktop_capture/screen_capture_frame_queue.h"
|
| #include "webrtc/modules/desktop_capture/screen_capturer_helper.h"
|
| #include "webrtc/modules/desktop_capture/shared_desktop_frame.h"
|
| -#include "webrtc/system_wrappers/include/logging.h"
|
|
|
| // Once Chrome no longer supports OSX 10.8, everything within this
|
| // preprocessor block can be removed. https://crbug.com/579255
|
| @@ -693,7 +692,6 @@ bool ScreenCapturerMac::CgBlitPostLion(const DesktopFrame& frame,
|
| if (config) {
|
| displays_to_capture.push_back(*config);
|
| } else {
|
| - LOG(LS_ERROR) << "The selected screen cannot be found for capturing.";
|
| return false;
|
| }
|
| } else {
|
| @@ -756,9 +754,6 @@ bool ScreenCapturerMac::CgBlitPostLion(const DesktopFrame& frame,
|
| // Verify that the image has 32-bit depth.
|
| int bits_per_pixel = CGImageGetBitsPerPixel(image);
|
| if (bits_per_pixel / 8 != DesktopFrame::kBytesPerPixel) {
|
| - LOG(LS_ERROR) << "CGDisplayCreateImage() returned imaged with "
|
| - << bits_per_pixel
|
| - << " bits per pixel. Only 32-bit depth is supported.";
|
| CFRelease(image);
|
| if (excluded_image)
|
| CFRelease(excluded_image);
|
| @@ -851,7 +846,6 @@ void ScreenCapturerMac::ScreenConfigurationChanged() {
|
| // the machine has no monitor connected, so we fall back to depcreated APIs
|
| // when running on 10.6.
|
| if (rtc::GetOSVersionName() >= rtc::kMacOSLion) {
|
| - LOG(LS_INFO) << "Using CgBlitPostLion.";
|
| // No need for any OpenGL support on Lion
|
| return;
|
| }
|
| @@ -860,13 +854,11 @@ void ScreenCapturerMac::ScreenConfigurationChanged() {
|
| app_services_library_ = dlopen(kApplicationServicesLibraryName,
|
| RTLD_LAZY);
|
| if (!app_services_library_) {
|
| - LOG_F(LS_ERROR) << "Failed to open " << kApplicationServicesLibraryName;
|
| abort();
|
| }
|
|
|
| opengl_library_ = dlopen(kOpenGlLibraryName, RTLD_LAZY);
|
| if (!opengl_library_) {
|
| - LOG_F(LS_ERROR) << "Failed to open " << kOpenGlLibraryName;
|
| abort();
|
| }
|
|
|
| @@ -880,23 +872,18 @@ void ScreenCapturerMac::ScreenConfigurationChanged() {
|
| dlsym(opengl_library_, "CGLSetFullScreen"));
|
| if (!(cg_display_base_address_ && cg_display_bytes_per_row_ &&
|
| cg_display_bits_per_pixel_ && cgl_set_full_screen_)) {
|
| - LOG_F(LS_ERROR);
|
| abort();
|
| }
|
|
|
| if (desktop_config_.displays.size() > 1) {
|
| - LOG(LS_INFO) << "Using CgBlitPreLion (Multi-monitor).";
|
| return;
|
| }
|
|
|
| CGDirectDisplayID mainDevice = CGMainDisplayID();
|
| if (!CGDisplayUsesOpenGLAcceleration(mainDevice)) {
|
| - LOG(LS_INFO) << "Using CgBlitPreLion (OpenGL unavailable).";
|
| return;
|
| }
|
|
|
| - LOG(LS_INFO) << "Using GlBlit";
|
| -
|
| CGLPixelFormatAttribute attributes[] = {
|
| // This function does an early return if GetOSVersionName() >= kMacOSLion,
|
| // this code only runs on 10.6 and can be deleted once 10.6 support is
|
|
|