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

Unified Diff: cc/surfaces/surface.cc

Issue 2136413002: Update Surface ID Terminology (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Fixed webkit_unit_tests Created 4 years, 5 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
Index: cc/surfaces/surface.cc
diff --git a/cc/surfaces/surface.cc b/cc/surfaces/surface.cc
index 3755d9b8c90b371e46176ed7a195e0ea320cc127..30e5ea48c3622800888ff1bd0bce10067e0d7721 100644
--- a/cc/surfaces/surface.cc
+++ b/cc/surfaces/surface.cc
@@ -89,7 +89,7 @@ void Surface::QueueFrame(CompositorFrame frame, const DrawCallback& callback) {
// Notify the manager that sequences were satisfied either if some new
// sequences were satisfied, or if the set of referenced surfaces changed
// to force a GC to happen.
- factory_->manager()->DidSatisfySequences(surface_id_.id_namespace(),
+ factory_->manager()->DidSatisfySequences(surface_id_.client_id(),
&satisfies_sequences);
}
}
@@ -165,13 +165,13 @@ void Surface::AddDestructionDependency(SurfaceSequence sequence) {
void Surface::SatisfyDestructionDependencies(
std::unordered_set<SurfaceSequence, SurfaceSequenceHash>* sequences,
- std::unordered_set<uint32_t>* valid_id_namespaces) {
+ std::unordered_set<uint32_t>* valid_client_ids) {
destruction_dependencies_.erase(
std::remove_if(destruction_dependencies_.begin(),
destruction_dependencies_.end(),
- [sequences, valid_id_namespaces](SurfaceSequence seq) {
+ [sequences, valid_client_ids](SurfaceSequence seq) {
return (!!sequences->erase(seq) ||
- !valid_id_namespaces->count(seq.id_namespace));
+ !valid_client_ids->count(seq.client_id));
}),
destruction_dependencies_.end());
}

Powered by Google App Engine
This is Rietveld 408576698