| Index: ppapi/proxy/serialized_flash_menu.cc
|
| diff --git a/ppapi/proxy/serialized_flash_menu.cc b/ppapi/proxy/serialized_flash_menu.cc
|
| index 9f39916ea611aad7b618c99fa005b66eb88d754f..bbd698cc7b456f13798c0ce5fd188e95e407e258 100644
|
| --- a/ppapi/proxy/serialized_flash_menu.cc
|
| +++ b/ppapi/proxy/serialized_flash_menu.cc
|
| @@ -81,18 +81,18 @@
|
| PickleIterator* iter,
|
| PP_Flash_MenuItem* menu_item) {
|
| uint32_t type;
|
| - if (!iter->ReadUInt32(&type))
|
| + if (!m->ReadUInt32(iter, &type))
|
| return false;
|
| if (type > PP_FLASH_MENUITEM_TYPE_SUBMENU)
|
| return false;
|
| menu_item->type = static_cast<PP_Flash_MenuItem_Type>(type);
|
| std::string name;
|
| - if (!iter->ReadString(&name))
|
| + if (!m->ReadString(iter, &name))
|
| return false;
|
| menu_item->name = new char[name.size() + 1];
|
| std::copy(name.begin(), name.end(), menu_item->name);
|
| menu_item->name[name.size()] = 0;
|
| - if (!iter->ReadInt(&menu_item->id))
|
| + if (!m->ReadInt(iter, &menu_item->id))
|
| return false;
|
| if (!IPC::ParamTraits<PP_Bool>::Read(m, iter, &menu_item->enabled))
|
| return false;
|
| @@ -116,7 +116,7 @@
|
| PP_Flash_Menu* menu = new PP_Flash_Menu;
|
| menu->items = NULL;
|
|
|
| - if (!iter->ReadUInt32(&menu->count)) {
|
| + if (!m->ReadUInt32(iter, &menu->count)) {
|
| FreeMenu(menu);
|
| return NULL;
|
| }
|
|
|