third_party/WebKit/Source/modules/canvas/HTMLCanvasElementModule.cpp - Issue 2382873002: Replace usage of SurfaceId's client_id with FrameSinkId

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: third_party/WebKit/Source/modules/canvas/HTMLCanvasElementModule.cpp

Issue 2382873002: Replace usage of SurfaceId's client_id with FrameSinkId (Closed)

Patch Set: Rebased Created 4 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

« no previous file with comments | « services/ui/ws/server_window_surface.cc ('k') | third_party/WebKit/Source/platform/graphics/CanvasSurfaceLayerBridgeTest.cpp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: third_party/WebKit/Source/modules/canvas/HTMLCanvasElementModule.cpp

diff --git a/third_party/WebKit/Source/modules/canvas/HTMLCanvasElementModule.cpp b/third_party/WebKit/Source/modules/canvas/HTMLCanvasElementModule.cpp

index b1b4ab700304cac31bfa59a864176b6366efb77f..2d3c3d39b7a7bc51084e19eaa19ce975a81f310d 100644

--- a/third_party/WebKit/Source/modules/canvas/HTMLCanvasElementModule.cpp

+++ b/third_party/WebKit/Source/modules/canvas/HTMLCanvasElementModule.cpp

@@ -63,9 +63,10 @@ OffscreenCanvas* HTMLCanvasElementModule::transferControlToOffscreenInternal(

if (bridge) {

// If a bridge exists, it means canvas.createSurfaceLayer() has been called

// and its SurfaceId has been populated as well.

- offscreenCanvas->setSurfaceId(bridge->getSurfaceId().client_id(),

- bridge->getSurfaceId().local_id(),

- bridge->getSurfaceId().nonce());

+ // TODO(fsamuel): Plumb FrameSinkId into blink.

+ offscreenCanvas->setSurfaceId(

+ bridge->getSurfaceId().frame_sink_id().client_id(),

+ bridge->getSurfaceId().local_id(), bridge->getSurfaceId().nonce());

}

return offscreenCanvas;

}