Introduce cc::LocalFrameId and use in SurfaceFactory

cc/surfaces/surface_aggregator.cc

 // Copyright 2014 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "cc/surfaces/surface_aggregator.h"
 
 #include <stddef.h>
 
 #include <map>
 
@@ skipping 667 matching lines @@
 
   CHECK(debug_weak_this.get());
   for (const auto& surface_id : surface_frame.metadata.referenced_surfaces) {
     if (!contained_surfaces_.count(surface_id)) {
       result->undrawn_surfaces.insert(surface_id);
       PrewalkTree(surface_id, false, RenderPassId(), result);
     }
   }
 
   CHECK(debug_weak_this.get());
-  if (surface->factory())
-    surface->factory()->WillDrawSurface(surface->surface_id(), damage_rect);
+  if (surface->factory()) {
+    surface->factory()->WillDrawSurface(surface->surface_id().local_frame_id(),
+                                        damage_rect);
+  }
 
   CHECK(debug_weak_this.get());
   for (const auto& render_pass : frame_data->render_pass_list) {
     if (!render_pass->copy_requests.empty()) {
       RenderPassId remapped_pass_id = RemapPassId(render_pass->id, surface_id);
       copy_request_passes_.insert(remapped_pass_id);
     }
   }
 
   referenced_surfaces_.erase(it);
@@ skipping 129 matching lines @@
 
 void SurfaceAggregator::SetFullDamageForSurface(const SurfaceId& surface_id) {
   auto it = previous_contained_surfaces_.find(surface_id);
   if (it == previous_contained_surfaces_.end())
     return;
   // Set the last drawn index as 0 to ensure full damage next time it's drawn.
   it->second = 0;
 }
 
 }  // namespace cc