| Index: ppapi/proxy/ppapi_param_traits.cc
|
| ===================================================================
|
| --- ppapi/proxy/ppapi_param_traits.cc (revision 171259)
|
| +++ ppapi/proxy/ppapi_param_traits.cc (working copy)
|
| @@ -346,7 +346,6 @@
|
| 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:
|
| @@ -387,14 +386,6 @@
|
| }
|
| 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.
|
| @@ -561,41 +552,6 @@
|
| 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
|
|
|