Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(489)

Unified Diff: content/browser/renderer_host/media/video_capture_controller_unittest.cc

Issue 1427543002: Modified old wait sync point functions to also accept new sync tokens. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Fix mock gpu video accelerator factory Created 5 years, 2 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: content/browser/renderer_host/media/video_capture_controller_unittest.cc
diff --git a/content/browser/renderer_host/media/video_capture_controller_unittest.cc b/content/browser/renderer_host/media/video_capture_controller_unittest.cc
index e376b90ee3cfcd8dd5176a043652dc57d01d1c2a..46b0f80cfad03f85f31c606be392fdb7f2802797 100644
--- a/content/browser/renderer_host/media/video_capture_controller_unittest.cc
+++ b/content/browser/renderer_host/media/video_capture_controller_unittest.cc
@@ -86,9 +86,10 @@ class MockVideoCaptureControllerEventHandler
EXPECT_EQ(frame->format(), media::PIXEL_FORMAT_I420);
DoI420BufferReady(id, frame->coded_size());
base::ThreadTaskRunnerHandle::Get()->PostTask(
- FROM_HERE, base::Bind(&VideoCaptureController::ReturnBuffer,
- base::Unretained(controller_), id, this,
- buffer_id, 0, resource_utilization_));
+ FROM_HERE,
+ base::Bind(&VideoCaptureController::ReturnBuffer,
+ base::Unretained(controller_), id, this, buffer_id, 0,
+ gpu::SyncToken(), resource_utilization_));
} else {
EXPECT_EQ(frame->format(), media::PIXEL_FORMAT_ARGB);
DoTextureBufferReady(id, frame->coded_size());
@@ -96,6 +97,7 @@ class MockVideoCaptureControllerEventHandler
FROM_HERE, base::Bind(&VideoCaptureController::ReturnBuffer,
base::Unretained(controller_), id, this,
buffer_id, frame->mailbox_holder(0).sync_point,
+ frame->mailbox_holder(0).sync_token,
resource_utilization_));
}
}

Powered by Google App Engine
This is Rietveld 408576698