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

Unified Diff: cc/test/test_web_graphics_context_3d.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: cc/test/test_web_graphics_context_3d.cc
diff --git a/cc/test/test_web_graphics_context_3d.cc b/cc/test/test_web_graphics_context_3d.cc
index 1e69bcbb8cc98bc4c9c288bd6909289f5c2b8981..23756eb5208d90f5004ef388eaa9a7dd2281b31f 100644
--- a/cc/test/test_web_graphics_context_3d.cc
+++ b/cc/test/test_web_graphics_context_3d.cc
@@ -651,9 +651,17 @@ unsigned TestWebGraphicsContext3D::insertSyncPoint() {
return next_insert_sync_point_++;
}
-void TestWebGraphicsContext3D::waitSyncPoint(unsigned sync_point) {
+void TestWebGraphicsContext3D::waitSyncPoint(unsigned sync_point,
+ const GLbyte* sync_token) {
if (sync_point)
last_waited_sync_point_ = sync_point;
+
+ if (sync_token) {
+ gpu::SyncToken sync_token_data;
+ memcpy(sync_token_data.GetData(), sync_token, sizeof(sync_token_data));
+ if (sync_token_data.HasData())
+ last_waited_sync_token_ = sync_token_data;
+ }
}
size_t TestWebGraphicsContext3D::NumTextures() const {

Powered by Google App Engine
This is Rietveld 408576698