diff options
| author | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2018-05-15 10:20:33 +0200 |
|---|---|---|
| committer | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2018-05-15 10:28:57 +0000 |
| commit | d17ea114e5ef69ad5d5d7413280a13e6428098aa (patch) | |
| tree | 2c01a75df69f30d27b1432467cfe7c1467a498da /chromium/content/browser/media/capture/web_contents_video_capture_device_browsertest.cc | |
| parent | 8c5c43c7b138c9b4b0bf56d946e61d3bbc111bec (diff) | |
| download | qtwebengine-chromium-d17ea114e5ef69ad5d5d7413280a13e6428098aa.tar.gz | |
BASELINE: Update Chromium to 67.0.3396.47
Change-Id: Idcb1341782e417561a2473eeecc82642dafda5b7
Reviewed-by: Michal Klocek <michal.klocek@qt.io>
Diffstat (limited to 'chromium/content/browser/media/capture/web_contents_video_capture_device_browsertest.cc')
| -rw-r--r-- | chromium/content/browser/media/capture/web_contents_video_capture_device_browsertest.cc | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/chromium/content/browser/media/capture/web_contents_video_capture_device_browsertest.cc b/chromium/content/browser/media/capture/web_contents_video_capture_device_browsertest.cc index c717c84aa8a..5a6951ca012 100644 --- a/chromium/content/browser/media/capture/web_contents_video_capture_device_browsertest.cc +++ b/chromium/content/browser/media/capture/web_contents_video_capture_device_browsertest.cc @@ -126,9 +126,7 @@ class FakeVideoCaptureStack { reinterpret_cast<uint8_t*>(mapping.get()), mapped_size, frame_info->timestamp); CHECK(frame); - if (frame_info->metadata) { - frame->metadata()->MergeInternalValuesFrom(*frame_info->metadata); - } + frame->metadata()->MergeInternalValuesFrom(frame_info->metadata); // This destruction observer will unmap the shared memory when the // VideoFrame goes out-of-scope. frame->AddDestructionObserver(base::BindOnce( |