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/stl_util.h" | 8 #include "base/stl_util.h" |
9 #include "build/build_config.h" | 9 #include "build/build_config.h" |
10 #include "media/base/limits.h" | 10 #include "media/base/limits.h" |
(...skipping 1284 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1295 NOTREACHED(); | 1295 NOTREACHED(); |
1296 return; | 1296 return; |
1297 } | 1297 } |
1298 | 1298 |
1299 EnterInstanceNoLock enter(instance); | 1299 EnterInstanceNoLock enter(instance); |
1300 if (enter.succeeded()) { | 1300 if (enter.succeeded()) { |
1301 ScopedPPVar session_id_var(ScopedPPVar::PassRef(), | 1301 ScopedPPVar session_id_var(ScopedPPVar::PassRef(), |
1302 StringVar::StringToPPVar(session_id)); | 1302 StringVar::StringToPPVar(session_id)); |
1303 enter.functions()->SessionKeysChange( | 1303 enter.functions()->SessionKeysChange( |
1304 instance, session_id_var.get(), has_additional_usable_key, | 1304 instance, session_id_var.get(), has_additional_usable_key, |
1305 key_information.size(), vector_as_array(&key_information)); | 1305 static_cast<uint32_t>(key_information.size()), |
| 1306 vector_as_array(&key_information)); |
1306 } | 1307 } |
1307 } | 1308 } |
1308 | 1309 |
1309 void PPB_Instance_Proxy::OnHostMsgSessionExpirationChange( | 1310 void PPB_Instance_Proxy::OnHostMsgSessionExpirationChange( |
1310 PP_Instance instance, | 1311 PP_Instance instance, |
1311 const std::string& session_id, | 1312 const std::string& session_id, |
1312 PP_Time new_expiry_time) { | 1313 PP_Time new_expiry_time) { |
1313 if (!dispatcher()->permissions().HasPermission(PERMISSION_PRIVATE)) | 1314 if (!dispatcher()->permissions().HasPermission(PERMISSION_PRIVATE)) |
1314 return; | 1315 return; |
1315 EnterInstanceNoLock enter(instance); | 1316 EnterInstanceNoLock enter(instance); |
(...skipping 195 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1511 PP_Instance instance) { | 1512 PP_Instance instance) { |
1512 InstanceData* data = static_cast<PluginDispatcher*>(dispatcher())-> | 1513 InstanceData* data = static_cast<PluginDispatcher*>(dispatcher())-> |
1513 GetInstanceData(instance); | 1514 GetInstanceData(instance); |
1514 if (!data) | 1515 if (!data) |
1515 return; // Instance was probably deleted. | 1516 return; // Instance was probably deleted. |
1516 data->should_do_request_surrounding_text = false; | 1517 data->should_do_request_surrounding_text = false; |
1517 } | 1518 } |
1518 | 1519 |
1519 } // namespace proxy | 1520 } // namespace proxy |
1520 } // namespace ppapi | 1521 } // namespace ppapi |
OLD | NEW |