Decoupling desktop_capture from Obj-C code.

webrtc/modules/desktop_capture/BUILD.gn

 # Copyright (c) 2014 The WebRTC project authors. All Rights Reserved.
 #
 # Use of this source code is governed by a BSD-style license
 # that can be found in the LICENSE file in the root of the source
 # 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.
 
 import("//build/config/ui.gni")
 import("../../webrtc.gni")
@@ skipping 83 matching lines @@
     deps = [
       ":desktop_capture",
       ":desktop_capture_mock",
       ":primitives",
       "../..:webrtc_common",
       "../../rtc_base:rtc_base_approved",
       "../../system_wrappers",
       "../../test:test_support",
       "//testing/gmock",
     ]
+    if (is_mac) {
+      deps += [ ":objc_desktop_capture" ]
+    }
     if (rtc_desktop_capture_supported) {
       sources += [
         "screen_capturer_helper_unittest.cc",
         "screen_capturer_mac_unittest.cc",
         "screen_capturer_unittest.cc",
         "window_capturer_unittest.cc",
       ]
       deps += [ ":desktop_capture_mock" ]
     }
     if (!build_with_chromium && is_clang) {
@@ skipping 42 matching lines @@
     ]
 
     deps = [
       ":primitives",
       "../../rtc_base:rtc_base_approved",
       "../../test:test_support",
     ]
   }
 }
 
