Introduce cc::LocalFrameId and use in SurfaceFactory

cc/ipc/surface_id_struct_traits.h

Index: cc/ipc/surface_id_struct_traits.h
diff --git a/cc/ipc/surface_id_struct_traits.h b/cc/ipc/surface_id_struct_traits.h
index d8be65f4e1c218245fbb12985dff15ac5a2faf60..6f66c9fd31a0ab29f8e0a033a8270e2fc5ab0556 100644
--- a/cc/ipc/surface_id_struct_traits.h
+++ b/cc/ipc/surface_id_struct_traits.h
@@ -6,6 +6,7 @@
 #define CC_IPC_SURFACE_ID_STRUCT_TRAITS_H_
 
 #include "cc/ipc/frame_sink_id_struct_traits.h"
+#include "cc/ipc/local_frame_id_struct_traits.h"
 #include "cc/ipc/surface_id.mojom-shared.h"
 #include "cc/surfaces/frame_sink_id.h"
 #include "cc/surfaces/surface_id.h"
@@ -18,15 +19,20 @@ struct StructTraits<cc::mojom::SurfaceIdDataView, cc::SurfaceId> {
     return id.frame_sink_id();
   }
 
-  static uint32_t local_id(const cc::SurfaceId& id) { return id.local_id(); }
-
-  static uint64_t nonce(const cc::SurfaceId& id) { return id.nonce(); }
+  static const cc::LocalFrameId& local_frame_id(const cc::SurfaceId& id) {
+    return id.local_frame_id();
+  }
 
   static bool Read(cc::mojom::SurfaceIdDataView data, cc::SurfaceId* out) {
     cc::FrameSinkId frame_sink_id;
     if (!data.ReadFrameSinkId(&frame_sink_id))
       return false;
-    *out = cc::SurfaceId(frame_sink_id, data.local_id(), data.nonce());
+
+    cc::LocalFrameId local_frame_id;
+    if (!data.ReadLocalFrameId(&local_frame_id))
+      return false;
+
+    *out = cc::SurfaceId(frame_sink_id, local_frame_id);
     return true;
   }
 };