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 "webkit/plugins/ppapi/plugin_module.h" | 5 #include "webkit/plugins/ppapi/plugin_module.h" |
6 | 6 |
7 #include <set> | 7 #include <set> |
8 | 8 |
9 #include "base/bind.h" | 9 #include "base/bind.h" |
10 #include "base/command_line.h" | 10 #include "base/command_line.h" |
(...skipping 491 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
502 bool PluginModule::IsProxied() const { | 502 bool PluginModule::IsProxied() const { |
503 return !!out_of_process_proxy_; | 503 return !!out_of_process_proxy_; |
504 } | 504 } |
505 | 505 |
506 base::ProcessId PluginModule::GetPeerProcessId() { | 506 base::ProcessId PluginModule::GetPeerProcessId() { |
507 if (out_of_process_proxy_) | 507 if (out_of_process_proxy_) |
508 return out_of_process_proxy_->GetPeerProcessId(); | 508 return out_of_process_proxy_->GetPeerProcessId(); |
509 return base::kNullProcessId; | 509 return base::kNullProcessId; |
510 } | 510 } |
511 | 511 |
| 512 int PluginModule::GetPluginChildId() { |
| 513 if (out_of_process_proxy_) |
| 514 return out_of_process_proxy_->GetPluginChildId(); |
| 515 return 0; |
| 516 } |
| 517 |
512 // static | 518 // static |
513 const PPB_Core* PluginModule::GetCore() { | 519 const PPB_Core* PluginModule::GetCore() { |
514 return &core_interface; | 520 return &core_interface; |
515 } | 521 } |
516 | 522 |
517 // static | 523 // static |
518 PluginModule::GetInterfaceFunc PluginModule::GetLocalGetInterfaceFunc() { | 524 PluginModule::GetInterfaceFunc PluginModule::GetLocalGetInterfaceFunc() { |
519 return &GetInterface; | 525 return &GetInterface; |
520 } | 526 } |
521 | 527 |
(...skipping 94 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
616 int retval = entry_points.initialize_module(pp_module(), &GetInterface); | 622 int retval = entry_points.initialize_module(pp_module(), &GetInterface); |
617 if (retval != 0) { | 623 if (retval != 0) { |
618 LOG(WARNING) << "PPP_InitializeModule returned failure " << retval; | 624 LOG(WARNING) << "PPP_InitializeModule returned failure " << retval; |
619 return false; | 625 return false; |
620 } | 626 } |
621 return true; | 627 return true; |
622 } | 628 } |
623 | 629 |
624 } // namespace ppapi | 630 } // namespace ppapi |
625 } // namespace webkit | 631 } // namespace webkit |
OLD | NEW |