components/surfaces/display_impl.cc - Issue 1127293003: Update mojo sdk to rev f84766d3b6420b7cf6a113d9d65d73cb5fe18d90

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/surfaces/display_impl.cc

Issue 1127293003: Update mojo sdk to rev f84766d3b6420b7cf6a113d9d65d73cb5fe18d90 (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Merge IPC fixes Created 5 years, 7 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: components/surfaces/display_impl.cc

diff --git a/components/surfaces/display_impl.cc b/components/surfaces/display_impl.cc

index 15319159a8b7d293b33ca8653f3c3fb84587c5d1..b87df1f7c5c3c7e8d0332963eb4caf9836d3990b 100644

--- a/components/surfaces/display_impl.cc

+++ b/components/surfaces/display_impl.cc

@@ -47,7 +47,7 @@ void DisplayImpl::OnContextCreated(mojo::CommandBufferPtr gles2_client) {

display_.reset(new cc::Display(this, manager_, nullptr, nullptr, settings));

scheduler_->AddDisplay(display_.get());

display_->Initialize(make_scoped_ptr(new mojo::DirectOutputSurface(

- new mojo::ContextProviderMojo(gles2_client.PassMessagePipe()))));

+ new mojo::ContextProviderMojo(gles2_client.PassInterface().PassHandle()))));

factory_.Create(cc_id_);

display_->SetSurfaceId(cc_id_, 1.f);

« no previous file with comments | « components/html_viewer/web_layer_tree_view_impl.cc ('k') | ipc/mojo/ipc_channel_mojo.h » ('j') | mojo/shell/application_manager.cc » ('J')