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 "content/renderer/pepper_plugin_delegate_impl.h" | 5 #include "content/renderer/pepper_plugin_delegate_impl.h" |
6 | 6 |
7 #include <cmath> | 7 #include <cmath> |
8 #include <queue> | 8 #include <queue> |
9 | 9 |
10 #include "base/bind.h" | 10 #include "base/bind.h" |
(...skipping 512 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
523 | 523 |
524 bool Init(base::ProcessHandle plugin_process_handle, | 524 bool Init(base::ProcessHandle plugin_process_handle, |
525 const IPC::ChannelHandle& channel_handle, | 525 const IPC::ChannelHandle& channel_handle, |
526 PP_Module pp_module, | 526 PP_Module pp_module, |
527 ppapi::proxy::Dispatcher::GetInterfaceFunc local_get_interface, | 527 ppapi::proxy::Dispatcher::GetInterfaceFunc local_get_interface, |
528 const ppapi::Preferences& preferences) { | 528 const ppapi::Preferences& preferences) { |
529 if (channel_handle.name.empty()) | 529 if (channel_handle.name.empty()) |
530 return false; | 530 return false; |
531 | 531 |
532 #if defined(OS_POSIX) | 532 #if defined(OS_POSIX) |
533 // Check the validity of fd for bug investigation. Remove after fixed. | |
534 // See for details: crbug.com/103957. | |
535 CHECK_NE(-1, channel_handle.socket.fd); | |
piman
2012/02/03 18:52:22
Should we leave this as a DCHECK to catch regressi
| |
536 if (channel_handle.socket.fd == -1) | 533 if (channel_handle.socket.fd == -1) |
537 return false; | 534 return false; |
538 #endif | 535 #endif |
539 | 536 |
540 dispatcher_delegate_.reset(new DispatcherDelegate); | 537 dispatcher_delegate_.reset(new DispatcherDelegate); |
541 dispatcher_.reset(new ppapi::proxy::HostDispatcher( | 538 dispatcher_.reset(new ppapi::proxy::HostDispatcher( |
542 plugin_process_handle, pp_module, local_get_interface)); | 539 plugin_process_handle, pp_module, local_get_interface)); |
543 | 540 |
544 if (!dispatcher_->InitHostWithChannel(dispatcher_delegate_.get(), | 541 if (!dispatcher_->InitHostWithChannel(dispatcher_delegate_.get(), |
545 channel_handle, | 542 channel_handle, |
(...skipping 1562 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
2108 void PepperPluginDelegateImpl::UnSetAndDeleteLockTargetAdapter( | 2105 void PepperPluginDelegateImpl::UnSetAndDeleteLockTargetAdapter( |
2109 webkit::ppapi::PluginInstance* instance) { | 2106 webkit::ppapi::PluginInstance* instance) { |
2110 LockTargetMap::iterator it = mouse_lock_instances_.find(instance); | 2107 LockTargetMap::iterator it = mouse_lock_instances_.find(instance); |
2111 if (it != mouse_lock_instances_.end()) { | 2108 if (it != mouse_lock_instances_.end()) { |
2112 MouseLockDispatcher::LockTarget* target = it->second; | 2109 MouseLockDispatcher::LockTarget* target = it->second; |
2113 render_view_->mouse_lock_dispatcher()->OnLockTargetDestroyed(target); | 2110 render_view_->mouse_lock_dispatcher()->OnLockTargetDestroyed(target); |
2114 delete target; | 2111 delete target; |
2115 mouse_lock_instances_.erase(it); | 2112 mouse_lock_instances_.erase(it); |
2116 } | 2113 } |
2117 } | 2114 } |
OLD | NEW |