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

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/view_manager_client_impl.cc ('k') | mojo/services/public/interfaces/native_viewport/native_viewport.mojom » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: mojo/services/public/cpp/view_manager/view.h

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

index 3f8ff98e9fa21fbffe9366347b5b2b5a3159beb2..33e7b6aa7786cfc07af1ee41b07b0f98f8091ea5 100644

--- a/mojo/services/public/cpp/view_manager/view.h

+++ b/mojo/services/public/cpp/view_manager/view.h

@@ -12,6 +12,7 @@

#include "mojo/public/cpp/bindings/array.h"

#include "mojo/public/interfaces/application/service_provider.mojom.h"

#include "mojo/services/public/cpp/view_manager/types.h"

+#include "mojo/services/public/interfaces/surfaces/surface_id.mojom.h"

#include "mojo/services/public/interfaces/view_manager/view_manager_constants.mojom.h"

#include "third_party/skia/include/core/SkColor.h"

#include "ui/gfx/geometry/rect.h"

@@ -69,6 +70,8 @@ class View {

View* GetChildById(Id id);

+ void SetSurfaceId(SurfaceIdPtr id);

// TODO(beng): temporary only.

void SetContents(const SkBitmap& contents);

void SetColor(SkColor color);