Add CreateWindowCapturer() and CreateScreenCapturer() in DesktopCapturer

Add CreateWindowCapturer() and CreateScreenCapturer() in DesktopCapturer

This change copies ScreenCapturerDifferWrapper to a new
DesktopCapturerDifferWrapper, and adds DesktopCapturer::CreateWindowCapturer and
DesktopCapturer::CreateScreenCapturer functions to replace
WindowCapturer::Create and ScreenCapturer::Create.

BUG=webrtc:6513
Committed: https://crrev.com/b763e39beba92b45baa09542f949daabbe6258a3
Committed: https://crrev.com/54fd57980f63152f72df22bad517ab297246b109
Cr-Original-Commit-Position: refs/heads/master@{#14880}
Cr-Commit-Position: refs/heads/master@{#14903}

[Hzj_jie, 2016-11-01 00:05:59]

Patchset #1 (id:1) has been deleted

[Hzj_jie, 2016-11-01 00:45:39]

zijiehe@chromium.org changed reviewers:
+ sergeyu@chromium.org

[Sergey Ulanov, 2016-11-01 20:33:31]

Couple nits for CL description:
 1. s/Adds/Add/
 2. Please remove the sentence that references "2435603010 and 2450053002". CL
description should be written for someone who looks at this change in the
future, not for the reviewer, and it should be clear by itself, without reading
descriptions for other uncommitted CLs.
 3. You can shorten the first title to "Add CreateWindowCapturer() and
CreateScreenCapturer() in  DesktopCapturer"

LGTM otherwise

https://codereview.webrtc.org/2468753002/diff/20001/webrtc/modules/desktop_ca...
File webrtc/modules/desktop_capture/desktop_capture.gypi (right):

https://codereview.webrtc.org/2468753002/diff/20001/webrtc/modules/desktop_ca...
webrtc/modules/desktop_capture/desktop_capture.gypi:144:
'desktop_capturer_differ_wrapper.cc',
Is gyp still being used somewhere?

https://codereview.webrtc.org/2468753002/diff/20001/webrtc/modules/desktop_ca...
File webrtc/modules/desktop_capture/desktop_capturer.cc (right):

https://codereview.webrtc.org/2468753002/diff/20001/webrtc/modules/desktop_ca...
webrtc/modules/desktop_capture/desktop_capturer.cc:37: #if
defined(RTC_DESKTOP_CAPTURE_SUPPORTED)
Ideally this file shouldn't be compiled at all when desktop capture is not
supported. But desktop_capture module is compiled on android anywhere because we
have capturer implementations for android in chromium. Please add a comment to
explain what happens here

https://codereview.webrtc.org/2468753002/diff/20001/webrtc/modules/desktop_ca...
webrtc/modules/desktop_capture/desktop_capturer.cc:59: #endif
 //  defined(RTC_DESKTOP_CAPTURE_SUPPORTED)

[Hzj_jie, 2016-11-01 20:35:56]

Description was changed from

==========
Adds DesktopCapturer::CreateWindowCapturer /
DesktopCapturer::CreateScreenCapturer

I have selected part of 2435603010 and 2450053002 to compose this change.
This change mainly copies ScreenCapturerDifferWrapper to a new
DesktopCapturerDifferWrapper, and adds DesktopCapturer::CreateWindowCapturer and
DesktopCapturer::CreateScreenCapturer functions to replace
WindowCapturer::Create and ScreenCapturer::Create.

BUG=webrtc:6513
==========

to

==========
Add CreateWindowCapturer() and CreateScreenCapturer() in DesktopCapturer

This change copies ScreenCapturerDifferWrapper to a new
DesktopCapturerDifferWrapper, and adds DesktopCapturer::CreateWindowCapturer and
DesktopCapturer::CreateScreenCapturer functions to replace
WindowCapturer::Create and ScreenCapturer::Create.

BUG=webrtc:6513
==========

[Hzj_jie, 2016-11-01 21:12:13]

https://codereview.webrtc.org/2468753002/diff/20001/webrtc/modules/desktop_ca...
File webrtc/modules/desktop_capture/desktop_capture.gypi (right):

https://codereview.webrtc.org/2468753002/diff/20001/webrtc/modules/desktop_ca...
webrtc/modules/desktop_capture/desktop_capture.gypi:144:
'desktop_capturer_differ_wrapper.cc',
On 2016/11/01 20:33:30, Sergey Ulanov wrote:
> Is gyp still being used somewhere?

No idea. Several trybots still have "gyp" in their names, but all of them are
dummy bots without really building the binary. Considering this file is still
existing, and referred by
https://cs.chromium.org/chromium/src/third_party/webrtc/modules/modules.gyp,
ensuring it buildable with this small effort looks safe.

https://codereview.webrtc.org/2468753002/diff/20001/webrtc/modules/desktop_ca...
File webrtc/modules/desktop_capture/desktop_capturer.cc (right):

https://codereview.webrtc.org/2468753002/diff/20001/webrtc/modules/desktop_ca...
webrtc/modules/desktop_capture/desktop_capturer.cc:37: #if
defined(RTC_DESKTOP_CAPTURE_SUPPORTED)
On 2016/11/01 20:33:31, Sergey Ulanov wrote:
> Ideally this file shouldn't be compiled at all when desktop capture is not
> supported. But desktop_capture module is compiled on android anywhere because
we
> have capturer implementations for android in chromium. Please add a comment to
> explain what happens here

Is there any reason we put AuraDesktopCapturer for Chrome OS in Chromium instead
of WebRTC?

https://codereview.webrtc.org/2468753002/diff/20001/webrtc/modules/desktop_ca...
webrtc/modules/desktop_capture/desktop_capturer.cc:59: #endif
On 2016/11/01 20:33:31, Sergey Ulanov wrote:
>  //  defined(RTC_DESKTOP_CAPTURE_SUPPORTED)

Done.

[Hzj_jie, 2016-11-01 22:34:31]

The CQ bit was checked by zijiehe@chromium.org

[Hzj_jie, 2016-11-01 22:34:33]

The patchset sent to the CQ was uploaded after l-g-t-m from sergeyu@chromium.org
Link to the patchset: https://codereview.webrtc.org/2468753002/#ps40001 (title:
"Resolve review comments")

[commit-bot: I haz the power, 2016-11-01 22:34:41]

CQ is trying da patch. Follow status at
 
https://chromium-cq-status.appspot.com/v2/patch-status/codereview.webrtc.org/...

[commit-bot: I haz the power, 2016-11-01 23:02:46]

Description was changed from

==========
Add CreateWindowCapturer() and CreateScreenCapturer() in DesktopCapturer

This change copies ScreenCapturerDifferWrapper to a new
DesktopCapturerDifferWrapper, and adds DesktopCapturer::CreateWindowCapturer and
DesktopCapturer::CreateScreenCapturer functions to replace
WindowCapturer::Create and ScreenCapturer::Create.

BUG=webrtc:6513
==========

to

==========
Add CreateWindowCapturer() and CreateScreenCapturer() in DesktopCapturer

This change copies ScreenCapturerDifferWrapper to a new
DesktopCapturerDifferWrapper, and adds DesktopCapturer::CreateWindowCapturer and
DesktopCapturer::CreateScreenCapturer functions to replace
WindowCapturer::Create and ScreenCapturer::Create.

BUG=webrtc:6513
==========

[commit-bot: I haz the power, 2016-11-01 23:02:47]

Committed patchset #2 (id:40001)

[commit-bot: I haz the power, 2016-11-01 23:02:55]

Description was changed from

==========
Add CreateWindowCapturer() and CreateScreenCapturer() in DesktopCapturer

This change copies ScreenCapturerDifferWrapper to a new
DesktopCapturerDifferWrapper, and adds DesktopCapturer::CreateWindowCapturer and
DesktopCapturer::CreateScreenCapturer functions to replace
WindowCapturer::Create and ScreenCapturer::Create.

BUG=webrtc:6513
==========

to

==========
Add CreateWindowCapturer() and CreateScreenCapturer() in DesktopCapturer

This change copies ScreenCapturerDifferWrapper to a new
DesktopCapturerDifferWrapper, and adds DesktopCapturer::CreateWindowCapturer and
DesktopCapturer::CreateScreenCapturer functions to replace
WindowCapturer::Create and ScreenCapturer::Create.

BUG=webrtc:6513

Committed: https://crrev.com/b763e39beba92b45baa09542f949daabbe6258a3
Cr-Commit-Position: refs/heads/master@{#14880}
==========

[commit-bot: I haz the power, 2016-11-01 23:02:56]

Patchset 2 (id:??) landed as
https://crrev.com/b763e39beba92b45baa09542f949daabbe6258a3
Cr-Commit-Position: refs/heads/master@{#14880}

[perkj_webrtc, 2016-11-02 10:13:00]

A revert of this CL (patchset #2 id:40001) has been created in
https://codereview.webrtc.org/2471773002/ by perkj@webrtc.org.

The reason for reverting is: Prevents WebRTC rolls into Chrome.

https://build.chromium.org/p/chromium.linux/builders/Blimp%20Linux%20%28dbg%2...

The reason for reverting is: Breaks
https://build.chromium.org/p/chromium.linux/builders/Blimp%20Linux%20%28dbg%2...
[881/894] SOLINK ./libcontent.so
FAILED: libcontent.so libcontent.so.TOC
../../third_party/webrtc/modules/desktop_capture/desktop_capturer.cc:45: error:
undefined reference to
'webrtc::DesktopCapturer::CreateRawWindowCapturer(webrtc::DesktopCaptureOptions
const&)'
../../third_party/webrtc/modules/desktop_capture/desktop_capturer.cc:56: error:
undefined reference to
'webrtc::DesktopCapturer::CreateRawScreenCapturer(webrtc::DesktopCaptureOptions
const&)'
clang: error: linker command failed with exit code 1 (use -v to see invocation)
ninja: build stopped: subcommand failed.

.

[Hzj_jie, 2016-11-02 19:07:46]

Description was changed from

==========
Add CreateWindowCapturer() and CreateScreenCapturer() in DesktopCapturer

This change copies ScreenCapturerDifferWrapper to a new
DesktopCapturerDifferWrapper, and adds DesktopCapturer::CreateWindowCapturer and
DesktopCapturer::CreateScreenCapturer functions to replace
WindowCapturer::Create and ScreenCapturer::Create.

BUG=webrtc:6513

Committed: https://crrev.com/b763e39beba92b45baa09542f949daabbe6258a3
Cr-Commit-Position: refs/heads/master@{#14880}
==========

to

==========
Add CreateWindowCapturer() and CreateScreenCapturer() in DesktopCapturer

This change copies ScreenCapturerDifferWrapper to a new
DesktopCapturerDifferWrapper, and adds DesktopCapturer::CreateWindowCapturer and
DesktopCapturer::CreateScreenCapturer functions to replace
WindowCapturer::Create and ScreenCapturer::Create.

BUG=webrtc:6513

Committed: https://crrev.com/b763e39beba92b45baa09542f949daabbe6258a3
Cr-Commit-Position: refs/heads/master@{#14880}
==========

[Hzj_jie, 2016-11-02 19:11:58]

Patchset #3 (id:60001) has been deleted

[Hzj_jie, 2016-11-02 21:34:12]

The CQ bit was checked by zijiehe@chromium.org

[Hzj_jie, 2016-11-02 21:34:13]

The patchset sent to the CQ was uploaded after l-g-t-m from sergeyu@chromium.org
Link to the patchset: https://codereview.webrtc.org/2468753002/#ps80001 (title:
"Build break without X11")

[commit-bot: I haz the power, 2016-11-02 21:34:18]

CQ is trying da patch. Follow status at
 
https://chromium-cq-status.appspot.com/v2/patch-status/codereview.webrtc.org/...

[commit-bot: I haz the power, 2016-11-02 21:49:37]

Description was changed from

==========
Add CreateWindowCapturer() and CreateScreenCapturer() in DesktopCapturer

This change copies ScreenCapturerDifferWrapper to a new
DesktopCapturerDifferWrapper, and adds DesktopCapturer::CreateWindowCapturer and
DesktopCapturer::CreateScreenCapturer functions to replace
WindowCapturer::Create and ScreenCapturer::Create.

BUG=webrtc:6513

Committed: https://crrev.com/b763e39beba92b45baa09542f949daabbe6258a3
Cr-Commit-Position: refs/heads/master@{#14880}
==========

to

==========
Add CreateWindowCapturer() and CreateScreenCapturer() in DesktopCapturer

This change copies ScreenCapturerDifferWrapper to a new
DesktopCapturerDifferWrapper, and adds DesktopCapturer::CreateWindowCapturer and
DesktopCapturer::CreateScreenCapturer functions to replace
WindowCapturer::Create and ScreenCapturer::Create.

BUG=webrtc:6513

Committed: https://crrev.com/b763e39beba92b45baa09542f949daabbe6258a3
Cr-Commit-Position: refs/heads/master@{#14880}
==========

[commit-bot: I haz the power, 2016-11-02 21:49:38]

Committed patchset #3 (id:80001)

[commit-bot: I haz the power, 2016-11-02 21:49:44]

Description was changed from

==========
Add CreateWindowCapturer() and CreateScreenCapturer() in DesktopCapturer

This change copies ScreenCapturerDifferWrapper to a new
DesktopCapturerDifferWrapper, and adds DesktopCapturer::CreateWindowCapturer and
DesktopCapturer::CreateScreenCapturer functions to replace
WindowCapturer::Create and ScreenCapturer::Create.

BUG=webrtc:6513

Committed: https://crrev.com/b763e39beba92b45baa09542f949daabbe6258a3
Cr-Commit-Position: refs/heads/master@{#14880}
==========

to

==========
Add CreateWindowCapturer() and CreateScreenCapturer() in DesktopCapturer

This change copies ScreenCapturerDifferWrapper to a new
DesktopCapturerDifferWrapper, and adds DesktopCapturer::CreateWindowCapturer and
DesktopCapturer::CreateScreenCapturer functions to replace
WindowCapturer::Create and ScreenCapturer::Create.

BUG=webrtc:6513

Committed: https://crrev.com/b763e39beba92b45baa09542f949daabbe6258a3
Committed: https://crrev.com/54fd57980f63152f72df22bad517ab297246b109
Cr-Original-Commit-Position: refs/heads/master@{#14880}
Cr-Commit-Position: refs/heads/master@{#14903}
==========

[commit-bot: I haz the power, 2016-11-02 21:49:46]

Patchset 3 (id:??) landed as
https://crrev.com/54fd57980f63152f72df22bad517ab297246b109
Cr-Commit-Position: refs/heads/master@{#14903}