Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(58)

Unified Diff: ui/aura/mus/window_port_mus.cc

Issue 2720503008: Add cc::SurfaceInfo::is_valid() (Closed)
Patch Set: Added Log() Created 3 years, 10 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 | « third_party/WebKit/Source/platform/graphics/CanvasSurfaceLayerBridge.cpp ('k') | ui/compositor/layer.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ui/aura/mus/window_port_mus.cc
diff --git a/ui/aura/mus/window_port_mus.cc b/ui/aura/mus/window_port_mus.cc
index d8ab8b126621603801b037a9e3fbef9bbeaff3e7..28e23de5df16ad90278cf5c40b9fa3e4aa509492 100644
--- a/ui/aura/mus/window_port_mus.cc
+++ b/ui/aura/mus/window_port_mus.cc
@@ -32,7 +32,7 @@ WindowPortMus::WindowPortMus(WindowTreeClient* client,
: WindowMus(window_mus_type), window_tree_client_(client) {}
WindowPortMus::~WindowPortMus() {
- if (surface_info_.id().is_valid())
+ if (surface_info_.is_valid())
SetSurfaceInfoFromServer(cc::SurfaceInfo());
// DESTROY is only scheduled from DestroyFromServer(), meaning if DESTROY is
@@ -245,7 +245,7 @@ void WindowPortMus::SetPropertyFromServer(
void WindowPortMus::SetSurfaceInfoFromServer(
const cc::SurfaceInfo& surface_info) {
- if (surface_info_.id().is_valid()) {
+ if (surface_info_.is_valid()) {
const cc::SurfaceId& existing_surface_id = surface_info_.id();
const cc::SurfaceId& new_surface_id = surface_info.id();
if (existing_surface_id.is_valid() &&
@@ -256,10 +256,10 @@ void WindowPortMus::SetSurfaceInfoFromServer(
// The fact that SetSurfaceIdFromServer was called means that this window
// corresponds to an embedded client.
- if (!client_surface_embedder && surface_info.id().is_valid())
+ if (!client_surface_embedder && surface_info.is_valid())
client_surface_embedder = base::MakeUnique<ClientSurfaceEmbedder>(window_);
- if (surface_info.id().is_valid())
+ if (surface_info.is_valid())
client_surface_embedder->UpdateSurface(surface_info);
else
client_surface_embedder.reset();
« no previous file with comments | « third_party/WebKit/Source/platform/graphics/CanvasSurfaceLayerBridge.cpp ('k') | ui/compositor/layer.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698