Update Surface ID Terminology

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 43864d3b707bc35a79559ca7c74d61d25fc7d1cd..dbd6444dc3ab55ca84f5b15a04e9964f3461082b 100644
--- a/cc/ipc/cc_param_traits.cc
+++ b/cc/ipc/cc_param_traits.cc
@@ -570,13 +570,15 @@ void ParamTraits<cc::RenderPass>::Log(const param_type& p, std::string* l) {
 
 void ParamTraits<cc::SurfaceId>::GetSize(base::PickleSizer* s,
                                          const param_type& p) {
-  GetParamSize(s, p.id_namespace());
+  GetParamSize(s, p.gpu_id());
+  GetParamSize(s, p.client_id());
   GetParamSize(s, p.local_id());
   GetParamSize(s, p.nonce());
 }
 
 void ParamTraits<cc::SurfaceId>::Write(base::Pickle* m, const param_type& p) {
-  WriteParam(m, p.id_namespace());
+  WriteParam(m, p.gpu_id());
+  WriteParam(m, p.client_id());
   WriteParam(m, p.local_id());
   WriteParam(m, p.nonce());
 }
@@ -584,8 +586,12 @@ void ParamTraits<cc::SurfaceId>::Write(base::Pickle* m, const param_type& p) {
 bool ParamTraits<cc::SurfaceId>::Read(const base::Pickle* m,
                                       base::PickleIterator* iter,
                                       param_type* p) {
-  uint32_t id_namespace;
-  if (!ReadParam(m, iter, &id_namespace))
+  uint32_t gpu_id;
+  if (!ReadParam(m, iter, &gpu_id))
+    return false;
+
+  uint32_t client_id;
+  if (!ReadParam(m, iter, &client_id))
     return false;
 
   uint32_t local_id;
@@ -596,13 +602,15 @@ bool ParamTraits<cc::SurfaceId>::Read(const base::Pickle* m,
   if (!ReadParam(m, iter, &nonce))
     return false;
 
-  *p = cc::SurfaceId(id_namespace, local_id, nonce);
+  *p = cc::SurfaceId(gpu_id, client_id, local_id, nonce);
   return true;
 }
 
 void ParamTraits<cc::SurfaceId>::Log(const param_type& p, std::string* l) {
   l->append("SurfaceId(");
-  LogParam(p.id_namespace(), l);
+  LogParam(p.gpu_id(), l);
+  l->append(", ");
+  LogParam(p.client_id(), l);
   l->append(", ");
   LogParam(p.local_id(), l);
   l->append(", ");