Commit e0c95bb2 authored by dmichael@chromium.org's avatar dmichael@chromium.org

NaCl PPAPI Proxy: Make browser Lookup* functions return 0 when the key is not found.

BUG=123184
TEST=


Review URL: http://codereview.chromium.org/10082013

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@132327 0039d316-1c4b-4281-b951-d872f2087c98
parent 96e2c552
...@@ -83,7 +83,11 @@ BrowserPpp* LookupBrowserPppForInstance(PP_Instance instance) { ...@@ -83,7 +83,11 @@ BrowserPpp* LookupBrowserPppForInstance(PP_Instance instance) {
if (NULL == instance_to_ppp_map) { if (NULL == instance_to_ppp_map) {
return NULL; return NULL;
} }
return (*instance_to_ppp_map)[instance]; std::map<PP_Instance, BrowserPpp*>::const_iterator iter =
instance_to_ppp_map->find(instance);
if (iter == instance_to_ppp_map->end())
return NULL;
return iter->second;
} }
void SetModuleIdForSrpcChannel(NaClSrpcChannel* channel, PP_Module module_id) { void SetModuleIdForSrpcChannel(NaClSrpcChannel* channel, PP_Module module_id) {
...@@ -135,14 +139,24 @@ PP_Module LookupModuleIdForSrpcChannel(NaClSrpcChannel* channel) { ...@@ -135,14 +139,24 @@ PP_Module LookupModuleIdForSrpcChannel(NaClSrpcChannel* channel) {
if (NULL == channel_to_module_id_map) { if (NULL == channel_to_module_id_map) {
return 0; return 0;
} }
return (*channel_to_module_id_map)[channel]; std::map<NaClSrpcChannel*, PP_Module>::const_iterator iter =
channel_to_module_id_map->find(channel);
if (iter == channel_to_module_id_map->end()) {
return 0;
}
return iter->second;
} }
PP_Module LookupInstanceIdForSrpcChannel(NaClSrpcChannel* channel) { PP_Instance LookupInstanceIdForSrpcChannel(NaClSrpcChannel* channel) {
if (NULL == channel_to_instance_id_map) { if (NULL == channel_to_instance_id_map) {
return 0; return 0;
} }
return (*channel_to_instance_id_map)[channel]; std::map<NaClSrpcChannel*, PP_Instance>::const_iterator iter =
channel_to_instance_id_map->find(channel);
if (iter == channel_to_instance_id_map->end()) {
return 0;
}
return iter->second;
} }
NaClSrpcChannel* GetMainSrpcChannel(NaClSrpcRpc* upcall_rpc) { NaClSrpcChannel* GetMainSrpcChannel(NaClSrpcRpc* upcall_rpc) {
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment