Use FallbackDesktopCapturerWrapper in ScreenCapturerWinMagnifier

Use FallbackDesktopCapturerWrapper in ScreenCapturerWinMagnifier

This is a trivial change to remove duplicate logic, i.e. fallback capturer, from
ScreenCapturerWinMagnifier.

BUG=webrtc:7215
Review-Url: https://codereview.webrtc.org/2704943002
Cr-Commit-Position: refs/heads/master@{#16781}
Committed: https://chromium.googlesource.com/external/webrtc/+/3fa87f782e0a11f1ce24e56a61f0b926e99670dc

[Hzj_jie, 2017-02-19 20:26:27]

The CQ bit was checked by zijiehe@chromium.org to run a CQ dry run

[commit-bot: I haz the power, 2017-02-19 20:26:33]

Dry run: 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, 2017-02-19 20:31:02]

The CQ bit was unchecked by commit-bot@chromium.org

[commit-bot: I haz the power, 2017-02-19 20:31:03]

Dry run: Try jobs failed on following builders:
  presubmit on master.tryserver.webrtc (JOB_FAILED,
http://build.chromium.org/p/tryserver.webrtc/builders/presubmit/builds/13702)

[Hzj_jie, 2017-02-19 21:13:10]

The CQ bit was checked by zijiehe@chromium.org to run a CQ dry run

[commit-bot: I haz the power, 2017-02-19 21:13:12]

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

[Hzj_jie, 2017-02-19 21:13:24]

Patchset #1 (id:1) has been deleted

[commit-bot: I haz the power, 2017-02-19 21:17:41]

The CQ bit was unchecked by commit-bot@chromium.org

[commit-bot: I haz the power, 2017-02-19 21:17:42]

Dry run: Try jobs failed on following builders:
  presubmit on master.tryserver.webrtc (JOB_FAILED,
http://build.chromium.org/p/tryserver.webrtc/builders/presubmit/builds/13704)

[Hzj_jie, 2017-02-19 21:21:10]

The CQ bit was checked by zijiehe@chromium.org to run a CQ dry run

[Hzj_jie, 2017-02-19 21:21:18]

Patchset #1 (id:20001) has been deleted

[commit-bot: I haz the power, 2017-02-19 21:21:25]

Dry run: 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, 2017-02-19 21:26:12]

The CQ bit was unchecked by commit-bot@chromium.org

[commit-bot: I haz the power, 2017-02-19 21:26:13]

Dry run: Try jobs failed on following builders:
  presubmit on master.tryserver.webrtc (JOB_FAILED,
http://build.chromium.org/p/tryserver.webrtc/builders/presubmit/builds/13706)

[Hzj_jie, 2017-02-19 21:58:36]

Description was changed from

==========
Use FallbackDesktopCapturerWrapper in ScreenCapturerWinMagnifier

This is a trivial change to remove duplicate logic, i.e. fallback capturer, from
ScreenCapturerWinMagnifier.

BUG=
==========

to

==========
Use FallbackDesktopCapturerWrapper in ScreenCapturerWinMagnifier

This is a trivial change to remove duplicate logic, i.e. fallback capturer, from
ScreenCapturerWinMagnifier.

BUG=
==========

[Hzj_jie, 2017-02-19 21:58:36]

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

[Sergey Ulanov, 2017-02-21 20:49:31]

https://codereview.webrtc.org/2704943002/diff/40001/webrtc/modules/desktop_ca...
File webrtc/modules/desktop_capture/screen_capturer_win.cc (right):

https://codereview.webrtc.org/2704943002/diff/40001/webrtc/modules/desktop_ca...
webrtc/modules/desktop_capture/screen_capturer_win.cc:35: capturer.reset(new
FallbackDesktopCapturerWrapper(
Please add a comment to explain why we need to use the fallback capturer here

https://codereview.webrtc.org/2704943002/diff/40001/webrtc/modules/desktop_ca...
File webrtc/modules/desktop_capture/win/screen_capturer_win_magnifier.cc
(right):

https://codereview.webrtc.org/2704943002/diff/40001/webrtc/modules/desktop_ca...
webrtc/modules/desktop_capture/win/screen_capturer_win_magnifier.cc:72: if
(!magnifier_initialized_) {
Previously the capturer was always falling back to the gdi capturer when 
magnifier_capture_succeeded_ = false. I think we still need that check, or
always return ERROR_PERMANENT.

[Hzj_jie, 2017-02-21 23:09:42]

The CQ bit was checked by zijiehe@chromium.org to run a CQ dry run

[commit-bot: I haz the power, 2017-02-21 23:09:51]

Dry run: 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, 2017-02-21 23:15:20]

The CQ bit was unchecked by commit-bot@chromium.org

[commit-bot: I haz the power, 2017-02-21 23:15:21]

Dry run: Try jobs failed on following builders:
  presubmit on master.tryserver.webrtc (JOB_FAILED,
http://build.chromium.org/p/tryserver.webrtc/builders/presubmit/builds/13850)

[Hzj_jie, 2017-02-21 23:27:34]

https://codereview.webrtc.org/2704943002/diff/40001/webrtc/modules/desktop_ca...
File webrtc/modules/desktop_capture/screen_capturer_win.cc (right):

https://codereview.webrtc.org/2704943002/diff/40001/webrtc/modules/desktop_ca...
webrtc/modules/desktop_capture/screen_capturer_win.cc:35: capturer.reset(new
FallbackDesktopCapturerWrapper(
On 2017/02/21 20:49:31, Sergey Ulanov wrote:
> Please add a comment to explain why we need to use the fallback capturer here

Done.

https://codereview.webrtc.org/2704943002/diff/40001/webrtc/modules/desktop_ca...
File webrtc/modules/desktop_capture/win/screen_capturer_win_magnifier.cc
(right):

https://codereview.webrtc.org/2704943002/diff/40001/webrtc/modules/desktop_ca...
webrtc/modules/desktop_capture/win/screen_capturer_win_magnifier.cc:72: if
(!magnifier_initialized_) {
On 2017/02/21 20:49:31, Sergey Ulanov wrote:
> Previously the capturer was always falling back to the gdi capturer when 
> magnifier_capture_succeeded_ = false. I think we still need that check, or
> always return ERROR_PERMANENT.

Done.

[Sergey Ulanov, 2017-02-22 18:39:46]

lgtm

[Hzj_jie, 2017-02-22 19:26:41]

The CQ bit was checked by zijiehe@chromium.org to run a CQ dry run

[commit-bot: I haz the power, 2017-02-22 19:26:46]

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

[Hzj_jie, 2017-02-22 19:26:51]

https://codereview.webrtc.org/2704943002/diff/60001/webrtc/modules/desktop_ca...
File webrtc/modules/desktop_capture/win/screen_capturer_win_magnifier.cc
(right):

https://codereview.webrtc.org/2704943002/diff/60001/webrtc/modules/desktop_ca...
webrtc/modules/desktop_capture/win/screen_capturer_win_magnifier.cc:197: // Do
not try to use the magnifier if it failed before and in multi-screen
Sorry, I forgot to update this comment. Here "if it failed before" is not
relative.

[commit-bot: I haz the power, 2017-02-22 19:33:12]

The CQ bit was unchecked by commit-bot@chromium.org

[commit-bot: I haz the power, 2017-02-22 19:33:13]

Dry run: Try jobs failed on following builders:
  presubmit on master.tryserver.webrtc (JOB_FAILED,
http://build.chromium.org/p/tryserver.webrtc/builders/presubmit/builds/13901)

[Hzj_jie, 2017-02-22 20:59:18]

The CQ bit was checked by zijiehe@chromium.org

[Hzj_jie, 2017-02-22 20:59:19]

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/2704943002/#ps80001 (title:
"Update comments")

[commit-bot: I haz the power, 2017-02-22 20:59:28]

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, 2017-02-22 21:05:40]

The CQ bit was unchecked by commit-bot@chromium.org

[commit-bot: I haz the power, 2017-02-22 21:05:42]

Try jobs failed on following builders:
  presubmit on master.tryserver.webrtc (JOB_FAILED,
http://build.chromium.org/p/tryserver.webrtc/builders/presubmit/builds/13902)

[Hzj_jie, 2017-02-22 21:43:33]

Description was changed from

==========
Use FallbackDesktopCapturerWrapper in ScreenCapturerWinMagnifier

This is a trivial change to remove duplicate logic, i.e. fallback capturer, from
ScreenCapturerWinMagnifier.

BUG=
==========

to

==========
Use FallbackDesktopCapturerWrapper in ScreenCapturerWinMagnifier

This is a trivial change to remove duplicate logic, i.e. fallback capturer, from
ScreenCapturerWinMagnifier.

BUG=webrtc:7215
==========

[Hzj_jie, 2017-02-22 21:43:40]

The CQ bit was checked by zijiehe@chromium.org

[commit-bot: I haz the power, 2017-02-22 21:43:45]

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, 2017-02-22 21:47:01]

CQ is committing da patch.

Bot data: {"patchset_id": 80001, "attempt_start_ts": 1487799820431260,
"parent_rev": "72694a04e4c7ba6e98b68111ca8665afd974f9cb", "commit_rev":
"3fa87f782e0a11f1ce24e56a61f0b926e99670dc"}

[commit-bot: I haz the power, 2017-02-22 21:47:04]

Description was changed from

==========
Use FallbackDesktopCapturerWrapper in ScreenCapturerWinMagnifier

This is a trivial change to remove duplicate logic, i.e. fallback capturer, from
ScreenCapturerWinMagnifier.

BUG=webrtc:7215
==========

to

==========
Use FallbackDesktopCapturerWrapper in ScreenCapturerWinMagnifier

This is a trivial change to remove duplicate logic, i.e. fallback capturer, from
ScreenCapturerWinMagnifier.

BUG=webrtc:7215

Review-Url: https://codereview.webrtc.org/2704943002
Cr-Commit-Position: refs/heads/master@{#16781}
Committed:
https://chromium.googlesource.com/external/webrtc/+/3fa87f782e0a11f1ce24e56a6...
==========

[commit-bot: I haz the power, 2017-02-22 21:47:05]

Committed patchset #3 (id:80001) as
https://chromium.googlesource.com/external/webrtc/+/3fa87f782e0a11f1ce24e56a6...