OLD | NEW |
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2012 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 "ppapi/proxy/ppb_instance_proxy.h" | 5 #include "ppapi/proxy/ppb_instance_proxy.h" |
6 | 6 |
7 #include "base/memory/ref_counted.h" | 7 #include "base/memory/ref_counted.h" |
8 #include "base/numerics/safe_conversions.h" | 8 #include "base/numerics/safe_conversions.h" |
9 #include "base/stl_util.h" | |
10 #include "build/build_config.h" | 9 #include "build/build_config.h" |
11 #include "media/base/limits.h" | 10 #include "media/base/limits.h" |
12 #include "ppapi/c/pp_errors.h" | 11 #include "ppapi/c/pp_errors.h" |
13 #include "ppapi/c/pp_time.h" | 12 #include "ppapi/c/pp_time.h" |
14 #include "ppapi/c/pp_var.h" | 13 #include "ppapi/c/pp_var.h" |
15 #include "ppapi/c/ppb_audio_config.h" | 14 #include "ppapi/c/ppb_audio_config.h" |
16 #include "ppapi/c/ppb_instance.h" | 15 #include "ppapi/c/ppb_instance.h" |
17 #include "ppapi/c/ppb_messaging.h" | 16 #include "ppapi/c/ppb_messaging.h" |
18 #include "ppapi/c/ppb_mouse_lock.h" | 17 #include "ppapi/c/ppb_mouse_lock.h" |
19 #include "ppapi/c/private/pp_content_decryptor.h" | 18 #include "ppapi/c/private/pp_content_decryptor.h" |
(...skipping 1228 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1248 return; | 1247 return; |
1249 } | 1248 } |
1250 | 1249 |
1251 EnterInstanceNoLock enter(instance); | 1250 EnterInstanceNoLock enter(instance); |
1252 if (enter.succeeded()) { | 1251 if (enter.succeeded()) { |
1253 ScopedPPVar session_id_var(ScopedPPVar::PassRef(), | 1252 ScopedPPVar session_id_var(ScopedPPVar::PassRef(), |
1254 StringVar::StringToPPVar(session_id)); | 1253 StringVar::StringToPPVar(session_id)); |
1255 enter.functions()->SessionKeysChange( | 1254 enter.functions()->SessionKeysChange( |
1256 instance, session_id_var.get(), has_additional_usable_key, | 1255 instance, session_id_var.get(), has_additional_usable_key, |
1257 base::checked_cast<uint32_t>(key_information.size()), | 1256 base::checked_cast<uint32_t>(key_information.size()), |
1258 vector_as_array(&key_information)); | 1257 key_information.data()); |
1259 } | 1258 } |
1260 } | 1259 } |
1261 | 1260 |
1262 void PPB_Instance_Proxy::OnHostMsgSessionExpirationChange( | 1261 void PPB_Instance_Proxy::OnHostMsgSessionExpirationChange( |
1263 PP_Instance instance, | 1262 PP_Instance instance, |
1264 const std::string& session_id, | 1263 const std::string& session_id, |
1265 PP_Time new_expiry_time) { | 1264 PP_Time new_expiry_time) { |
1266 if (!dispatcher()->permissions().HasPermission(PERMISSION_PRIVATE)) | 1265 if (!dispatcher()->permissions().HasPermission(PERMISSION_PRIVATE)) |
1267 return; | 1266 return; |
1268 EnterInstanceNoLock enter(instance); | 1267 EnterInstanceNoLock enter(instance); |
(...skipping 195 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1464 PP_Instance instance) { | 1463 PP_Instance instance) { |
1465 InstanceData* data = static_cast<PluginDispatcher*>(dispatcher())-> | 1464 InstanceData* data = static_cast<PluginDispatcher*>(dispatcher())-> |
1466 GetInstanceData(instance); | 1465 GetInstanceData(instance); |
1467 if (!data) | 1466 if (!data) |
1468 return; // Instance was probably deleted. | 1467 return; // Instance was probably deleted. |
1469 data->should_do_request_surrounding_text = false; | 1468 data->should_do_request_surrounding_text = false; |
1470 } | 1469 } |
1471 | 1470 |
1472 } // namespace proxy | 1471 } // namespace proxy |
1473 } // namespace ppapi | 1472 } // namespace ppapi |
OLD | NEW |