android_webview/browser/surfaces_instance.h - 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: android_webview/browser/surfaces_instance.h

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

Patch Set: Fixed windows + android + mac issues Created 4 years, 3 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:

Index: android_webview/browser/surfaces_instance.h

diff --git a/android_webview/browser/surfaces_instance.h b/android_webview/browser/surfaces_instance.h

index 99cacec4d52cb4b546f0dcb92739267b21487aad..53a7ddc659f3e7805c05ff553bc189d2d780cdd0 100644

--- a/android_webview/browser/surfaces_instance.h

+++ b/android_webview/browser/surfaces_instance.h

@@ -38,7 +38,7 @@ class SurfacesInstance : public base::RefCounted<SurfacesInstance>,

public:

static scoped_refptr<SurfacesInstance> GetOrCreateInstance();

- uint32_t AllocateSurfaceClientId();

+ cc::FrameSinkId AllocateFrameSinkId();

cc::SurfaceManager* GetSurfaceManager();

void DrawAndSwap(const gfx::Size& viewport,

@@ -69,7 +69,7 @@ class SurfacesInstance : public base::RefCounted<SurfacesInstance>,

void SetEmptyRootFrame();

- uint32_t next_surface_client_id_;

+ uint32_t next_frame_sink_id_;

std::unique_ptr<cc::SurfaceManager> surface_manager_;

std::unique_ptr<cc::Display> display_;