| 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 519 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 530 return &GetInterface; | 530 return &GetInterface; |
| 531 } | 531 } |
| 532 | 532 |
| 533 // static | 533 // static |
| 534 bool PluginModule::SupportsInterface(const char* name) { | 534 bool PluginModule::SupportsInterface(const char* name) { |
| 535 return !!InternalGetInterface(name); | 535 return !!InternalGetInterface(name); |
| 536 } | 536 } |
| 537 | 537 |
| 538 PluginInstance* PluginModule::CreateInstance( | 538 PluginInstance* PluginModule::CreateInstance( |
| 539 PluginDelegate* delegate, | 539 PluginDelegate* delegate, |
| 540 content::RenderView* render_view, |
| 540 WebKit::WebPluginContainer* container, | 541 WebKit::WebPluginContainer* container, |
| 541 const GURL& plugin_url) { | 542 const GURL& plugin_url) { |
| 542 PluginInstance* instance = PluginInstance::Create(delegate, this, container, | 543 PluginInstance* instance = PluginInstance::Create(delegate, render_view, this, |
| 543 plugin_url); | 544 container, plugin_url); |
| 544 if (!instance) { | 545 if (!instance) { |
| 545 LOG(WARNING) << "Plugin doesn't support instance interface, failing."; | 546 LOG(WARNING) << "Plugin doesn't support instance interface, failing."; |
| 546 return NULL; | 547 return NULL; |
| 547 } | 548 } |
| 548 if (out_of_process_proxy_) | 549 if (out_of_process_proxy_) |
| 549 out_of_process_proxy_->AddInstance(instance->pp_instance()); | 550 out_of_process_proxy_->AddInstance(instance->pp_instance()); |
| 550 return instance; | 551 return instance; |
| 551 } | 552 } |
| 552 | 553 |
| 553 PluginInstance* PluginModule::GetSomeInstance() const { | 554 PluginInstance* PluginModule::GetSomeInstance() const { |
| (...skipping 73 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 627 int retval = entry_points.initialize_module(pp_module(), &GetInterface); | 628 int retval = entry_points.initialize_module(pp_module(), &GetInterface); |
| 628 if (retval != 0) { | 629 if (retval != 0) { |
| 629 LOG(WARNING) << "PPP_InitializeModule returned failure " << retval; | 630 LOG(WARNING) << "PPP_InitializeModule returned failure " << retval; |
| 630 return false; | 631 return false; |
| 631 } | 632 } |
| 632 return true; | 633 return true; |
| 633 } | 634 } |
| 634 | 635 |
| 635 } // namespace ppapi | 636 } // namespace ppapi |
| 636 } // namespace webkit | 637 } // namespace webkit |
| OLD | NEW |