mojo/services/public/cpp/view_manager/lib/view.cc - Issue 534843002: Convert view manager to surfaces with uploading shim in client lib

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: mojo/services/public/cpp/view_manager/lib/view.cc

Issue 534843002: Convert view manager to surfaces with uploading shim in client lib (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: remove overzealous shutdown check in cc/surfaces, add NON_EXPORTED_BASE for windows build, saturate… Created 6 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 | « mojo/services/public/cpp/view_manager/lib/bitmap_uploader.cc ('k') | mojo/services/public/cpp/view_manager/lib/view_manager_client_impl.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: mojo/services/public/cpp/view_manager/lib/view.cc

diff --git a/mojo/services/public/cpp/view_manager/lib/view.cc b/mojo/services/public/cpp/view_manager/lib/view.cc

index d2f6f54efb84b7909a3bf1a7bd1aba622dc13218..797e8d519e32795910a15f6c4232aa95adbdbe1f 100644

--- a/mojo/services/public/cpp/view_manager/lib/view.cc

+++ b/mojo/services/public/cpp/view_manager/lib/view.cc

@@ -291,6 +291,12 @@ View* View::GetChildById(Id id) {

return NULL;

}

+void View::SetSurfaceId(SurfaceIdPtr id) {

+ if (manager_) {

+ static_cast<ViewManagerClientImpl*>(manager_)->SetSurfaceId(id_, id.Pass());

+ }

void View::SetContents(const SkBitmap& contents) {

if (manager_) {

static_cast<ViewManagerClientImpl*>(manager_)->SetViewContents(id_,