diff options
| author | acolwell <acolwell@chromium.org> | 2014-09-16 17:52:29 -0700 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2014-09-17 00:52:48 +0000 |
| commit | 365c61ee0448affac494e59101d58c286a3812f2 (patch) | |
| tree | 8a7c03c1883cab652a7492a3e06194fcb46bdd08 /remoting/remoting_test.gypi | |
| parent | 230430abd55cab91d2d5e2c7a4b843ae0b89472b (diff) | |
| download | chromium_src-365c61ee0448affac494e59101d58c286a3812f2.zip chromium_src-365c61ee0448affac494e59101d58c286a3812f2.tar.gz chromium_src-365c61ee0448affac494e59101d58c286a3812f2.tar.bz2 | |
Revert of Remote Assistance on Chrome OS Part I - Aura Desktop Capturer (patchset #11 id:220001 of https://codereview.chromium.org/543243003/)
Reason for revert:
This patch appears to cause a Chrome OS bot to break.
http://build.chromium.org/p/chromium.chrome/buildstatus?builder=Google%20Chrome%20ChromeOS&number=71945
Original issue's description:
> Remote Assistance on Chrome OS - Aura Desktop Capturer
>
> This CL implements a WebRTC Desktop Capturer that captures from
> the Aura Shell root window.
>
> The capturer is used by the It2MeHost on Chrome OS.
> |DesktopCaptureDeviceAura| cannot be re-used in our scenario
> because is timer-driven as opposed to caller driven, which is
> required by WebRTC.
>
> The current implementation uses the layer API
>
> desktop_window_->layer()->RequestCopyOfOutput(request.Pass())
>
> to request the layer and its subtree to be rendered to a
> |SkiaBitmap|. It then copies the pixels to a WebRTC |DesktopFrame|.
>
> BUG=411530
>
> Committed: https://crrev.com/278b065b519617b1e9231bd53e6502706d20787c
> Cr-Commit-Position: refs/heads/master@{#295187}
TBR=sergeyu@chromium.org,dcaiafa@chromium.org,darin@chromium.org,wez@chromium.org,jamescook@chromium.org,reed@google.com,danakj@chromium.org,sky@chromium.org,kelvinp@chromium.org
NOTREECHECKS=true
NOTRY=true
BUG=411530
Review URL: https://codereview.chromium.org/579583003
Cr-Commit-Position: refs/heads/master@{#295196}
Diffstat (limited to 'remoting/remoting_test.gypi')
| -rw-r--r-- | remoting/remoting_test.gypi | 11 |
1 files changed, 1 insertions, 10 deletions
diff --git a/remoting/remoting_test.gypi b/remoting/remoting_test.gypi index 3bd537a..0b90f47 100644 --- a/remoting/remoting_test.gypi +++ b/remoting/remoting_test.gypi @@ -131,7 +131,6 @@ 'host/branding.cc', 'host/branding.h', 'host/capture_scheduler_unittest.cc', - 'host/chromeos/aura_desktop_capturer_unittest.cc', 'host/chromoting_host_context_unittest.cc', 'host/chromoting_host_unittest.cc', 'host/client_session_unittest.cc', @@ -243,13 +242,13 @@ [ 'chromeos==0', { 'sources!': [ 'client/plugin/normalizing_input_filter_cros_unittest.cc', - 'host/chromeos/aura_desktop_capturer_unittest.cc', ], }], ['enable_remoting_host == 0', { 'dependencies!': [ 'remoting_host', 'remoting_host_setup_base', + 'remoting_it2me_host_static', 'remoting_native_messaging_base', ], 'sources/': [ @@ -258,14 +257,6 @@ ['exclude', '^base/resources_unittest\\.cc$'], ] }], - ['enable_it2me_host == 0', { - 'dependencies!': [ - 'remoting_it2me_host_static', - ], - 'sources/': [ - ['exclude', '^host/it2me/'], - ] - }], [ 'OS == "linux" and use_allocator!="none"', { 'dependencies': [ '../base/allocator/allocator.gyp:allocator', |