Replace source pointer in cc::CopyOutputRequest with a base::UnguessableToken

cc/layers/layer.cc

Index: cc/layers/layer.cc
diff --git a/cc/layers/layer.cc b/cc/layers/layer.cc
index e878a2020fb46732a3fd02938e91947f1fb818ab..12932eb1124ab0054acba94235b941badfefe01b 100644
--- a/cc/layers/layer.cc
+++ b/cc/layers/layer.cc
@@ -355,11 +355,12 @@ bool Layer::HasAncestor(const Layer* ancestor) const {
 
 void Layer::RequestCopyOfOutput(std::unique_ptr<CopyOutputRequest> request) {
   DCHECK(IsPropertyChangeAllowed());
-  if (void* source = request->source()) {
+  if (request->has_source()) {
+    const base::UnguessableToken& source = request->source();
     auto it =
         std::find_if(inputs_.copy_requests.begin(), inputs_.copy_requests.end(),
                      [source](const std::unique_ptr<CopyOutputRequest>& x) {

[vmpstr, 2017/01/27 19:41:25]

nit: capture source by reference, [&source]

[Saman Sami, 2017/01/27 20:03:20]

Done.

-                       return x->source() == source;
+                       return x->has_source() && x->source() == source;
                      });
     if (it != inputs_.copy_requests.end())
       inputs_.copy_requests.erase(it);