content/browser/android/in_process/synchronous_compositor_output_surface.cc - Issue 1336733002: Re-land: cc: Implement shared worker contexts.

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: content/browser/android/in_process/synchronous_compositor_output_surface.cc

Issue 1336733002: Re-land: cc: Implement shared worker contexts. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Fix LayerTreeHostClientTakeAwayOutputSurface test. Content provider is always destroyed on the clie… 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

« no previous file with comments | « content/browser/android/in_process/synchronous_compositor_output_surface.h ('k') | content/browser/compositor/gpu_process_transport_factory.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: content/browser/android/in_process/synchronous_compositor_output_surface.cc

diff --git a/content/browser/android/in_process/synchronous_compositor_output_surface.cc b/content/browser/android/in_process/synchronous_compositor_output_surface.cc

index 85c7bcb3c39832eadbcc9d14bddee0263d070b1a..f03f992d83d4a289296527d774ef66aa65783037 100644

--- a/content/browser/android/in_process/synchronous_compositor_output_surface.cc

+++ b/content/browser/android/in_process/synchronous_compositor_output_surface.cc

@@ -83,11 +83,6 @@ SynchronousCompositorOutputSurface::SynchronousCompositorOutputSurface(

}

SynchronousCompositorOutputSurface::~SynchronousCompositorOutputSurface() {

- DCHECK(CalledOnValidThread());

- if (registered_) {

- SynchronousCompositorRegistry::GetInstance()->UnregisterOutputSurface(

- routing_id_, this);

- }

}

bool SynchronousCompositorOutputSurface::BindToClient(

@@ -105,6 +100,15 @@ bool SynchronousCompositorOutputSurface::BindToClient(

return true;

}

+void SynchronousCompositorOutputSurface::DetachFromClient() {

+ DCHECK(CalledOnValidThread());

+ if (registered_) {

+ SynchronousCompositorRegistry::GetInstance()->UnregisterOutputSurface(

+ routing_id_, this);

+ }

+ cc::OutputSurface::DetachFromClient();

void SynchronousCompositorOutputSurface::SetCompositor(

SynchronousCompositorImpl* compositor) {

DCHECK(CalledOnValidThread());