components/exo/surface.cc - Issue 2144733005: [WIP] cc: Plumb SurfaceId from clients

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: components/exo/surface.cc

Issue 2144733005: [WIP] cc: Plumb SurfaceId from clients Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Ensure only SurfaceFactoy and tests can update hierarchy 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:

Index: components/exo/surface.cc

diff --git a/components/exo/surface.cc b/components/exo/surface.cc

index f4851060c1f1466befacc854585b927ac2890368..f814f77ae5b542c8a85bac530aced073394a0235 100644

--- a/components/exo/surface.cc

+++ b/components/exo/surface.cc

@@ -210,10 +210,12 @@ Surface::Surface()

window_->SetEventTargeter(base::WrapUnique(new CustomWindowTargeter));

window_->set_owned_by_parent(false);

factory_owner_->surface_ = this;

+ uint32_t client_id =

+ aura::Env::GetInstance()->context_factory()->AllocateSurfaceClientId();

factory_owner_->id_allocator_ =

- aura::Env::GetInstance()->context_factory()->CreateSurfaceIdAllocator();

- factory_owner_->surface_factory_.reset(

- new cc::SurfaceFactory(surface_manager_, factory_owner_.get()));

+ base::WrapUnique(new cc::SurfaceIdAllocator(client_id));

+ factory_owner_->surface_factory_.reset(new cc::SurfaceFactory(

+ client_id, surface_manager_, factory_owner_.get()));

aura::Env::GetInstance()->context_factory()->AddObserver(this);

}