content/browser/renderer_host/delegated_frame_host.cc - Issue 2166423002: ui::ContextFactory should not create SurfaceIdAllocators

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/renderer_host/delegated_frame_host.cc

Issue 2166423002: ui::ContextFactory should not create SurfaceIdAllocators (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Addressed Dana's nit Created 4 years, 5 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/renderer_host/compositor_impl_android.cc ('k') | content/browser/renderer_host/offscreen_canvas_surface_impl.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: content/browser/renderer_host/delegated_frame_host.cc

diff --git a/content/browser/renderer_host/delegated_frame_host.cc b/content/browser/renderer_host/delegated_frame_host.cc

index f2801e57a6ea2555570455639197f81d23359c7f..626ce81bcac47d65e6bd052bb8883988c0ac6733 100644

--- a/content/browser/renderer_host/delegated_frame_host.cc

+++ b/content/browser/renderer_host/delegated_frame_host.cc

@@ -75,7 +75,10 @@ DelegatedFrameHost::DelegatedFrameHost(DelegatedFrameHostClient* client)

delegated_frame_evictor_(new DelegatedFrameEvictor(this)) {

ImageTransportFactory* factory = ImageTransportFactory::GetInstance();

factory->GetContextFactory()->AddObserver(this);

- id_allocator_ = factory->GetContextFactory()->CreateSurfaceIdAllocator();

+ id_allocator_.reset(new cc::SurfaceIdAllocator(

+ factory->GetContextFactory()->AllocateSurfaceClientId()));

+ factory->GetSurfaceManager()->RegisterSurfaceClientId(

+ id_allocator_->client_id());

factory->GetSurfaceManager()->RegisterSurfaceFactoryClient(

id_allocator_->client_id(), this);

}

@@ -818,6 +821,8 @@ DelegatedFrameHost::~DelegatedFrameHost() {

surface_factory_->Destroy(surface_id_);

factory->GetSurfaceManager()->UnregisterSurfaceFactoryClient(

id_allocator_->client_id());

+ factory->GetSurfaceManager()->InvalidateSurfaceClientId(

+ id_allocator_->client_id());

DCHECK(!vsync_manager_.get());

}