content/browser/frame_host/render_widget_host_view_child_frame.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/frame_host/render_widget_host_view_child_frame.cc

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

Patch Set: Fixed TestDelegatingOutputSurface 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

« cc/test/test_delegating_output_surface.cc ('K') | « content/browser/compositor/surface_utils.cc ('k') | content/browser/renderer_host/compositor_impl_android.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: content/browser/frame_host/render_widget_host_view_child_frame.cc

diff --git a/content/browser/frame_host/render_widget_host_view_child_frame.cc b/content/browser/frame_host/render_widget_host_view_child_frame.cc

index 56926a544c3a5efb2f171145e992573467118280..2d1e0fa39f5303a0d985884c5d59032b6e95b61b 100644

--- a/content/browser/frame_host/render_widget_host_view_child_frame.cc

+++ b/content/browser/frame_host/render_widget_host_view_child_frame.cc

@@ -50,7 +50,8 @@ RenderWidgetHostViewChildFrame::RenderWidgetHostViewChildFrame(

observing_begin_frame_source_(false),

parent_surface_client_id_(0),

weak_factory_(this) {

- id_allocator_ = CreateSurfaceIdAllocator();

+ id_allocator_.reset(new cc::SurfaceIdAllocator(AllocateSurfaceClientId()));

+ GetSurfaceManager()->RegisterSurfaceClientId(id_allocator_->client_id());

RegisterSurfaceNamespaceId();

host_->SetView(this);

@@ -59,6 +60,9 @@ RenderWidgetHostViewChildFrame::RenderWidgetHostViewChildFrame(

RenderWidgetHostViewChildFrame::~RenderWidgetHostViewChildFrame() {

if (!surface_id_.is_null())

surface_factory_->Destroy(surface_id_);

+ if (GetSurfaceManager())

+ GetSurfaceManager()->InvalidateSurfaceClientId(id_allocator_->client_id());

}

void RenderWidgetHostViewChildFrame::SetCrossProcessFrameConnector(