services/ui/public/cpp/window.cc - Issue 2425923003: Replaced is_null() with is_valid in SurfaceId and related classes.

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: services/ui/public/cpp/window.cc

Issue 2425923003: Replaced is_null() with is_valid in SurfaceId and related classes. (Closed)

Patch Set: Rebase Created 4 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:

Index: services/ui/public/cpp/window.cc

diff --git a/services/ui/public/cpp/window.cc b/services/ui/public/cpp/window.cc

index 9deb327be21659f975b0df2ce77b233f410beb75..e5c5dc64539605918735ae8c7531994b64ae2304 100644

--- a/services/ui/public/cpp/window.cc

+++ b/services/ui/public/cpp/window.cc

@@ -812,7 +812,7 @@ void Window::LocalSetSurfaceId(std::unique_ptr<SurfaceInfo> surface_info) {

const cc::SurfaceId& existing_surface_id = surface_info_->surface_id;

cc::SurfaceId new_surface_id =

surface_info ? surface_info->surface_id : cc::SurfaceId();

- if (!existing_surface_id.is_null() &&

+ if (existing_surface_id.is_valid() &&

existing_surface_id != new_surface_id) {

// TODO(kylechar): Start return reference here?

}