components/pdf_viewer/pdf_viewer.cc - Issue 1427543002: Modified old wait sync point functions to also accept new sync tokens.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: components/pdf_viewer/pdf_viewer.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

« cc/test/test_web_graphics_context_3d.h ('K') | « cc/test/test_web_graphics_context_3d.cc ('k') | components/test_runner/test_plugin.cc » ('j') | content/renderer/media/video_capture_impl.h » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: components/pdf_viewer/pdf_viewer.cc

diff --git a/components/pdf_viewer/pdf_viewer.cc b/components/pdf_viewer/pdf_viewer.cc

index 2accf51e8bc43cc921648c3302b18a69d8ab562a..ff90b93f356872e4c76392259b7d7dbfe2681663 100644

--- a/components/pdf_viewer/pdf_viewer.cc

+++ b/components/pdf_viewer/pdf_viewer.cc

@@ -285,7 +285,7 @@ class BitmapUploader : public mus::mojom::SurfaceClient {

for (size_t i = 0; i < resources.size(); ++i) {

mus::mojom::ReturnedResourcePtr resource = resources[i].Pass();

DCHECK_EQ(1, resource->count);

- glWaitSyncPointCHROMIUM(resource->sync_point);

+ glWaitSyncPointCHROMIUM(resource->sync_point, resource->sync_token);

uint32_t texture_id = resource_to_texture_id_map_[resource->id];

DCHECK_NE(0u, texture_id);

resource_to_texture_id_map_.erase(resource->id);