diff options
| author | hclam@chromium.org <hclam@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-07-02 19:09:48 +0000 |
|---|---|---|
| committer | hclam@chromium.org <hclam@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-07-02 19:09:48 +0000 |
| commit | 96c7c5645dceaf112c0e82c98f8b0fe67eb3dcbe (patch) | |
| tree | eae0b277703dcd38666ff9408ab8f48b35b8e08d /content | |
| parent | b5976bb7d4f07f4504c799c3fef8f0d923c2070d (diff) | |
| download | chromium_src-96c7c5645dceaf112c0e82c98f8b0fe67eb3dcbe.zip chromium_src-96c7c5645dceaf112c0e82c98f8b0fe67eb3dcbe.tar.gz chromium_src-96c7c5645dceaf112c0e82c98f8b0fe67eb3dcbe.tar.bz2 | |
Merge 209291 "In the path used by XP and --disable-image-transpo..."
> In the path used by XP and --disable-image-transport-surface, where the GPU process is
> presenting directly, software paint events should still trigger capture.
>
> This fixes bug 247123, though affected computers are unlikely to perform well.
>
> BUG=247123
>
> Review URL: https://chromiumcodereview.appspot.com/18245002
TBR=nick@chromium.org
Review URL: https://codereview.chromium.org/18555003
git-svn-id: svn://svn.chromium.org/chrome/branches/1547/src@209747 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'content')
| -rw-r--r-- | content/browser/renderer_host/media/web_contents_video_capture_device.cc | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/content/browser/renderer_host/media/web_contents_video_capture_device.cc b/content/browser/renderer_host/media/web_contents_video_capture_device.cc index 42868c0..2ec721b 100644 --- a/content/browser/renderer_host/media/web_contents_video_capture_device.cc +++ b/content/browser/renderer_host/media/web_contents_video_capture_device.cc @@ -591,7 +591,8 @@ void ContentCaptureSubscription::Observe( // This message occurs on window resizes and visibility changes even when // accelerated compositing is active, so we need to filter out these cases. - if (!rwh || !rwh->GetView() || rwh->is_accelerated_compositing_active()) + if (!rwh || !rwh->GetView() || (rwh->is_accelerated_compositing_active() && + rwh->GetView()->IsSurfaceAvailableForCopy())) return; TRACE_EVENT1("mirroring", "ContentCaptureSubscription::Observe", |