Revert 171389

ppapi/proxy/ppapi_param_traits.cc

 // Copyright (c) 2012 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 "ppapi/proxy/ppapi_param_traits.h"
 
 #include <string.h>  // For memcpy
 
 #include "ppapi/c/pp_file_info.h"
 #include "ppapi/c/pp_resource.h"
@@ skipping 328 matching lines @@
 // static
 void ParamTraits<ppapi::proxy::SerializedHandle>::Write(Message* m,
                                                         const param_type& p) {
   ppapi::proxy::SerializedHandle::WriteHeader(p.header(), m);
   switch (p.type()) {
     case ppapi::proxy::SerializedHandle::SHARED_MEMORY:
       ParamTraits<base::SharedMemoryHandle>::Write(m, p.shmem());
       break;
     case ppapi::proxy::SerializedHandle::SOCKET:
     case ppapi::proxy::SerializedHandle::CHANNEL_HANDLE:
+    case ppapi::proxy::SerializedHandle::FILE:
       ParamTraits<IPC::PlatformFileForTransit>::Write(m, p.descriptor());
       break;
     case ppapi::proxy::SerializedHandle::INVALID:
       break;
     // No default so the compiler will warn on new types.
   }
 }
 
 // static
 bool ParamTraits<ppapi::proxy::SerializedHandle>::Read(const Message* m,
@@ skipping 20 matching lines @@
       break;
     }
     case ppapi::proxy::SerializedHandle::CHANNEL_HANDLE: {
       IPC::PlatformFileForTransit desc;
       if (ParamTraits<IPC::PlatformFileForTransit>::Read(m, iter, &desc)) {
         r->set_channel_handle(desc);
         return true;
       }
       break;
     }
+    case ppapi::proxy::SerializedHandle::FILE: {
+      IPC::PlatformFileForTransit desc;
+      if (ParamTraits<IPC::PlatformFileForTransit>::Read(m, iter, &desc)) {
+        r->set_file_handle(desc);
+        return true;
+      }
+      break;
+    }
     case ppapi::proxy::SerializedHandle::INVALID:
       return true;
     // No default so the compiler will warn us if a new type is added.
   }
   return false;
 }
 
 // static
 void ParamTraits<ppapi::proxy::SerializedHandle>::Log(const param_type& p,
                                                       std::string* l) {
@@ skipping 146 matching lines @@
       ParamTraits<int32_t>::Read(m, iter, &r->letter_spacing) &&
       ParamTraits<int32_t>::Read(m, iter, &r->word_spacing);
 }
 
 // static
 void ParamTraits<ppapi::proxy::SerializedFontDescription>::Log(
     const param_type& p,
     std::string* l) {
 }
 
+// ppapi::PepperFilePath -------------------------------------------------------
+
+// static
+void ParamTraits<ppapi::PepperFilePath>::Write(Message* m,
+                                               const param_type& p) {
+  WriteParam(m, static_cast<unsigned>(p.domain()));
+  WriteParam(m, p.path());
+}
+
+// static
+bool ParamTraits<ppapi::PepperFilePath>::Read(const Message* m,
+                                              PickleIterator* iter,
+                                              param_type* p) {
+  unsigned domain;
+  FilePath path;
+  if (!ReadParam(m, iter, &domain) || !ReadParam(m, iter, &path))
+    return false;
+  if (domain > ppapi::PepperFilePath::DOMAIN_MAX_VALID)
+    return false;
+
+  *p = ppapi::PepperFilePath(
+      static_cast<ppapi::PepperFilePath::Domain>(domain), path);
+  return true;
+}
+
+// static
+void ParamTraits<ppapi::PepperFilePath>::Log(const param_type& p,
+                                             std::string* l) {
+  l->append("(");
+  LogParam(static_cast<unsigned>(p.domain()), l);
+  l->append(", ");
+  LogParam(p.path(), l);
+  l->append(")");
+}
+
 // SerializedFlashMenu ---------------------------------------------------------
 
 // static
 void ParamTraits<ppapi::proxy::SerializedFlashMenu>::Write(
     Message* m,
     const param_type& p) {
   p.WriteToMessage(m);
 }
 
 // static
@@ skipping 24 matching lines @@
                                                           param_type* r) {
   return ParamTraits<ListValue>::Read(m, iter, &(r->values_));
 }
 
 // static
 void ParamTraits<ppapi::PPB_X509Certificate_Fields>::Log(const param_type& p,
                                                          std::string* l) {
 }
 
 }  // namespace IPC