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

Unified Diff: cc/surfaces/surface.cc

Issue 2652343003: Replace source pointer in cc::CopyOutputRequest with a base::UnguessableToken (Closed)
Patch Set: c Created 3 years, 11 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 | « cc/output/copy_output_request.cc ('k') | cc/surfaces/surface_factory_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: cc/surfaces/surface.cc
diff --git a/cc/surfaces/surface.cc b/cc/surfaces/surface.cc
index 20d34011a58d5aa0bff6e4236856476a219fe560..dd41c3de17b9ac999f29effb6fb84459ec1e3fc5 100644
--- a/cc/surfaces/surface.cc
+++ b/cc/surfaces/surface.cc
@@ -86,14 +86,15 @@ void Surface::RequestCopyOfOutput(
std::vector<std::unique_ptr<CopyOutputRequest>>& copy_requests =
current_frame_->render_pass_list.back()->copy_requests;
- if (void* source = copy_request->source()) {
+ if (copy_request->has_source()) {
+ const base::UnguessableToken& source = copy_request->source();
// Remove existing CopyOutputRequests made on the Surface by the same
// source.
- auto to_remove =
- std::remove_if(copy_requests.begin(), copy_requests.end(),
- [source](const std::unique_ptr<CopyOutputRequest>& x) {
- return x->source() == source;
- });
+ auto to_remove = std::remove_if(
+ copy_requests.begin(), copy_requests.end(),
+ [&source](const std::unique_ptr<CopyOutputRequest>& x) {
+ return x->has_source() && x->source() == source;
+ });
copy_requests.erase(to_remove, copy_requests.end());
}
copy_requests.push_back(std::move(copy_request));
« no previous file with comments | « cc/output/copy_output_request.cc ('k') | cc/surfaces/surface_factory_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698