mojo/services/public/cpp/view_manager/lib/view.cc - Issue 728133002: Update mojo sdk to rev e01f9a49449381a5eb430c1fd88bf2cae73ec35a

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 728133002: Update mojo sdk to rev e01f9a49449381a5eb430c1fd88bf2cae73ec35a (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: android + ios gyp fixes Created 6 years, 1 month 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/BUILD.gn ('k') | mojo/services/public/cpp/view_manager/lib/view_manager_client_factory.cc » ('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 84a0455a9dfeab31aae0d1b27483a9ae21fb7e58..b371000ee798c25e46bd83667c09743b52a1dec6 100644

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

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

@@ -311,6 +311,10 @@ void View::Reorder(View* relative, OrderDirection direction) {

}

bool View::Contains(View* child) const {

+ if (!child)

+ return false;

+ if (child == this)

+ return true;

if (manager_)

CHECK_EQ(ViewPrivate(child).view_manager(), manager_);

for (View* p = child->parent(); p; p = p->parent()) {