| 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/plugin_dispatcher.h" | 5 #include "ppapi/proxy/plugin_dispatcher.h" |
| 6 | 6 |
| 7 #include <map> | 7 #include <map> |
| 8 | 8 |
| 9 #include "base/compiler_specific.h" | 9 #include "base/compiler_specific.h" |
| 10 #include "base/debug/trace_event.h" | 10 #include "base/debug/trace_event.h" |
| (...skipping 17 matching lines...) Expand all Loading... |
| 28 #include "ppapi/proxy/ppapi_messages.h" | 28 #include "ppapi/proxy/ppapi_messages.h" |
| 29 #include "ppapi/proxy/ppb_instance_proxy.h" | 29 #include "ppapi/proxy/ppb_instance_proxy.h" |
| 30 #include "ppapi/proxy/ppp_class_proxy.h" | 30 #include "ppapi/proxy/ppp_class_proxy.h" |
| 31 #include "ppapi/proxy/resource_creation_proxy.h" | 31 #include "ppapi/proxy/resource_creation_proxy.h" |
| 32 #include "ppapi/proxy/resource_message_params.h" | 32 #include "ppapi/proxy/resource_message_params.h" |
| 33 #include "ppapi/shared_impl/ppapi_globals.h" | 33 #include "ppapi/shared_impl/ppapi_globals.h" |
| 34 #include "ppapi/shared_impl/proxy_lock.h" | 34 #include "ppapi/shared_impl/proxy_lock.h" |
| 35 #include "ppapi/shared_impl/resource.h" | 35 #include "ppapi/shared_impl/resource.h" |
| 36 | 36 |
| 37 #if defined(OS_POSIX) && !defined(OS_NACL) | 37 #if defined(OS_POSIX) && !defined(OS_NACL) |
| 38 #include "base/posix/eintr_wrapper.h" | |
| 39 #include "ipc/ipc_channel_posix.h" | 38 #include "ipc/ipc_channel_posix.h" |
| 40 #endif | 39 #endif |
| 41 | 40 |
| 42 namespace ppapi { | 41 namespace ppapi { |
| 43 namespace proxy { | 42 namespace proxy { |
| 44 | 43 |
| 45 namespace { | 44 namespace { |
| 46 | 45 |
| 47 typedef std::map<PP_Instance, PluginDispatcher*> InstanceToDispatcherMap; | 46 typedef std::map<PP_Instance, PluginDispatcher*> InstanceToDispatcherMap; |
| 48 InstanceToDispatcherMap* g_instance_to_dispatcher = NULL; | 47 InstanceToDispatcherMap* g_instance_to_dispatcher = NULL; |
| (...skipping 311 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 360 DLOG_IF(INFO, reply_params.sequence() != 0) | 359 DLOG_IF(INFO, reply_params.sequence() != 0) |
| 361 << "Pepper resource reply message received but the resource doesn't " | 360 << "Pepper resource reply message received but the resource doesn't " |
| 362 "exist (probably has been destroyed)."; | 361 "exist (probably has been destroyed)."; |
| 363 return; | 362 return; |
| 364 } | 363 } |
| 365 resource->OnReplyReceived(reply_params, nested_msg); | 364 resource->OnReplyReceived(reply_params, nested_msg); |
| 366 } | 365 } |
| 367 | 366 |
| 368 } // namespace proxy | 367 } // namespace proxy |
| 369 } // namespace ppapi | 368 } // namespace ppapi |
| OLD | NEW |