+if (is_mac) {
+  rtc_source_set("objc_desktop_capture") {

[kjellander_webrtc, 2017/08/14 04:36:26]

We seem to have a mix of prefixed objc_ targets and suffixed _objc targets in
the codebase. I prefer the latter, and it's what I've used for C-only targets in
the past. I think also _android and _linux suffixes already exists as well.
Please rename.

[mbonadei, 2017/08/15 14:55:39]

Done.

+    check_includes = false

[kjellander_webrtc, 2017/08/14 04:36:26]

Please include a comment referencing a bug tracking to get this fixed. OK to use
the umbrella bug if there isn't any specific one or webrtc:7743 is not suitable.

Is there a way to refactor out the cyclic dependency by moving
mac/desktop_configuration.h into it's own target?

[mbonadei, 2017/08/15 14:55:39]

In ps#2 we have removed the circular dependency.

+    sources = [
+      "mac/desktop_configuration.h",
+      "mac/desktop_configuration.mm",
+      "mouse_cursor_monitor_mac.mm",
+      "screen_capturer_mac.mm",
+      "window_capturer_mac.mm",
+    ]
+
+    # deps = [ ":desktop_capture" ]

[Sergey Ulanov, 2017/08/14 17:53:18]

Remove this?

[mbonadei, 2017/08/15 14:55:39]

Done.

+  }
+}
+
 rtc_static_library("desktop_capture") {
   sources = [
     "blank_detector_desktop_capturer_wrapper.cc",
     "blank_detector_desktop_capturer_wrapper.h",
     "cropped_desktop_frame.cc",
     "cropped_desktop_frame.h",
     "cropping_window_capturer.cc",
     "cropping_window_capturer.h",
     "cropping_window_capturer_win.cc",
     "desktop_and_cursor_composer.cc",
     "desktop_and_cursor_composer.h",
     "desktop_capture_options.cc",
     "desktop_capture_options.h",
     "desktop_capturer.cc",
     "desktop_capturer.h",
     "desktop_capturer_differ_wrapper.cc",
     "desktop_capturer_differ_wrapper.h",
     "desktop_frame_rotation.cc",
     "desktop_frame_rotation.h",
     "desktop_frame_win.cc",
     "desktop_frame_win.h",
     "differ_block.cc",
     "differ_block.h",
     "fallback_desktop_capturer_wrapper.cc",
     "fallback_desktop_capturer_wrapper.h",
-    "mac/desktop_configuration.h",
-    "mac/desktop_configuration.mm",
     "mac/desktop_configuration_monitor.cc",
     "mac/desktop_configuration_monitor.h",
     "mac/full_screen_chrome_window_detector.cc",
     "mac/full_screen_chrome_window_detector.h",
     "mac/scoped_pixel_buffer_object.cc",
     "mac/scoped_pixel_buffer_object.h",
     "mac/window_list_utils.cc",
     "mac/window_list_utils.h",
     "mouse_cursor.cc",
     "mouse_cursor.h",
     "mouse_cursor_monitor.h",
-    "mouse_cursor_monitor_mac.mm",
     "mouse_cursor_monitor_win.cc",
     "resolution_change_detector.cc",
     "resolution_change_detector.h",
     "rgba_color.cc",
     "rgba_color.h",
     "screen_capture_frame_queue.h",
     "screen_capturer_helper.cc",
     "screen_capturer_helper.h",
-    "screen_capturer_mac.mm",
     "screen_capturer_win.cc",
     "win/cursor.cc",
     "win/cursor.h",
     "win/d3d_device.cc",
     "win/d3d_device.h",
     "win/desktop.cc",
     "win/desktop.h",
     "win/display_configuration_monitor.cc",
     "win/display_configuration_monitor.h",
     "win/dxgi_adapter_duplicator.cc",
@@ skipping 18 matching lines @@
     "win/screen_capture_utils.cc",
     "win/screen_capture_utils.h",
     "win/screen_capturer_win_directx.cc",
     "win/screen_capturer_win_directx.h",
     "win/screen_capturer_win_gdi.cc",
     "win/screen_capturer_win_gdi.h",
     "win/screen_capturer_win_magnifier.cc",
     "win/screen_capturer_win_magnifier.h",
     "win/window_capture_utils.cc",
     "win/window_capture_utils.h",
-    "window_capturer_mac.mm",
     "window_capturer_win.cc",
   ]
 
   if (use_x11) {
     sources += [
       "mouse_cursor_monitor_x11.cc",
       "screen_capturer_x11.cc",
       "window_capturer_x11.cc",
       "x11/shared_x_display.cc",
       "x11/shared_x_display.h",
       "x11/x_error_trap.cc",
       "x11/x_error_trap.h",
       "x11/x_server_pixel_buffer.cc",
       "x11/x_server_pixel_buffer.h",
     ]
     configs += [ "//build/config/linux:x11" ]
   }
 
   if (!is_win && !is_mac && !use_x11) {
     sources += [
       "mouse_cursor_monitor_null.cc",
       "screen_capturer_null.cc",
       "window_capturer_null.cc",
     ]
   }
 
-  if (is_mac) {
-    libs = [
-      "AppKit.framework",
-      "IOKit.framework",
-      "OpenGL.framework",
-    ]
-  }
-
   if (is_win) {
     libs = [
       "d3d11.lib",
       "dxgi.lib",
     ]
   }
 
   deps = [
     ":primitives",
     "../..:webrtc_common",
     "../../rtc_base:rtc_base",  # TODO(kjellander): Cleanup in bugs.webrtc.org/3806.
     "../../system_wrappers",
     "//third_party/libyuv",
   ]
 
+  if (is_mac) {
+    deps += [ ":objc_desktop_capture" ]
+    libs = [

[Sergey Ulanov, 2017/08/14 17:53:18]

maybe move this to objc_desktop_capture?

[mbonadei, 2017/08/15 14:55:39]

Done.

+      "AppKit.framework",
+      "IOKit.framework",
+      "OpenGL.framework",
+    ]
+  }
+
   if (use_desktop_capture_differ_sse2) {
     deps += [ ":desktop_capture_differ_sse2" ]
   }
 }
 
 if (use_desktop_capture_differ_sse2) {
   # Have to be compiled as a separate target because it needs to be compiled
   # with SSE2 enabled.
   rtc_static_library("desktop_capture_differ_sse2") {
     visibility = [ ":*" ]
     sources = [
       "differ_vector_sse2.cc",
       "differ_vector_sse2.h",
     ]
 
     if (is_posix) {
       cflags = [ "-msse2" ]
     }
   }
 }