| OLD | NEW |
| 1 // Copyright 2013 The Chromium Authors. All rights reserved. | 1 // Copyright 2013 The Chromium Authors. All rights reserved. |
| 2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
| 3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
| 4 | 4 |
| 5 #include "content/child/plugin_param_traits.h" | 5 #include "content/child/plugin_param_traits.h" |
| 6 | 6 |
| 7 #include "base/strings/string_number_conversions.h" | 7 #include "base/strings/string_number_conversions.h" |
| 8 #include "ipc/ipc_message_utils.h" | 8 #include "ipc/ipc_message_utils.h" |
| 9 #include "third_party/WebKit/public/web/WebBindings.h" | 9 #include "third_party/WebKit/public/web/WebBindings.h" |
| 10 | 10 |
| (...skipping 105 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 116 content::SerializeNPIdentifier(p.identifier, m); | 116 content::SerializeNPIdentifier(p.identifier, m); |
| 117 } | 117 } |
| 118 | 118 |
| 119 bool ParamTraits<NPIdentifier_Param>::Read(const Message* m, | 119 bool ParamTraits<NPIdentifier_Param>::Read(const Message* m, |
| 120 PickleIterator* iter, | 120 PickleIterator* iter, |
| 121 param_type* r) { | 121 param_type* r) { |
| 122 return content::DeserializeNPIdentifier(iter, &r->identifier); | 122 return content::DeserializeNPIdentifier(iter, &r->identifier); |
| 123 } | 123 } |
| 124 | 124 |
| 125 void ParamTraits<NPIdentifier_Param>::Log(const param_type& p, std::string* l) { | 125 void ParamTraits<NPIdentifier_Param>::Log(const param_type& p, std::string* l) { |
| 126 if (WebKit::WebBindings::identifierIsString(p.identifier)) { | 126 if (blink::WebBindings::identifierIsString(p.identifier)) { |
| 127 NPUTF8* str = WebKit::WebBindings::utf8FromIdentifier(p.identifier); | 127 NPUTF8* str = blink::WebBindings::utf8FromIdentifier(p.identifier); |
| 128 l->append(str); | 128 l->append(str); |
| 129 free(str); | 129 free(str); |
| 130 } else { | 130 } else { |
| 131 l->append(base::IntToString( | 131 l->append(base::IntToString( |
| 132 WebKit::WebBindings::intFromIdentifier(p.identifier))); | 132 blink::WebBindings::intFromIdentifier(p.identifier))); |
| 133 } | 133 } |
| 134 } | 134 } |
| 135 | 135 |
| 136 } // namespace IPC | 136 } // namespace IPC |
| OLD | NEW |