cc/surfaces/onscreen_display_client.h - Issue 1304063014: cc: Plumbing for BeginFrameSource based on Surfaces

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: cc/surfaces/onscreen_display_client.h

Issue 1304063014: cc: Plumbing for BeginFrameSource based on Surfaces (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: NOTREACHED for WebView; NOTIMPLEMENTED elsewhere Created 5 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:

View side-by-side diff with in-line comments

Download patch

Index: cc/surfaces/onscreen_display_client.h

diff --git a/cc/surfaces/onscreen_display_client.h b/cc/surfaces/onscreen_display_client.h

index 4c4245d4161eb3e04120f582ce04fed82c8a3872..30943066d3dc4d8518682f6a9ae3b245eecc0617 100644

--- a/cc/surfaces/onscreen_display_client.h

+++ b/cc/surfaces/onscreen_display_client.h

@@ -53,11 +53,14 @@ class CC_SURFACES_EXPORT OnscreenDisplayClient

protected:

scoped_ptr<OutputSurface> output_surface_;

- scoped_ptr<Display> display_;

+ // Be careful of destruction order:

+ // Display depends on DisplayScheduler depends on *BeginFrameSource

+ // depends on TaskRunner.

+ scoped_refptr<base::SingleThreadTaskRunner> task_runner_;

scoped_ptr<SyntheticBeginFrameSource> synthetic_frame_source_;

scoped_ptr<BackToBackBeginFrameSource> unthrottled_frame_source_;

scoped_ptr<DisplayScheduler> scheduler_;

- scoped_refptr<base::SingleThreadTaskRunner> task_runner_;

+ scoped_ptr<Display> display_;

SurfaceDisplayOutputSurface* surface_display_output_surface_;

bool output_surface_lost_;

bool disable_display_vsync_;

« no previous file with comments | « cc/surfaces/display_unittest.cc ('k') | cc/surfaces/onscreen_display_client.cc » ('j') | cc/surfaces/surface_factory.cc » ('J')