Rename LocalFrameId to LocalSurfaceId

cc/ipc/cc_param_traits.cc

Index: cc/ipc/cc_param_traits.cc
diff --git a/cc/ipc/cc_param_traits.cc b/cc/ipc/cc_param_traits.cc
index 77c4dc1bdf9d656b048a1e93fb6ae7866995ed11..ff83811605109e1fefaf0aeb0256ca61a1ebf9a9 100644
--- a/cc/ipc/cc_param_traits.cc
+++ b/cc/ipc/cc_param_traits.cc
@@ -619,21 +619,21 @@ void ParamTraits<cc::FrameSinkId>::Log(const param_type& p, std::string* l) {
   l->append(")");
 }
 
-void ParamTraits<cc::LocalFrameId>::GetSize(base::PickleSizer* s,
-                                            const param_type& p) {
+void ParamTraits<cc::LocalSurfaceId>::GetSize(base::PickleSizer* s,
+                                              const param_type& p) {
   GetParamSize(s, p.local_id());
   GetParamSize(s, p.nonce());
 }
 
-void ParamTraits<cc::LocalFrameId>::Write(base::Pickle* m,
-                                          const param_type& p) {
+void ParamTraits<cc::LocalSurfaceId>::Write(base::Pickle* m,
+                                            const param_type& p) {
   WriteParam(m, p.local_id());
   WriteParam(m, p.nonce());
 }
 
-bool ParamTraits<cc::LocalFrameId>::Read(const base::Pickle* m,
-                                         base::PickleIterator* iter,
-                                         param_type* p) {
+bool ParamTraits<cc::LocalSurfaceId>::Read(const base::Pickle* m,
+                                           base::PickleIterator* iter,
+                                           param_type* p) {
   uint32_t local_id;
   if (!ReadParam(m, iter, &local_id))
     return false;
@@ -642,12 +642,12 @@ bool ParamTraits<cc::LocalFrameId>::Read(const base::Pickle* m,
   if (!ReadParam(m, iter, &nonce))
     return false;
 
-  *p = cc::LocalFrameId(local_id, nonce);
+  *p = cc::LocalSurfaceId(local_id, nonce);
   return true;
 }
 
-void ParamTraits<cc::LocalFrameId>::Log(const param_type& p, std::string* l) {
-  l->append("LocalFrameId(");
+void ParamTraits<cc::LocalSurfaceId>::Log(const param_type& p, std::string* l) {
+  l->append("LocalSurfaceId(");
   LogParam(p.local_id(), l);
   l->append(", ");
   LogParam(p.nonce(), l);
@@ -657,12 +657,12 @@ void ParamTraits<cc::LocalFrameId>::Log(const param_type& p, std::string* l) {
 void ParamTraits<cc::SurfaceId>::GetSize(base::PickleSizer* s,
                                          const param_type& p) {
   GetParamSize(s, p.frame_sink_id());
-  GetParamSize(s, p.local_frame_id());
+  GetParamSize(s, p.local_surface_id());
 }
 
 void ParamTraits<cc::SurfaceId>::Write(base::Pickle* m, const param_type& p) {
   WriteParam(m, p.frame_sink_id());
-  WriteParam(m, p.local_frame_id());
+  WriteParam(m, p.local_surface_id());
 }
 
 bool ParamTraits<cc::SurfaceId>::Read(const base::Pickle* m,
@@ -672,11 +672,11 @@ bool ParamTraits<cc::SurfaceId>::Read(const base::Pickle* m,
   if (!ReadParam(m, iter, &frame_sink_id))
     return false;
 
-  cc::LocalFrameId local_frame_id;
-  if (!ReadParam(m, iter, &local_frame_id))
+  cc::LocalSurfaceId local_surface_id;
+  if (!ReadParam(m, iter, &local_surface_id))
     return false;
 
-  *p = cc::SurfaceId(frame_sink_id, local_frame_id);
+  *p = cc::SurfaceId(frame_sink_id, local_surface_id);
   return true;
 }
 
@@ -684,7 +684,7 @@ void ParamTraits<cc::SurfaceId>::Log(const param_type& p, std::string* l) {
   l->append("SurfaceId(");
   LogParam(p.frame_sink_id(), l);
   l->append(", ");
-  LogParam(p.local_frame_id(), l);
+  LogParam(p.local_surface_id(), l);
   l->append(")");
 }