Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(230)

Unified Diff: ppapi/proxy/serialized_flash_menu.cc

Issue 818833004: Remove deprecated methods from Pickle. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: rebase Created 6 years ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « ppapi/proxy/raw_var_data.cc ('k') | ppapi/proxy/serialized_var.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ppapi/proxy/serialized_flash_menu.cc
diff --git a/ppapi/proxy/serialized_flash_menu.cc b/ppapi/proxy/serialized_flash_menu.cc
index bbd698cc7b456f13798c0ce5fd188e95e407e258..9f39916ea611aad7b618c99fa005b66eb88d754f 100644
--- a/ppapi/proxy/serialized_flash_menu.cc
+++ b/ppapi/proxy/serialized_flash_menu.cc
@@ -81,18 +81,18 @@ bool ReadMenuItem(int depth,
PickleIterator* iter,
PP_Flash_MenuItem* menu_item) {
uint32_t type;
- if (!m->ReadUInt32(iter, &type))
+ if (!iter->ReadUInt32(&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 (!m->ReadString(iter, &name))
+ if (!iter->ReadString(&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 (!m->ReadInt(iter, &menu_item->id))
+ if (!iter->ReadInt(&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* ReadMenu(int depth,
PP_Flash_Menu* menu = new PP_Flash_Menu;
menu->items = NULL;
- if (!m->ReadUInt32(iter, &menu->count)) {
+ if (!iter->ReadUInt32(&menu->count)) {
FreeMenu(menu);
return NULL;
}
« no previous file with comments | « ppapi/proxy/raw_var_data.cc ('k') | ppapi/proxy/serialized_var.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698